From 848bfe2dbdf4b32e4160f3aaab58995e3f650a10 Mon Sep 17 00:00:00 2001
From: Patrick <patrick.huie@smartcontract.com>
Date: Tue, 24 Oct 2023 13:38:14 -0400
Subject: [PATCH] fix/tracing-matrix: updating eth integration-tests matrix to
 only run plugin versioned test for ocr2 smoke test (#11056)

---
 .github/workflows/integration-tests.yml | 31 +++++++++++--------------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index efc2c9ecb3a..aadb14f1284 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -253,11 +253,6 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        image:
-          - name: (legacy)
-            tag-suffix: ""
-          - name: (plugins)
-            tag-suffix: -plugins
         product:
           - name: cron
             nodes: 1
@@ -275,6 +270,11 @@ jobs:
             nodes: 1
             os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-smoke-ocr2-evm-simulated
+          - name: ocr2
+            nodes: 1
+            os: ubuntu20.04-8cores-32GB
+            pyroscope_env: ci-smoke-ocr2-evm-simulated
+            tag_suffix: "-plugins"
           - name: runlog
             nodes: 1
             os: ubuntu-latest
@@ -300,7 +300,7 @@ jobs:
             os: ubuntu20.04-8cores-32GB
             pyroscope_env: ci-smoke-forwarder-ocr-evm-simulated
     runs-on: ${{ matrix.product.os }}
-    name: ETH Smoke Tests ${{ matrix.product.name }}${{ matrix.image.tag-suffix }}
+    name: ETH Smoke Tests ${{ matrix.product.name }}${{ matrix.product.tag_suffix }}
     steps:
       - name: Checkout the repo
         uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744 # v3.6.0
@@ -335,7 +335,7 @@ jobs:
 
       - name: Setup Grafana and OpenTelemetry
         id: docker-setup
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
+        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
           # Create network
           docker network create --driver bridge tracing
@@ -352,6 +352,7 @@ jobs:
 
       - name: Generate port
         id: generate-port
+        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         env:
           GITHUB_PR_NUMBER: ${{ github.event.number }}
         run: |
@@ -371,7 +372,7 @@ jobs:
           REMOTE_PORT=$((PORT_BASE + OFFSET))
           echo "REMOTE_PORT=$REMOTE_PORT" >> $GITHUB_OUTPUT
       - name: Reverse SSH Tunneling
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
+        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         env:
           TRACING_SSH_KEY: ${{ secrets.TRACING_SSH_KEY }}
           TRACING_SSH_SERVER: ${{ secrets.TRACING_SSH_SERVER }}
@@ -391,19 +392,13 @@ jobs:
             echo "Then visit http://localhost:8000 in a browser."
             echo "If you are unable to connect, check with the security team that you have access to the tracing server."
       - name: Show Grafana Logs
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
+        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
             docker logs grafana
-      - name: Show Tempo Logs
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
-        run: |
             docker logs tempo
-      - name: Show OpenTelemetry Collector Logs
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
-        run: |
             docker logs otel-collector
       - name: Set sleep time to use in future steps
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
+        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
           echo "SLEEP_TIME=2400" >> "$GITHUB_ENV"
       ## Run this step when changes that require tests to be run are made
@@ -418,7 +413,7 @@ jobs:
           test_command_to_run: make test_need_operator_assets && cd ./integration-tests && go test -timeout 30m -count=1 -json -test.parallel=${{ matrix.product.nodes }} ${{ steps.build-go-test-command.outputs.run_command }} 2>&1 | tee /tmp/gotest.log | gotestfmt
           test_download_vendor_packages_command: cd ./integration-tests && go mod download
           cl_repo: ${{ env.CHAINLINK_IMAGE }}
-          cl_image_tag: ${{ github.sha }}${{ matrix.image.tag-suffix }}
+          cl_image_tag: ${{ github.sha }}${{ matrix.product.tag_suffix }}
           aws_registries: ${{ secrets.QA_AWS_ACCOUNT_NUMBER }}
           artifacts_name: ${{ matrix.product.name }}-test-logs
           artifacts_location: ./integration-tests/smoke/logs/
@@ -453,7 +448,7 @@ jobs:
           test-results-file: '{"testType":"go","filePath":"/tmp/gotest.log"}'
         continue-on-error: true
       - name: Keep action running to view traces
-        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.image.tag-suffix == '-plugins'
+        if: steps.check-label.outputs.trace == 'true' && matrix.product.name == 'ocr2' && matrix.product.tag_suffix == '-plugins'
         run: |
           echo "Sleeping for $SLEEP_TIME seconds..."
           sleep $SLEEP_TIME