From 32ec45232af9ca7757c6d2f8a9e9213130b9f2dc Mon Sep 17 00:00:00 2001 From: Adam Hamrick Date: Thu, 2 Nov 2023 15:17:40 -0400 Subject: [PATCH 1/4] Toggle Simulated Test Runs --- .github/workflows/integration-tests.yml | 10 +++++++--- integration-tests/soak/ocr_test.go | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index b66ab58d554..27080ddfe0d 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -11,10 +11,14 @@ on: workflow_dispatch: inputs: liveNetwork: - description: "Run Live Testnet Tests" + description: "Run Live Network Tests" required: false type: boolean - + simulatedNetwork: + description: "Run Simulated Network Tests" + required: false + type: boolean + default: true # Only run 1 of this workflow at a time per PR concurrency: @@ -244,7 +248,7 @@ jobs: continue-on-error: true eth-smoke-tests-matrix: - if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }} + if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && inputs.simulatedNetwork)) }} environment: integration permissions: checks: write diff --git a/integration-tests/soak/ocr_test.go b/integration-tests/soak/ocr_test.go index b2375f13ac2..9973c23808e 100644 --- a/integration-tests/soak/ocr_test.go +++ b/integration-tests/soak/ocr_test.go @@ -16,6 +16,7 @@ func TestOCRSoak(t *testing.T) { // Use this variable to pass in any custom EVM specific TOML values to your Chainlink nodes customNetworkTOML := `` // Uncomment below for debugging TOML issues on the node + // network := networks.MustGetSelectedNetworksFromEnv()[0] // fmt.Println("Using Chainlink TOML\n---------------------") // fmt.Println(client.AddNetworkDetailedConfig(config.BaseOCRP2PV1Config, customNetworkTOML, network)) // fmt.Println("---------------------") From 88ec191006ca45ed7939d00368865808f10b32e4 Mon Sep 17 00:00:00 2001 From: Adam Hamrick Date: Thu, 2 Nov 2023 16:12:10 -0400 Subject: [PATCH 2/4] Debug inputs --- .github/workflows/integration-tests.yml | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 27080ddfe0d..79096635dd7 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -10,15 +10,15 @@ on: - "*" workflow_dispatch: inputs: - liveNetwork: - description: "Run Live Network Tests" - required: false - type: boolean simulatedNetwork: description: "Run Simulated Network Tests" required: false type: boolean default: true + liveNetwork: + description: "Run Live Network Tests" + required: false + type: boolean # Only run 1 of this workflow at a time per PR concurrency: @@ -62,6 +62,12 @@ jobs: hostname: ${{ secrets.GRAFANA_CLOUD_HOST }} this-job-name: Check Paths That Require Tests To Run continue-on-error: true + - name: Debug Workflow Inputs + if: ${{ github.event_name == 'workflow_dispatch' }} + run: | + echo "liveNetwork: ${{ github.event.inputs.liveNetwork }}" + echo "simulatedNetwork: ${{ github.event.inputs.simulatedNetwork }}" + outputs: src: ${{ steps.changes.outputs.src }} build-chainlink: @@ -180,7 +186,7 @@ jobs: echo "MATRIX_JSON=${COMBINED_ARRAY}" >> $GITHUB_ENV eth-smoke-tests-matrix-automation: - if: ${{ !contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') }} + if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && inputs.simulatedNetwork)) }} environment: integration permissions: checks: write From 8a950e3fdd9c4ca6131d96324247682ab0819fe0 Mon Sep 17 00:00:00 2001 From: Adam Hamrick Date: Thu, 2 Nov 2023 16:16:14 -0400 Subject: [PATCH 3/4] Figured it out --- .github/workflows/integration-tests.yml | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 79096635dd7..1b996ecc014 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -62,11 +62,6 @@ jobs: hostname: ${{ secrets.GRAFANA_CLOUD_HOST }} this-job-name: Check Paths That Require Tests To Run continue-on-error: true - - name: Debug Workflow Inputs - if: ${{ github.event_name == 'workflow_dispatch' }} - run: | - echo "liveNetwork: ${{ github.event.inputs.liveNetwork }}" - echo "simulatedNetwork: ${{ github.event.inputs.simulatedNetwork }}" outputs: src: ${{ steps.changes.outputs.src }} @@ -186,7 +181,7 @@ jobs: echo "MATRIX_JSON=${COMBINED_ARRAY}" >> $GITHUB_ENV eth-smoke-tests-matrix-automation: - if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && inputs.simulatedNetwork)) }} + if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && !inputs.simulatedNetwork)) }} environment: integration permissions: checks: write @@ -254,7 +249,7 @@ jobs: continue-on-error: true eth-smoke-tests-matrix: - if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && inputs.simulatedNetwork)) }} + if: ${{ !(contains(join(github.event.pull_request.labels.*.name, ' '), 'skip-smoke-tests') || (github.event_name == 'workflow_dispatch' && !inputs.simulatedNetwork)) }} environment: integration permissions: checks: write From dbe6e31b5314b7f762d130a0025ec0689f46f954 Mon Sep 17 00:00:00 2001 From: Adam Hamrick Date: Thu, 2 Nov 2023 17:00:41 -0400 Subject: [PATCH 4/4] Skip notify --- .github/workflows/integration-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml index 1b996ecc014..4309679f5d4 100644 --- a/.github/workflows/integration-tests.yml +++ b/.github/workflows/integration-tests.yml @@ -968,7 +968,7 @@ jobs: testnet-smoke-tests-notify: name: Live Testnet Start Slack Thread - if: ${{ always() && needs.testnet-smoke-tests-matrix.result != 'skipped' && needs.testnet-smoke-tests-matrix.result != 'cancelled' }} + if: ${{ always() && needs.testnet-smoke-tests-matrix.result != 'skipped' && needs.testnet-smoke-tests-matrix.result != 'cancelled' && github.event_name != 'workflow_dispatch' }} environment: integration outputs: thread_ts: ${{ steps.slack.outputs.thread_ts }}