dm: fix upstream switch job test (#11745)

close #4287
pingcap · Nov 25, 2024 · 9d91f5a · 9d91f5a
1 parent 3258043
commit 9d91f5a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git 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
@@ -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/[email protected]
         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
@@ -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
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
@@ Expand Down @@