From 03aa9a60eb6c485f47dbdd09d05dde0da977f825 Mon Sep 17 00:00:00 2001
From: JoshuaSBrown <brownjs@ornl.gov>
Date: Thu, 16 Jan 2025 11:24:36 -0500
Subject: [PATCH] Add dependencies on end to end jobs as well

---
 .gitlab/end_to_end.yml | 25 +++++++++++++++++++------
 external/protobuf      |  2 +-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/.gitlab/end_to_end.yml b/.gitlab/end_to_end.yml
index 478ed4733..015c8bf1f 100644
--- a/.gitlab/end_to_end.yml
+++ b/.gitlab/end_to_end.yml
@@ -444,17 +444,18 @@ end_to_end_web_test:
     - cmake --build build --target end_to_end_web_tests
 
 end_to_end_error_discovery_arango:
-  needs: ["check-ci-infrastructure"]
+  needs: ["check-ci-infrastructure", "end-to-end-arango-setup"]
   stage: log
   tags:
     - ci-datafed-arango
   script:
     - sudo journalctl --no-pager -u arangodb3.service
   rules:
-    - when: always
+    - job: check-ci-infrastructure
+      when: on_success
 
 end_to_end_error_discovery_gcs:
-  needs: ["check-ci-infrastructure"]
+  needs: ["check-ci-infrastructure", "end-to-end-gcs-authz-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -462,9 +463,12 @@ 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"]
+  needs: ["check-ci-infrastructure", "end-to-end-repo-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -472,9 +476,12 @@ 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"]
+  needs: ["check-ci-infrastructure", "end-to-end-core-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -482,9 +489,12 @@ 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"]
+  needs: ["check-ci-infrastructure", "end-to-end-ws-setup"]
   extends: .error_logs_client_end_to_end
   variables:
     PROJECT: "datafed"
@@ -492,3 +502,6 @@ end_to_end_error_discovery_web:
   tags:
     - ci-datafed-core
     - docker
+  rules:
+    - job: check-ci-infrastructure
+      when: on_success
diff --git a/external/protobuf b/external/protobuf
index a9b006bdd..63def39e8 160000
--- a/external/protobuf
+++ b/external/protobuf
@@ -1 +1 @@
-Subproject commit a9b006bddd52e289029f16aa77b77e8e0033d9ee
+Subproject commit 63def39e881afa496502d9c410f4ea948e59490d