Skip to content

Commit

Permalink
Merge pull request #1735 from chengyouling/develop-work
Browse files Browse the repository at this point in the history 
Optimized message gray plugin workflow test case
  • Loading branch information
@Sherlockhan
Sherlockhan authored Feb 21, 2025
2 parents f682ee5 + b0a3755 commit 311a1db
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 77 deletions.
4 changes: 4 additions & 0 deletions .github/actions/scenarios/mq-grayscale/rocketmq/action.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ runs:
dynamic.config.dynamicConfigType: KIE
dynamic.config.serverAddress: 127.0.0.1:30110
SERVICE_META_ENVIRONMENT: development
SERVICE_META_SERVICE: ${{ matrix.test-model }}
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 }}/${{ matrix.rocketMqClientVersion }}-rocketmq-producer-base.log 2>&1 &
Expand All @@ -26,6 +27,7 @@ runs:
dynamic.config.serverAddress: 127.0.0.1:30110
SERVICE_META_ENVIRONMENT: development
SERVICE_META_VERSION: 1.0.1
SERVICE_META_SERVICE: ${{ matrix.test-model }}
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 }}/${{ matrix.rocketMqClientVersion }}-rocketmq-producer-gray.log 2>&1 &
Expand All @@ -35,6 +37,7 @@ runs:
dynamic.config.dynamicConfigType: KIE
dynamic.config.serverAddress: 127.0.0.1:30110
SERVICE_META_ENVIRONMENT: development
SERVICE_META_SERVICE: ${{ matrix.test-model }}
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 }}/${{ matrix.rocketMqClientVersion }}-rocketmq-consumer-base.log 2>&1 &
Expand All @@ -46,6 +49,7 @@ runs:
dynamic.config.serverAddress: 127.0.0.1:30110
SERVICE_META_ENVIRONMENT: development
SERVICE_META_VERSION: 1.0.1
SERVICE_META_SERVICE: ${{ matrix.test-model }}
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 }}/${{ matrix.rocketMqClientVersion }}-rocketmq-consumer-gray.log 2>&1 &
Expand Down
40 changes: 20 additions & 20 deletions .github/workflows/message_gray_integration_test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-auto-only-base:
name: Test for pull base only for auto rule
name: Test base only for auto rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-plugin-false]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['AUTO_ONLY_BASE']
Expand All @@ -140,10 +140,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-auto-exc-only-base:
name: Test for pull base only for auto exclude rule
name: Test base only for auto exclude rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-only-base]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['AUTO_EXC_ONLY_BASE']
Expand All @@ -161,10 +161,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-auto-base-gray:
name: Test for pull base gray for auto rule
name: Test pull base gray for auto rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-only-base]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['AUTO_BASE_GRAY_PULL']
Expand All @@ -182,10 +182,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-auto-base-gray-lite:
name: Test for pull base gray for auto rule
name: Test lite pull base gray for auto rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-only-base]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['AUTO_BASE_GRAY_LITE_PULL']
Expand All @@ -203,10 +203,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-auto-base-gray-push:
name: Test for pull base gray for auto rule
name: Test push base gray for auto rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-only-base]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['AUTO_BASE_GRAY_PUSH']
Expand All @@ -224,10 +224,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-auto-exc-base-gray:
name: Test for pull base gray for auto exclude rule
name: Test base gray for auto exclude rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-base-gray]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['AUTO_EXC_BASE_GRAY']
Expand All @@ -245,10 +245,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-base-only-base:
name: Test for pull base only for base rule
name: Test base only for base rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-auto-exc-base-gray]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['BASE_ONLY_BASE']
Expand All @@ -266,10 +266,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-base-exc-only-base:
name: Test for pull base only for base exclude rule
name: Test base only for base exclude rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-base-only-base]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['BASE_EXC_ONLY_BASE']
Expand All @@ -287,10 +287,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-base-base-gray:
name: Test for pull base gray for base rule
name: Test base gray for base rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-base-exc-only-base]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['BASE_BASE_GRAY']
Expand All @@ -308,10 +308,10 @@ jobs:
- name: message gray test for test-model=${{ matrix.test-model }} rocketMqClientVersion=${{ matrix.rocketMqClientVersion }}
uses: ./.github/actions/scenarios/mq-grayscale/rocketmq
test-for-base-exc-base-gray:
name: Test for pull base gray for base exclude rule
name: Test base gray for base exclude rule
runs-on: ubuntu-latest
if: needs.set-execution-conditions.outputs.enableMqGrayscaleRocketMqAction=='true'
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache, test-for-base-base-gray]
needs: [set-execution-conditions, build-agent-and-cache, download-midwares-and-cache]
strategy:
matrix:
test-model: ['BASE_EXC_BASE_GRAY']
Expand Down
Loading

0 comments on commit 311a1db

Please sign in to comment.