调整测试用例

sermant-io · Jan 2, 2025 · 9caff70 · 9caff70
1 parent db77b3e
commit 9caff70
Show file tree

Hide file tree

Showing 9 changed files with 883 additions and 350 deletions.
diff --git a/.github/actions/common/mq-grayscale/rocketmq/action.yml b/.github/actions/common/mq-grayscale/rocketmq/action.yml
@@ -27,13 +27,6 @@ runs:
         export ROOT_PATH=$(pwd)
         bash ./sermant-integration-tests/scripts/startCse.sh
     - name: get rocketmq from cache
-      uses: actions/cache@v4
-      with:
-        path: rocketmq-all-4.8.0-bin-release.zip
-        key: ${{ runner.os }}-rocketmq-all-4.8.0-bin-release
-        restore-keys: |
-          ${{ runner.os }}-rocketmq-all-4.8.0-bin-release
-    - name: get rocketmq514 from cache
       uses: actions/cache@v4
       with:
         path: rocketmq-all-5.1.4-bin-release.zip
@@ -42,31 +35,14 @@ runs:
           ${{ runner.os }}-rocketmq-all-5.1.4-bin-release
     - name: start rocketmq server
       shell: bash
-      if: matrix.rocketMqClientVersion != '5.0.0' || (matrix.rocketMqClientVersion == '5.0.0' && matrix.test-model != 'PLUGIN_ENABLED_FALSE_LITE_PULL' && matrix.test-model != 'CONSUMER_BASE_ONLY_LITE_PULL' && matrix.test-model != 'CONSUMER_BASE_GRAY_LITE_PULL')
-      run: |
-        unzip rocketmq-all-4.8.0-bin-release.zip
-        sed -i 's/if \[\[ "$JAVA_MAJOR_VERSION" -lt "9" \]\]/if [ "$JAVA_MAJOR_VERSION" -lt "9" ]/g' rocketmq-all-4.8.0-bin-release/bin/runserver.sh
-        sed -i 's/-Xms4g -Xmx4g -Xmn2g/-Xms1g -Xmx1g -Xmn1g/g' rocketmq-all-4.8.0-bin-release/bin/runserver.sh
-        sed -i '22i enablePropertyFilter = true' rocketmq-all-4.8.0-bin-release/conf/broker.conf
-        nohup bash rocketmq-all-4.8.0-bin-release/bin/mqnamesrv &
-    - name: start rocketmq broker
-      shell: bash
-      if: matrix.rocketMqClientVersion != '5.0.0' || (matrix.rocketMqClientVersion == '5.0.0' && matrix.test-model != 'PLUGIN_ENABLED_FALSE_LITE_PULL' && matrix.test-model != 'CONSUMER_BASE_ONLY_LITE_PULL' && matrix.test-model != 'CONSUMER_BASE_GRAY_LITE_PULL')
-      run: |
-        sed -i 's/-Xms8g -Xmx8g -Xmn4g/-Xms1g -Xmx1g -Xmn1g/g' rocketmq-all-4.8.0-bin-release/bin/runbroker.sh
-        nohup bash rocketmq-all-4.8.0-bin-release/bin/mqbroker -n localhost:9876 -c rocketmq-all-4.8.0-bin-release/conf/broker.conf &
-    - name: start rocketmq514 server
-      shell: bash
-      if: (matrix.test-model == 'PLUGIN_ENABLED_FALSE_LITE_PULL' || matrix.test-model == 'CONSUMER_BASE_ONLY_LITE_PULL' || matrix.test-model == 'CONSUMER_BASE_GRAY_LITE_PULL') && matrix.rocketMqClientVersion == '5.0.0'
       run: |
         unzip rocketmq-all-5.1.4-bin-release.zip
         sed -i 's/if \[\[ "$JAVA_MAJOR_VERSION" -lt "9" \]\]/if [ "$JAVA_MAJOR_VERSION" -lt "9" ]/g' rocketmq-all-5.1.4-bin-release/bin/runserver.sh
         sed -i 's/-Xms4g -Xmx4g -Xmn2g/-Xms1g -Xmx1g -Xmn1g/g' rocketmq-all-5.1.4-bin-release/bin/runserver.sh
         sed -i '22i enablePropertyFilter = true' rocketmq-all-5.1.4-bin-release/conf/broker.conf
         nohup bash rocketmq-all-5.1.4-bin-release/bin/mqnamesrv &
-    - name: start rocketmq514 broker
+    - name: start rocketmq broker
       shell: bash
-      if: (matrix.test-model == 'PLUGIN_ENABLED_FALSE_LITE_PULL' || matrix.test-model == 'CONSUMER_BASE_ONLY_LITE_PULL' || matrix.test-model == 'CONSUMER_BASE_GRAY_LITE_PULL') && matrix.rocketMqClientVersion == '5.0.0'
       run: |
         sed -i 's/-Xms8g -Xmx8g -Xmn4g/-Xms1g -Xmx1g -Xmn1g/g' rocketmq-all-5.1.4-bin-release/bin/runbroker.sh
         nohup bash rocketmq-all-5.1.4-bin-release/bin/mqbroker -n localhost:9876 -c rocketmq-all-5.1.4-bin-release/conf/broker.conf &

diff --git a/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml b/.github/actions/scenarios/mq-grayscale/rocketmq/action.yml
@@ -18,7 +18,7 @@ runs:
         SERVICE_META_ENVIRONMENT: development
       run: |
         nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-producer -jar \
-        sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/target/grayscale-rocketmq-producer-demo.jar > ${{ env.logDir }}/rocketmq-producer-base.log 2>&1 &
+        sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/target/grayscale-rocketmq-producer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-producer-base.log 2>&1 &
     - name: start gray producer service
       shell: bash
       env:
@@ -28,7 +28,7 @@ runs:
         SERVICE_META_VERSION: 1.0.1
       run: |
         nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-producer -Dserver.port=9040 -jar \
-        sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/target/grayscale-rocketmq-producer-demo.jar > ${{ env.logDir }}/rocketmq-producer-gray.log 2>&1 &
+        sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-producer-demo/target/grayscale-rocketmq-producer-demo.jar > ${{ env.logDir }}/${{ matrix.rocketMqClientVersion }}-rocketmq-producer-gray.log 2>&1 &
     - name: start base consumer service
       shell: bash
       env:
@@ -37,28 +37,28 @@ runs:
         SERVICE_META_ENVIRONMENT: development
       run: |
         nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-consumer -jar \
-        sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/target/grayscale-rocketmq-consumer-demo.jar > ${{ env.logDir }}/rocketmq-consumer-base.log 2>&1 &
+        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 != 'CONSUMER_BASE_ONLY_PULL' && matrix.test-model != 'CONSUMER_BASE_ONLY_LITE_PULL' && matrix.test-model != 'CONSUMER_BASE_ONLY_PUSH'
+      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'
       env:
         dynamic.config.dynamicConfigType: KIE
         dynamic.config.serverAddress: 127.0.0.1:30110
         SERVICE_META_ENVIRONMENT: development
         SERVICE_META_VERSION: 1.0.1
       run: |
         nohup java -javaagent:sermant-agent-${{ env.sermantVersion }}/agent/sermant-agent.jar=appName=grayscale-rocketmq-consumer -Dserver.port=9010 -jar \
-        sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-consumer-demo/target/grayscale-rocketmq-consumer-demo.jar > ${{ env.logDir }}/rocketmq-consumer-gray.log 2>&1 &
+        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 == 'CONSUMER_BASE_ONLY_PULL' || matrix.test-model == 'CONSUMER_BASE_ONLY_LITE_PULL' || matrix.test-model == 'CONSUMER_BASE_ONLY_PUSH'
+      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'
       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 != 'CONSUMER_BASE_ONLY_PULL' && matrix.test-model != 'CONSUMER_BASE_ONLY_LITE_PULL' && matrix.test-model != 'CONSUMER_BASE_ONLY_PUSH'
+      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'
       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
@@ -67,7 +67,7 @@ runs:
     - name: test message grayscale rocketmq
       shell: bash
       run: |
-        mvn test -Dgrayscale.rocketmq.integration.test.type=${{ matrix.test-model }} -Dtest.version=${{ matrix.rocketMqClientVersion }} --file \
+        mvn test -Dgrayscale.rocketmq.integration.test.type=${{ matrix.test-model }} --file \
         sermant-integration-tests/mq-grayscale-rocketmq-test/grayscale-rocketmq-integration-test/pom.xml
     - name: exit
       if: always()