forked from ehrbase/ehrbase
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #199 from ehrbase/develop
[pull] develop from ehrbase:develop
- Loading branch information
Showing
372 changed files
with
19,820 additions
and
2,475 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -207,6 +207,12 @@ workflows: | |
- build-ehrbase | ||
- QUERYSERVICE-test-1 | ||
|
||
- STOREDQUERY-test: | ||
context: org-global | ||
requires: | ||
- build-ehrbase | ||
- QUERYSERVICE-test-1 | ||
|
||
- QUERYSERVICE-test-1: | ||
context: org-global | ||
requires: | ||
|
@@ -271,6 +277,7 @@ workflows: | |
- EHRSERVICE-test | ||
- EHRSTATUS-test | ||
- KNOWLEDGE-test | ||
- STOREDQUERY-test | ||
- QUERYSERVICE-test-1 | ||
- QUERYSERVICE-test-2 | ||
- NEWQUERY-test-set | ||
|
@@ -467,6 +474,12 @@ workflows: | |
- build-ehrbase | ||
- QUERYSERVICE-test-2 | ||
|
||
- STOREDQUERY-test: | ||
context: org-global | ||
requires: | ||
- build-ehrbase | ||
- QUERYSERVICE-test-2 | ||
|
||
- QUERYSERVICE-test-1: | ||
context: org-global | ||
requires: | ||
|
@@ -525,6 +538,7 @@ workflows: | |
- EHRSERVICE-test | ||
- EHRSTATUS-test | ||
- KNOWLEDGE-test | ||
- STOREDQUERY-test | ||
- QUERYSERVICE-test-1 | ||
- QUERYSERVICE-test-2 | ||
- NEWQUERY-test-set | ||
|
@@ -745,6 +759,10 @@ workflows: | |
context: org-global | ||
requires: | ||
- build package ehrbase with locally built sdk from sync-branch | ||
- STOREDQUERY-test: | ||
context: org-global | ||
requires: | ||
- build package ehrbase with locally built sdk from sync-branch | ||
- QUERYSERVICE-test-1: | ||
context: org-global | ||
requires: | ||
|
@@ -797,6 +815,7 @@ workflows: | |
- EHRSERVICE-test | ||
- EHRSTATUS-test | ||
- KNOWLEDGE-test | ||
- STOREDQUERY-test | ||
- QUERYSERVICE-test-1 | ||
- QUERYSERVICE-test-2 | ||
- NEWQUERY-test-set | ||
|
@@ -1227,6 +1246,19 @@ jobs: | |
allow-template-overwrite: false | ||
cache-enabled: false | ||
|
||
STOREDQUERY-test: | ||
executor: docker-py3-postgres | ||
steps: | ||
- checkout | ||
- restore-workspace | ||
- git-clone-robot-integration-tests-repo | ||
- move-integration-tests-content-to-local-tests-folder | ||
- run-robot-tests: | ||
include-tags: "stored_query" | ||
test-suite-path: "STORED_QUERY_TESTS" | ||
test-suite-name: "STORED_QUERY" | ||
allow-template-overwrite: true | ||
|
||
QUERYSERVICE-test-1: | ||
executor: docker-py3-postgres | ||
steps: | ||
|
@@ -1522,7 +1554,7 @@ commands: | |
--plugin-manager.plugin-dir='tests/test_plugin' \ | ||
--plugin-manager.plugin-config-dir='tests/test_plugin_config_dir' \ | ||
--cache.enabled=<< parameters.cache-enabled >> > log & app_pid=$! | ||
timeout=60 | ||
timeout=360 | ||
while [ ! -f ./log ]; | ||
do | ||
echo "Waiting for file ./log ..." | ||
|
@@ -1536,6 +1568,7 @@ commands: | |
while ! (cat ./log | grep -m 1 "Started EhrBase in"); | ||
do | ||
echo "waiting for EHRbase to be ready ..."; | ||
tail -n 5 ./log | ||
if [ "$timeout" == 0 ]; then | ||
echo "WARNING: Did not see a startup message even after waiting 60s" | ||
exit 1 | ||
|
@@ -1717,7 +1750,7 @@ commands: | |
name: INSTALL SDK | ||
command: | | ||
cd ~/projects/openEHR_SDK | ||
mvn install -Dmaven.javadoc.skip=true -Djacoco.skip=true -Dmaven.test.skip | ||
mvn install -Dmaven.javadoc.skip=true -Djacoco.skip=true | ||
|
||
start-ehrbase-and-run-java-integration-sdk-tests: | ||
|
@@ -1994,8 +2027,8 @@ commands: | |
name: Save unit test results | ||
command: | | ||
mkdir -p ~/ehrbase-test-results/unit-tests/ | ||
find ~/projects -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} ~/ehrbase-test-results/unit-tests/ \; | ||
find ~/projects -type f -regex ".*/target/surefire-reports/.*txt" -exec cp {} ~/ehrbase-test-results/unit-tests/ \; | ||
find ~/projects -type f -regex ".*/target/surefire-reports/.*xml" -not -path "~/projects/openEHR_SDK/*" -exec cp {} ~/ehrbase-test-results/unit-tests/ \; | ||
find ~/projects -type f -regex ".*/target/surefire-reports/.*txt" -not -path "~/projects/openEHR_SDK/*" -exec cp {} ~/ehrbase-test-results/unit-tests/ \; | ||
when: always | ||
|
||
|
||
|
@@ -2515,7 +2548,7 @@ commands: | |
orbs: | ||
maven: circleci/[email protected] | ||
openjdk-install: cloudesire/[email protected] | ||
sonarcloud: sonarsource/sonarcloud@1.0.2 | ||
sonarcloud: sonarsource/sonarcloud@2.0.0 | ||
|
||
executors: | ||
# https://hub.docker.com/u/cimg (circleci next-gen docker images) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.