From 4005e55bf05e8b2e2c17af68aeface88d4232de5 Mon Sep 17 00:00:00 2001 From: Marcin Date: Thu, 17 Aug 2023 14:20:16 +0200 Subject: [PATCH] Fix for delete featurenet in nightly --- .github/actions/delete-featurenet/action.yml | 2 +- .github/workflows/nightly-logic-e2e-tests.yml | 32 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.github/actions/delete-featurenet/action.yml b/.github/actions/delete-featurenet/action.yml index 82bc7a2c9e..debb02a1ed 100644 --- a/.github/actions/delete-featurenet/action.yml +++ b/.github/actions/delete-featurenet/action.yml @@ -85,7 +85,7 @@ runs: shell: bash env: # yamllint disable-line rule:line-length - APP_NAME: ${{ inputs.featurenet-name != '' && inputs.featurenet-name || format('{0}{1}{2}', 'fe-', steps.get-ref-properties.outputs.branch-name-for-argo, github.run_id) }} + APP_NAME: ${{ inputs.featurenet-name != '' && inputs.featurenet-name || format('{0}{1}-{2}', 'fe-', steps.get-ref-properties.outputs.branch-name-for-argo, github.run_id) }} run: | name_local=${{ env.APP_NAME }} echo "name=$name_local" >> $GITHUB_OUTPUT diff --git a/.github/workflows/nightly-logic-e2e-tests.yml b/.github/workflows/nightly-logic-e2e-tests.yml index d8725d5667..2a0b10c37b 100644 --- a/.github/workflows/nightly-logic-e2e-tests.yml +++ b/.github/workflows/nightly-logic-e2e-tests.yml @@ -54,7 +54,7 @@ jobs: secrets: inherit runs-e2e-test-on-fe: - needs: [push-featurnet-node-image-to-ecr, build-e2e-client-image] + needs: [push-featurnet-node-image-to-ecr, build-e2e-client-image, store-test-node-and-runtime] name: Run e2e test on FE runs-on: [self-hosted, Linux, X64, large] steps: @@ -118,18 +118,18 @@ jobs: argo-host: ${{ secrets.ARGOCD_DEVNET_HOST }} featurenet-keys-s3bucket-name: ${{ secrets.FEATURENET_KEYS_S3BUCKET_NAME }} -# slack-notification: -# name: Slack notification -# runs-on: ubuntu-20.04 -# needs: [runs-e2e-test-on-fe] -# if: ${{ !cancelled() }} -# steps: -# - name: Checkout repository -# uses: actions/checkout@v3 -# -# - name: Send Slack message -# uses: ./.github/actions/slack-notification -# with: -# notify-on: "always" -# env: -# SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_NIGHTLY_PIPELINE }} + slack-notification: + name: Slack notification + runs-on: ubuntu-20.04 + needs: [runs-e2e-test-on-fe] + if: ${{ !cancelled() }} + steps: + - name: Checkout repository + uses: actions/checkout@v3 + + - name: Send Slack message + uses: ./.github/actions/slack-notification + with: + notify-on: "always" + env: + SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_NIGHTLY_PIPELINE }}