Merge remote-tracking branch 'upstream/main' into e2e-workload-lifecycle

odigos-io · Sep 25, 2024 · 5b2f838 · 5b2f838
2 parents a7b9496 + 06f8b3f
commit 5b2f838
Show file tree

Hide file tree

Showing 44 changed files with 1,532 additions and 488 deletions.
diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml
@@ -10,7 +10,36 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
+  build-odigos-images:
+    runs-on: warp-ubuntu-latest-x64-8x-spot
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Build CLI
+        run: |
+          cd cli
+          go build -tags=embed_manifests -o odigos
+
+      - name: Build Odigos Images
+        run: |
+          TAG=e2e-test make build-images
+          docker save -o odigos-images.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "odigos")
+
+      - name: Upload CLI
+        uses: actions/upload-artifact@v3
+        with:
+          name: odigos-cli
+          path: cli/odigos
+
+      - name: Upload Odigos Images
+        uses: actions/upload-artifact@v3
+        with:
+          name: odigos-images
+          path: odigos-images.tar
+
   kubernetes-test:
+    needs: build-odigos-images
     runs-on: warp-ubuntu-latest-x64-8x-spot
     strategy:
       fail-fast: false
@@ -32,8 +61,7 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
+
       - name: Set up Go
         uses: actions/setup-go@v5
         with:
@@ -42,29 +70,43 @@ jobs:
           cache: true
           cache-dependency-path: |
             **/go.sum
+
       - name: Set up Helm
         uses: azure/setup-helm@v4
         with:
           version: v3.9.0
+
       - name: Install chainsaw
         uses: kyverno/action-install-chainsaw@v0.2.8
+
       - name: Create Kind Cluster
         uses: helm/kind-action@v1.10.0
         with:
           node_image: ${{ matrix.kind-image }}
           version: "v0.23.0"
           cluster_name: kind
+
       - name: Install FE
         run: |
           cd frontend/webapp
           yarn install
-      - name: Build CLI
-        run: |
-          cd cli
-          go build -tags=embed_manifests -o odigos
-      - name: Build and Load Odigos Images
-        run: |
-          TAG=e2e-test make build-images load-to-kind
+
+      - name: Download and Load Docker Images to Kind
+        uses: actions/download-artifact@v3
+        with:
+          name: odigos-images
+      - run: |
+          docker load -i odigos-images.tar
+          TAG=e2e-test make load-to-kind
+
+      - name: Download CLI binary
+        uses: actions/download-artifact@v3
+        with:
+          name: odigos-cli
+      - run: |
+          mv odigos cli/odigos
+          chmod +x cli/odigos
+
       - name: Run E2E Tests
         run: |
           chainsaw test tests/e2e/${{ matrix.test-scenario }}
diff --git a/.github/workflows/verify-collector-ocb.yml b/.github/workflows/verify-collector-ocb.yml
@@ -20,6 +20,7 @@ jobs:
         working-directory: ./collector
         run: |
           if [[ $(git diff --exit-code) ]]; then
+            git diff
             echo "odigos collector distribution module is not in sync with builder config. Please run 'make genodigoscol' in 'collector' directory and commit the changes."
             exit 1
           fi