another try

odigos-io · Sep 29, 2024 · 8c0a57b · 8c0a57b
1 parent 94a49bd
commit 8c0a57b
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 39 deletions.
diff --git a/.github/actions/build-images/action.yml b/.github/actions/build-images/action.yml
diff --git a/.github/workflows/build-images.yml b/.github/workflows/build-images.yml
@@ -11,6 +11,11 @@ on:
         required: false
         default: false
         type: boolean
+      save:
+        description: 'Optionaly save the images to odigos-images.tar to be used in a future job'
+        required: false
+        default: false
+        type: boolean
 
 jobs:
     build-image:
@@ -53,4 +58,13 @@ jobs:
                   '.'
                   }}
               cache-from: type=gha
-              cache-to: type=gha,mode=max
+              cache-to: type=gha,mode=max
+          - name: Save Odigos images to tar
+            if: ${{ github.event.inputs.save }}
+            run: docker save -o odigos-images.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "odigos")
+          - name: Upload Odigos Images
+            if: ${{ github.event.inputs.save }}
+            uses: actions/upload-artifact@v3
+            with:
+              name: odigos-images
+              path: odigos-images.tar
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -38,22 +38,28 @@ jobs:
           path: cli/odigos
 
   build-odigos-images:
-    runs-on: warp-ubuntu-latest-x64-8x-spot
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Build Odigos Images
-        uses: ./.github/actions/build-images
-        with:
-          tag: e2e-test
-          push: false
-      - name: Save Odigos images to tar
-        run: docker save -o odigos-images.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "odigos")
-      - name: Upload Odigos Images
-        uses: actions/upload-artifact@v3
-        with:
-          name: odigos-images
-          path: odigos-images.tar
+    uses: ./.github/workflows/build-images.yml
+    with:
+      tag: e2e-test
+      push: false
+      save: true
+
+    # runs-on: warp-ubuntu-latest-x64-8x-spot
+    # steps:
+    #   - name: Checkout
+    #     uses: actions/checkout@v4
+    #   - name: Build Odigos Images
+    #     uses: ./.github/actions/build-images
+    #     with:
+    #       tag: e2e-test
+    #       push: false
+    #   - name: Save Odigos images to tar
+    #     run: docker save -o odigos-images.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "odigos")
+    #   - name: Upload Odigos Images
+    #     uses: actions/upload-artifact@v3
+    #     with:
+    #       name: odigos-images
+    #       path: odigos-images.tar
 
   kubernetes-test:
     needs: