From df1e436f95cfce391b32315edd104edec78f7133 Mon Sep 17 00:00:00 2001 From: JoshuaSBrown Date: Thu, 16 Jan 2025 11:27:09 -0500 Subject: [PATCH 1/4] Job rule is not supported --- .gitlab/end_to_end.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml index 015c8bf1..3da57e62 100644 --- a/.gitlab/end_to_end.yml +++ b/.gitlab/end_to_end.yml @@ -450,9 +450,6 @@ end_to_end_error_discovery_arango: - 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"] @@ -463,9 +460,6 @@ end_to_end_error_discovery_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"] @@ -476,9 +470,6 @@ end_to_end_error_discovery_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"] @@ -489,9 +480,6 @@ end_to_end_error_discovery_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"] @@ -502,6 +490,3 @@ end_to_end_error_discovery_web: tags: - ci-datafed-core - docker - rules: - - job: check-ci-infrastructure - when: on_success From ebecfabddba070acd1c2c613b2051d3998b34c6c Mon Sep 17 00:00:00 2001 From: JoshuaSBrown Date: Thu, 16 Jan 2025 11:32:22 -0500 Subject: [PATCH 2/4] Remove always run log --- .gitlab/common.yml | 2 -- .gitlab/end_to_end.yml | 6 ++++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab/common.yml b/.gitlab/common.yml index b95eeaa8..d288b092 100644 --- 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 index 3da57e62..c7a979dd 100644 --- a/.gitlab/end_to_end.yml +++ b/.gitlab/end_to_end.yml @@ -443,6 +443,12 @@ end_to_end_web_test: -DINSTALL_FOXX=OFF - cmake --build build --target end_to_end_web_tests +################################################################################ +# 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"] stage: log From 3222810603980d3d10fd8477d2059c2eea84e9ea Mon Sep 17 00:00:00 2001 From: JoshuaSBrown Date: Thu, 16 Jan 2025 11:39:59 -0500 Subject: [PATCH 3/4] add end to end signal job --- .gitlab-ci.yml | 1 + .gitlab/end_to_end.yml | 20 +++++++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2fac34b..5d07be53 100644 --- 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/end_to_end.yml b/.gitlab/end_to_end.yml index c7a979dd..af970e6a 100644 --- a/.gitlab/end_to_end.yml +++ b/.gitlab/end_to_end.yml @@ -444,13 +444,23 @@ end_to_end_web_test: - 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: + - runner + 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 @@ -458,7 +468,7 @@ end_to_end_error_discovery_arango: - sudo journalctl --no-pager -u arangodb3.service 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" @@ -468,7 +478,7 @@ end_to_end_error_discovery_gcs: - docker 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" @@ -478,7 +488,7 @@ end_to_end_error_discovery_repo: - docker 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" @@ -488,7 +498,7 @@ end_to_end_error_discovery_core: - docker 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" From 23eca53b35eb40c29cb70d18db7a5395130166dc Mon Sep 17 00:00:00 2001 From: JoshuaSBrown Date: Thu, 16 Jan 2025 11:41:45 -0500 Subject: [PATCH 4/4] Fix tag of signal --- .gitlab/end_to_end.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml index af970e6a..254df445 100644 --- a/.gitlab/end_to_end.yml +++ b/.gitlab/end_to_end.yml @@ -449,7 +449,7 @@ end_to_end_web_test: end-to-end-signal: stage: end-to-end-test-finish-signal tags: - - runner + - datafed-infrastructure script: - echo "Signal end of end to end tests" when: always