chore(ci): leverage reusable workflow

newrelic · Mar 7, 2024 · 651b197 · 651b197
1 parent d2b146c
commit 651b197
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 1 deletion.
diff --git a/.github/workflows/on_prerelease.yaml b/.github/workflows/on_prerelease.yaml
@@ -7,10 +7,54 @@ on:
       - 'v*'
 
 jobs:
+  consumer-producer-image:
+    name: Build and push consumer-producer image to use in our canaries
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          path: src/github.com/${{ env.ORIGINAL_REPO_NAME }}
+      - uses: docker/setup-buildx-action@v3
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push Docker image
+        working-directory: src/github.com/${{ env.ORIGINAL_REPO_NAME }}/tests/integration/consumer-producer
+        run: |
+          docker buildx build --push --platform=$CONSUMER_PRODUCER_DOCKER_PLATFORMS \
+            -t $CONSUMER_PRODUCER_DOCKER_IMAGE_NAME:latest \
+            .
+  # This is currently not covered by reusable workflow due to the retry mechanism
+  test-integration-nix:
+    name: Run integration tests on *Nix
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        working-directory: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: 'src/github.com/${{env.ORIGINAL_REPO_NAME}}/go.mod'
+      - name: Integration test
+        run: for i in 1 2 3; do make integration-test && break; done
+
   pre-release:
+    needs: [package-win, test-integration-nix]
     uses: newrelic/coreint-automation/.github/workflows/reusable_pre_release.yaml@v2
     with:
       tag: ${{ github.event.release.tag_name }}
       integration: kafka
       publish_schema: "ohi-jmx"
-    secrets: inherit
+      test_integration_nix: false
+    secrets: inherit
+
+
diff --git a/.github/workflows/on_push_pr.yaml b/.github/workflows/on_push_pr.yaml
@@ -14,4 +14,25 @@ jobs:
     uses: newrelic/coreint-automation/.github/workflows/reusable_push_pr.yaml@v2
     with:
       integration: kafka
+      test_integration_nix: false
     secrets: inherit
+
+# This is currently not covered by reusable workflow due to the retry mechanism
+  test-integration-nix:
+    name: Run integration tests on *Nix
+    runs-on: ubuntu-22.04
+    defaults:
+      run:
+        working-directory: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+    steps:
+      - name: Check out code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 1
+          path: src/github.com/${{env.ORIGINAL_REPO_NAME}}
+      - name: Install Go
+        uses: actions/setup-go@v4
+        with:
+          go-version-file: 'src/github.com/${{env.ORIGINAL_REPO_NAME}}/go.mod'
+      - name: Integration test
+        run: for i in 1 2 3; do make integration-test && break; done