调整条件

sermant-io · Jan 3, 2025 · 6120952 · 6120952
1 parent 3f78505
commit 6120952
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml b/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml
@@ -40,7 +40,7 @@ runs:
         sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/target/grayscale-rocketmq-consumer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-consumer-base.log 2>&1 &
     - name: start gray consumer service
       shell: bash
-      if: matrix.test-model == 'BASE_GRAY_AUTO_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_LITE_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_PUSH' || matrix.test-model == 'BASE_GRAY_AUTO_EXC_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_EXC_LITE_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_EXC_PUSH' || matrix.test-model == 'BASE_GRAY_BASE_PULL' || matrix.test-model == 'BASE_GRAY_BASE_LITE_PULL' || matrix.test-model == 'BASE_GRAY_BASE_PUSH' || matrix.test-model == 'BASE_GRAY_BASE_EXC_PULL' || matrix.test-model == 'BASE_GRAY_BASE_EXC_LITE_PULL' || matrix.test-model == 'BASE_GRAY_BASE_EXC_PUSH'
+      if: matrix.test-model == 'AUTO_BASE_GRAY' || matrix.test-model == 'AUTO_EXC_BASE_GRAY' || matrix.test-model == 'BASE_BASE_GRAY' || matrix.test-model == 'BASE_EXC_BASE_GRAY'
       env:
         dynamic.config.dynamicConfigType: KIE
         dynamic.config.serverAddress: 127.0.0.1:30110
@@ -51,14 +51,14 @@ runs:
         sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/target/grayscale-rocketmq-consumer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-consumer-gray.log 2>&1 &
     - name: waiting for service start for only base
       shell: bash
-      if: matrix.test-model != 'BASE_GRAY_AUTO_PULL' && matrix.test-model != 'BASE_GRAY_AUTO_LITE_PULL' && matrix.test-model != 'BASE_GRAY_AUTO_PUSH' && matrix.test-model != 'BASE_GRAY_AUTO_EXC_PULL' && matrix.test-model != 'BASE_GRAY_AUTO_EXC_LITE_PULL' && matrix.test-model != 'BASE_GRAY_AUTO_EXC_PUSH' && matrix.test-model != 'BASE_GRAY_BASE_PULL' && matrix.test-model != 'BASE_GRAY_BASE_LITE_PULL' && matrix.test-model != 'BASE_GRAY_BASE_PUSH' && matrix.test-model != 'BASE_GRAY_BASE_EXC_PULL' && matrix.test-model != 'BASE_GRAY_BASE_EXC_LITE_PULL' && matrix.test-model != 'BASE_GRAY_BASE_EXC_PUSH'
+      if: matrix.test-model != 'AUTO_BASE_GRAY' && matrix.test-model != 'AUTO_EXC_BASE_GRAY' && matrix.test-model != 'BASE_BASE_GRAY' && matrix.test-model != 'BASE_EXC_BASE_GRAY'
       run: |
         bash ./sermant-integration-tests/scripts/checkService.sh http://127.0.0.1:9030/actuator/health 200
         bash ./sermant-integration-tests/scripts/checkService.sh http://127.0.0.1:9040/actuator/health 200
         bash ./sermant-integration-tests/scripts/checkService.sh http://127.0.0.1:9000/actuator/health 200
     - name: waiting for service start for base and gray
       shell: bash
-      if: matrix.test-model == 'BASE_GRAY_AUTO_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_LITE_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_PUSH' || matrix.test-model == 'BASE_GRAY_AUTO_EXC_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_EXC_LITE_PULL' || matrix.test-model == 'BASE_GRAY_AUTO_EXC_PUSH' || matrix.test-model == 'BASE_GRAY_BASE_PULL' || matrix.test-model == 'BASE_GRAY_BASE_LITE_PULL' || matrix.test-model == 'BASE_GRAY_BASE_PUSH' || matrix.test-model == 'BASE_GRAY_BASE_EXC_PULL' || matrix.test-model == 'BASE_GRAY_BASE_EXC_LITE_PULL' || matrix.test-model == 'BASE_GRAY_BASE_EXC_PUSH'
+      if: matrix.test-model == 'AUTO_BASE_GRAY' || matrix.test-model == 'AUTO_EXC_BASE_GRAY' || matrix.test-model == 'BASE_BASE_GRAY' || matrix.test-model == 'BASE_EXC_BASE_GRAY'
       run: |
         bash ./sermant-integration-tests/scripts/checkService.sh http://127.0.0.1:9030/actuator/health 200
         bash ./sermant-integration-tests/scripts/checkService.sh http://127.0.0.1:9040/actuator/health 200