Build e2e controller image once

Signed-off-by: Derek Nola <derek.nola@suse.com>

Author: dereknola

.github/workflows/release.yml

@@ -40,7 +40,7 @@ jobs:
     - name: Run Unit Tests
       run: ./scripts/test
 
-  e2e-build:
+  e2e-build-base:
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -52,17 +52,38 @@ jobs:
       run: ./scripts/e2e-build
 
     - name: Save Docker image
-      run: docker save -o nginx-ingress-e2e.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "rancher/nginx")
+      run: docker save -o nginx-ingress-e2e-base.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "rancher/nginx")
 
-    - name: Upload Docker image
+    - name: Upload Docker images
       uses: actions/upload-artifact@v4
       with:
-        name: nginx-ingress-e2e
-        path: nginx-ingress-e2e.tar
+        name: nginx-ingress-e2e-base
+        path: nginx-ingress-e2e-base.tar
         retention-days: 1
+  
+  e2e-build-ctr:
+    permissions:
+      contents: read
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+
+    - name: Build E2E Test Image
+      run: make -C test/e2e-image image
+
+    - name: Save Docker image
+      run: docker save -o nginx-ingress-e2e-ctr.tar nginx-ingress-controller:e2e
 
+    - name: Upload Docker image
+      uses: actions/upload-artifact@v4
+      with:
+        name: nginx-ingress-e2e-ctr
+        path: nginx-ingress-e2e-ctr.tar
+        retention-days: 1
+  
   e2e:
-    needs: e2e-build
+    needs: [e2e-build-base, e2e-build-ctr]
     permissions:
       contents: read
     runs-on: ubuntu-latest
@@ -83,12 +104,17 @@ jobs:
     - name: Download Docker image
       uses: actions/download-artifact@v4
       with:
-        name: nginx-ingress-e2e
-
-    - name: Load Docker image
-      run: docker load -i nginx-ingress-e2e.tar
+        pattern: nginx-ingress-e2e-*
+        merge-multiple: true
+      
+    - name: Load Docker images
+      run: |
+        docker load -i nginx-ingress-e2e-base.tar
+        docker load -i nginx-ingress-e2e-ctr.tar
     
     - name: Run E2E Tests with combined focus
+      env:
+        SKIP_E2E_IMAGE_CREATION: "true"
       run: |
         # Add brackets around each focus area in the OR pattern
         FOCUS_PATTERN=$(echo "${{ matrix.focus }}" | sed -E 's/([^|]+)/\\[\1\\]/g')