Merge branch '1236-bug-job-not-failing-with-setup-script' into devel

ORNL · Jan 16, 2025 · 049a4f4 · 049a4f4
2 parents 812c2bf + 23eca53
commit 049a4f4
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 22 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -41,6 +41,7 @@ stages:
   - end-to-end-setup-arango
   - end-to-end-setup
   - end-to-end-test
+  - end-to-end-test-finish-signal
   - log
   - deploy-pypi-package
 

diff --git a/.gitlab/common.yml b/.gitlab/common.yml
@@ -303,8 +303,6 @@
         echo "$MATCHING_CONTAINERS"
         docker logs $MATCHING_CONTAINERS;
       fi
-  rules:
-    - when: always
 
 # In the case that we are not needing to actually rebuild the image we want to
 # retag the image that already exists in harbor with the current commit, this

diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml
@@ -443,65 +443,66 @@ end_to_end_web_test:
       -DINSTALL_FOXX=OFF
     - cmake --build build --target end_to_end_web_tests
 
+################################################################################
+# Signal end to end to end tests
+################################################################################
+end-to-end-signal:
+  stage: end-to-end-test-finish-signal
+  tags:
+    - datafed-infrastructure
+  script:
+    - echo "Signal end of end to end tests"
+  when: always
+################################################################################
+# Log output
+################################################################################
+# We don't want to run the log jobs if the infrastructure was never stood up
+# because the jobs will hang indefinately
+
 end_to_end_error_discovery_arango:
-  needs: ["check-ci-infrastructure", "end-to-end-arango-setup"]
+  needs: ["check-ci-infrastructure", "end-to-end-arango-setup", "end-to-end-signal"]
   stage: log
   tags:
     - ci-datafed-arango
   script:
     - sudo journalctl --no-pager -u arangodb3.service
-  rules:
-    - job: check-ci-infrastructure
-      when: on_success
 
 end_to_end_error_discovery_gcs:
-  needs: ["check-ci-infrastructure", "end-to-end-gcs-authz-setup"]
+  needs: ["check-ci-infrastructure", "end-to-end-gcs-authz-setup", "end-to-end-signal"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
     COMPONENT: "gcs"
   tags:
     - ci-datafed-globus
     - docker
-  rules:
-    - job: check-ci-infrastructure
-      when: on_success
 
 end_to_end_error_discovery_repo:
-  needs: ["check-ci-infrastructure", "end-to-end-repo-setup"]
+  needs: ["check-ci-infrastructure", "end-to-end-repo-setup", "end-to-end-signal"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
     COMPONENT: "repo"
   tags:
     - ci-datafed-globus
     - docker
-  rules:
-    - job: check-ci-infrastructure
-      when: on_success
 
 end_to_end_error_discovery_core:
-  needs: ["check-ci-infrastructure", "end-to-end-core-setup"]
+  needs: ["check-ci-infrastructure", "end-to-end-core-setup", "end-to-end-signal"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
     COMPONENT: "core"
   tags:
     - ci-datafed-core
     - docker
-  rules:
-    - job: check-ci-infrastructure
-      when: on_success
 
 end_to_end_error_discovery_web:
-  needs: ["check-ci-infrastructure", "end-to-end-ws-setup"]
+  needs: ["check-ci-infrastructure", "end-to-end-ws-setup", "end-to-end-signal"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
     COMPONENT: "ws"
   tags:
     - ci-datafed-core
     - docker
-  rules:
-    - job: check-ci-infrastructure
-      when: on_success