Merge pull request #697 from devanshuVmware/v0-40-x-fix-gh-external-test

Fix GH external test cases in v0.40.x
carvel-dev · Sep 5, 2024 · 5031766 · 5031766
2 parents 2b58fc8 + 20f6005
commit 5031766
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 42 deletions.
diff --git a/.github/workflows/gh-test-external-registry.yml b/.github/workflows/gh-test-external-registry.yml
@@ -18,43 +18,6 @@ permissions:
   security-events: none
   statuses: none
 jobs:
-  test-harbor:
-    name: Test GH with Harbor
-    runs-on: ubuntu-latest
-    environment: TanzuNet Registry Dev e2e
-    steps:
-    - name: Set up Go 1.x
-      uses: actions/setup-go@v3
-      with:
-        go-version: '1.21.9'
-    - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
-      with:
-        ref: ${{ github.event.pull_request.head.sha }}
-        path: src/github.com/${{ github.repository }}
-        persist-credentials: false
-    - name: Run Tests
-      env:
-        IMGPKG_E2E_IMAGE: "dev.registry.tanzu.vmware.com/imgpkg/github-action-test-relocation"
-        IMGPKG_E2E_RELOCATION_REPO: "dev.registry.tanzu.vmware.com/imgpkg/github-action-imgpkg-test"
-        TanzuNetDevUsername: ${{ secrets.TanzuNetDevUsername }}
-        TanzuNetDevPassword: ${{ secrets.TanzuNetDevPassword }}
-      run: |
-        set -e
-
-        # Prevent conflicts from multiple e2e tests run in parallel from diff PR's
-        export IMGPKG_E2E_IMAGE="$IMGPKG_E2E_IMAGE-$GITHUB_RUN_ID"
-        export IMGPKG_E2E_RELOCATION_REPO="$IMGPKG_E2E_RELOCATION_REPO-$GITHUB_RUN_ID"
-
-        export GOPATH=$(echo `pwd`)
-        export PATH="$PATH:$GOPATH/bin"
-        cd src/github.com/${{ github.repository }}
-
-        docker login dev.registry.tanzu.vmware.com -u "$TanzuNetDevUsername" -p "$TanzuNetDevPassword"
-        # pull registry for e2e tests that require a locally running docker registry. i.e. airgapped env tests
-        docker pull registry:2
-
-        ./hack/test-all.sh
   test-gcr:
     name: Test GH with GCR
     runs-on: ubuntu-latest
@@ -63,7 +26,7 @@ jobs:
       - name: Set up Go 1.x
         uses: actions/setup-go@v3
         with:
-          go-version: "1.21.9"
+          go-version: "1.22.5"
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
         with:

diff --git a/test/e2e/assets/cf-for-k8s-bundle/.imgpkg/images.yml b/test/e2e/assets/cf-for-k8s-bundle/.imgpkg/images.yml
@@ -2,8 +2,8 @@
 apiVersion: imgpkg.carvel.dev/v1alpha1
 images:
 - annotations:
-    kbld.carvel.dev/id: cloudfoundry/capi-nginx@sha256:67ad232b390a100a3c9e9b36ee1c6443843185e6df78f3fba57f9a708808b6da
-  image: index.docker.io/cloudfoundry/capi-nginx@sha256:67ad232b390a100a3c9e9b36ee1c6443843185e6df78f3fba57f9a708808b6da
+    kbld.carvel.dev/id: cloudfoundry/cli@sha256:efe972e71abe4f01b73da8475b69bf46106faf31f7bc0a0615fb843c2d98c4b6
+  image: index.docker.io/cloudfoundry/cli@sha256:efe972e71abe4f01b73da8475b69bf46106faf31f7bc0a0615fb843c2d98c4b6
 - annotations:
     kbld.carvel.dev/id: cloudfoundry/cf-api-backup-metadata-generator@sha256:0f3098d99b35bfb9608b580323e0cc454bd254afaf08cd02acec58af770fea4f
   image: index.docker.io/cloudfoundry/cf-api-backup-metadata-generator@sha256:0f3098d99b35bfb9608b580323e0cc454bd254afaf08cd02acec58af770fea4f

diff --git a/test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml b/test/perf/assets/cf-for-k8s-bundle/.imgpkg/images.yml
@@ -2,8 +2,8 @@
 apiVersion: imgpkg.carvel.dev/v1alpha1
 images:
 - annotations:
-    kbld.carvel.dev/id: cloudfoundry/capi-nginx@sha256:67ad232b390a100a3c9e9b36ee1c6443843185e6df78f3fba57f9a708808b6da
-  image: index.docker.io/cloudfoundry/capi-nginx@sha256:67ad232b390a100a3c9e9b36ee1c6443843185e6df78f3fba57f9a708808b6da
+    kbld.carvel.dev/id: cloudfoundry/cli@sha256:efe972e71abe4f01b73da8475b69bf46106faf31f7bc0a0615fb843c2d98c4b6
+  image: index.docker.io/cloudfoundry/cli@sha256:efe972e71abe4f01b73da8475b69bf46106faf31f7bc0a0615fb843c2d98c4b6
 - annotations:
     kbld.carvel.dev/id: cloudfoundry/cf-api-backup-metadata-generator@sha256:0f3098d99b35bfb9608b580323e0cc454bd254afaf08cd02acec58af770fea4f
   image: index.docker.io/cloudfoundry/cf-api-backup-metadata-generator@sha256:0f3098d99b35bfb9608b580323e0cc454bd254afaf08cd02acec58af770fea4f