From 31740c42bb05efcc7c58b3fee85fd24526d717ae Mon Sep 17 00:00:00 2001
From: Andy Roth <roth.andy@gmail.com>
Date: Mon, 8 Nov 2021 16:56:28 -0800
Subject: [PATCH] Fix the legacy E2E tests and remove them from the critical
 path to cutting a release (#162)

---
 .gitlab-ci.yml | 8 ++++++--
 e2e.sh         | 5 ++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9cbdde9f71..ab962b65ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -46,8 +46,12 @@ package:
     paths:
       - build/
 
+# Don't run the legacy E2E tests on tags, since GitHub Actions is replacing them and they shouldn't be in the critical
+# path to cutting a release.
 e2e:
-  <<: *only-default
+  only:
+    - master
+    - merge_requests
   stage: e2e
   needs:
     - job: package
@@ -62,7 +66,7 @@ e2e:
     - mkdir -p ~/.ssh
     - chmod 700 ~/.ssh
     - echo "$ZARF_KNOWN_HOST" > ~/.ssh/known_hosts
-    - ./build/zarf tools registry login registry1.dso.mil --username "robot\$bb-dev-imagepullonly" --password "$REGISTRY1_PASSWORD"
+    - ./build/zarf tools registry login registry1.dso.mil --username "$REGISTRY1_USERNAME_ZARF_ROBOT" --password "$REGISTRY1_PASSWORD_ZARF_ROBOT"
   script:
     - ./e2e.sh
   resource_group: e2e
diff --git a/e2e.sh b/e2e.sh
index b64d24eea0..26eafb3b21 100755
--- a/e2e.sh
+++ b/e2e.sh
@@ -95,7 +95,10 @@ testAPIEndpoints() {
     loadZarfCA
 
     # Test the docker registry
-    _curl "https://pipeline.zarf.dev/v2/"
+    # This is commented out because it already gets tested in the GitHub Actions pipeline. Without changes it fails
+    # due to the registry needing auth now, but it's already tested elsewhere so it doesn't need to be tested here.
+    # Eventually this whole file will be deleted when we have finished moving all of these tests over to GitHub Actions.
+    # _curl "https://pipeline.zarf.dev/v2/"
 
     # Test gitea is up and can be logged into
     _curl "https://zarf-git-user:${ZARF_PWD}@pipeline.zarf.dev/api/v1/user"