diff --git a/.github/workflows/dataflow_engine_chaos.yaml b/.github/workflows/dataflow_engine_chaos.yaml index 999a1968135..3db336064d6 100644 --- a/.github/workflows/dataflow_engine_chaos.yaml +++ b/.github/workflows/dataflow_engine_chaos.yaml @@ -339,15 +339,3 @@ jobs: name: chaos-base-logs.${{ matrix.chaos-obj }} path: | ./logs - - # Send feishu notification if failed. - - name: Feishu notification - continue-on-error: true - uses: foxundermoon/feishu-action@v2 - if: ${{ failure() }} - with: - url: ${{ secrets.ENGINE_FEISHU_NOTIFY_URL }} - msg_type: text - content: | - text: | - dataflow engine chaos job failed, see https://github.com/pingcap/tiflow/actions/runs/${{ github.run_id }} diff --git a/.github/workflows/dm_upstream_switch.yaml b/.github/workflows/dm_upstream_switch.yaml index 718a525113c..dafc866124c 100644 --- a/.github/workflows/dm_upstream_switch.yaml +++ b/.github/workflows/dm_upstream_switch.yaml @@ -48,6 +48,8 @@ jobs: - name: Setup containers run: | + sudo curl -L "https://github.com/docker/compose/releases/download/1.29.2/docker-compose-$(uname -s)-$(uname -m)" -o /usr/local/bin/docker-compose + sudo chmod +x /usr/local/bin/docker-compose docker-compose -f ./dm/tests/upstream_switch/docker-compose.yml up -d - name: Run test cases @@ -73,12 +75,15 @@ jobs: path: | ./logs - # send Slack notify if failed. - # NOTE: With the exception of `GITHUB_TOKEN`, secrets are not passed to the runner when a workflow is triggered from a forked repository. - - name: Slack notification + # Send feishu notification if failed. + - name: Feishu notification + continue-on-error: true + uses: foxundermoon/feishu-action@v2 if: ${{ failure() }} - env: - SLACK_WEBHOOK: ${{ secrets.SLACK_NOTIFY }} - uses: Ilshidur/action-slack@2.1.0 with: - args: "upstream-switch job failed, see https://github.com/pingcap/tiflow/actions/runs/{{ GITHUB_RUN_ID }}" + url: ${{ secrets.ENGINE_FEISHU_NOTIFY_URL }} + msg_type: text + content: | + text: | + dm upstream switch job failed, see https://github.com/pingcap/tiflow/actions/runs/${{ github.run_id }} + diff --git a/dm/tests/upstream_switch/case.sh b/dm/tests/upstream_switch/case.sh index 012b4df8ff3..82f04026b22 100644 --- a/dm/tests/upstream_switch/case.sh +++ b/dm/tests/upstream_switch/case.sh @@ -2,6 +2,7 @@ set -eu +export DM_MASTER_EXTRA_ARG="" CUR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd) PATH=$CUR/../_utils:$PATH # for sync_diff_inspector