From 6fbc2bad13dd7e6e3b466be9e81ca26a6477bfc7 Mon Sep 17 00:00:00 2001 From: Florin Barbu Date: Thu, 18 Jan 2024 17:08:36 +0200 Subject: [PATCH] set caller input --- .github/workflows/go_waku_daily.yml | 6 ++---- .github/workflows/interop_tests.yml | 3 --- .github/workflows/nim_waku_daily.yml | 6 ++---- .github/workflows/test_common.yml | 14 ++++++-------- 4 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.github/workflows/go_waku_daily.yml b/.github/workflows/go_waku_daily.yml index 496606edf..7697c05b3 100644 --- a/.github/workflows/go_waku_daily.yml +++ b/.github/workflows/go_waku_daily.yml @@ -1,4 +1,4 @@ -name: Go Waku Nightly Interop Tests +name: Go Waku Interop Tests concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -16,6 +16,4 @@ jobs: with: node1: "harbor.status.im/wakuorg/go-waku:latest" node2: "harbor.status.im/wakuorg/go-waku:latest" - - - + caller: "go" diff --git a/.github/workflows/interop_tests.yml b/.github/workflows/interop_tests.yml index 277c4f04f..7dffab414 100644 --- a/.github/workflows/interop_tests.yml +++ b/.github/workflows/interop_tests.yml @@ -34,6 +34,3 @@ jobs: node1: ${{ inputs.node1 }} node2: ${{ inputs.node2 }} additional_nodes: ${{ inputs.additional_nodes }} - - - diff --git a/.github/workflows/nim_waku_daily.yml b/.github/workflows/nim_waku_daily.yml index 0e9971090..4870eaedc 100644 --- a/.github/workflows/nim_waku_daily.yml +++ b/.github/workflows/nim_waku_daily.yml @@ -1,4 +1,4 @@ -name: Nim Waku Nightly Interop Tests +name: Nim Waku Interop Tests concurrency: group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }} @@ -16,6 +16,4 @@ jobs: with: node1: "harbor.status.im/wakuorg/nwaku:latest" node2: "harbor.status.im/wakuorg/nwaku:latest" - - - + caller: "nim" diff --git a/.github/workflows/test_common.yml b/.github/workflows/test_common.yml index 6ddce3d60..cf258df11 100644 --- a/.github/workflows/test_common.yml +++ b/.github/workflows/test_common.yml @@ -18,13 +18,17 @@ on: description: "Additional optional nodes used in e2e tests, separated by ," type: string default: "harbor.status.im/wakuorg/nwaku:latest,harbor.status.im/wakuorg/go-waku:latest,harbor.status.im/wakuorg/nwaku:latest" - + caller: + required: false + description: "Workflow caller. Used in reporting" + type: string env: FORCE_COLOR: "1" NODE_1: ${{ inputs.node1 }} NODE_2: ${{ inputs.node2 }} ADDITIONAL_NODES: ${{ inputs.additional_nodes }} + CALLER: ${{ inputs.caller || 'manual' }} jobs: @@ -43,12 +47,6 @@ jobs: - run: pip install -r requirements.txt - - name: Echo names - run: | - echo "Job name is $GITHUB_JOB" - echo "How about1 ${{ github.jobs[github.job].name }}" - echo "How about2 ${{ github.job }}" - - name: Run tests run: pytest -n 4 --reruns 1 --alluredir=allure-results @@ -96,7 +94,7 @@ jobs: - name: Send report to Discord uses: rjstone/discord-webhook-notify@v1 - if: always() + if: always() && env.CALLER != 'manual' with: severity: ${{ job.status == 'success' && 'info' || 'error' }} username: ${{ github.workflow }}