Merge branch 'TB-201-update-jempi-config' into TB-180-add-mapping-for…

…-cr-find
jembi · Oct 17, 2023 · 3297e95 · 3297e95
2 parents 3312c58 + 7e0f091
commit 3297e95
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/.github/workflows/ci-cluster.yml b/.github/workflows/ci-cluster.yml
@@ -72,7 +72,7 @@ jobs:
   run-e2e-tests:
     runs-on: ubuntu-20.04
     needs: configure-e2e-server
-    timeout-minutes: 80
+    timeout-minutes: 120
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/.github/workflows/run-tests.sh b/.github/workflows/run-tests.sh
@@ -8,6 +8,9 @@ CHANGED_FILES=($@)
 
 cd ../../test/cucumber/ || exit
 
+# This ensures that the openhim and its mediators' tests are run only once when the openhim and its mediators have all been modified
+openhimRan="false"
+
 declare -A changed_packages
 for package in "${CHANGED_FILES[@]}"; do
     if [[ $package == *"features/cluster-mode"* ]]; then
@@ -28,12 +31,10 @@ elif [[ "${!changed_packages[*]}" == *"features/single-mode"* ]] && [[ $NODE_MOD
     DOCKER_HOST=ssh://ubuntu@$GITHUB_RUN_ID.jembi.cloud yarn test:single
 elif [[ "${!changed_packages[*]}" == *"features/cluster-mode"* ]] && [[ $NODE_MODE == "cluster" ]]; then
     DOCKER_HOST=ssh://ubuntu@$GITHUB_RUN_ID.jembi.cloud yarn test:cluster
-elif [[ "${!changed_packages[*]}" == *"infrastructure"* ]]; then
-    DOCKER_HOST=ssh://ubuntu@$GITHUB_RUN_ID.jembi.cloud yarn test:"$NODE_MODE"
+elif [[ "${!changed_packages[*]}" == *"infrastructure"* ]] && [[ $openhimRan == "false" ]]; then
+    openhimRan="true"
+    DOCKER_HOST=ssh://ubuntu@$GITHUB_RUN_ID.jembi.cloud yarn test:"$NODE_MODE":openhim
 else
-    # This ensures that the openhim and its mediators' tests are run only once when the openhim and its mediators have all been modified
-    openhimRan="false"
-
     for folder_name in "${!changed_packages[@]}"; do
         echo "$folder_name was changed"