From f6d740d792be05526029fc048f82f096d155d8fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Wed, 10 May 2023 20:04:58 +0800 Subject: [PATCH 01/16] Update to support "Snapshot Release" daily test --- .github/asf-deploy-settings.xml | 5 + .github/workflows/snapshot-automation.yml | 175 ++++++++++++++++++++++ 2 files changed, 180 insertions(+) diff --git a/.github/asf-deploy-settings.xml b/.github/asf-deploy-settings.xml index fad16cfb808..246bf0973f7 100644 --- a/.github/asf-deploy-settings.xml +++ b/.github/asf-deploy-settings.xml @@ -27,6 +27,11 @@ apache.snapshots.https ${env.NEXUS_DEPLOY_USERNAME} ${env.NEXUS_DEPLOY_PASSWORD} + + + 60 + + diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 4691e602699..8c5af7755a9 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -4,8 +4,183 @@ on: - cron: "0 0 * * *" jobs: + dist-tar: + name: Build dist tar + runs-on: ubuntu-latest + timeout-minutes: 30 + steps: + - uses: actions/checkout@v3 + with: + submodules: true + - uses: actions/setup-java@v3 + with: + distribution: "temurin" + java-version: "8" + cache: "maven" + - name: Build distribution tar + env: + MAVEN_SETTINGS: ${{ github.workspace }}/.github/asf-deploy-settings.xml + run: | + mvn -Prelease-all -DskipTests -Dspotbugs.skip=true install -s $MAVEN_SETTINGS + - uses: actions/upload-artifact@v3 + name: Upload distribution tar + with: + name: rocketmq + path: distribution/target/rocketmq*/rocketmq* + + docker-build: + if: ${{ success() }} + name: Docker images + needs: [ dist-tar ] + runs-on: ubuntu-latest + timeout-minutes: 30 + strategy: + matrix: + base-image: [ "ubuntu" ] + java-version: [ "8" ] + steps: + - uses: actions/checkout@v3 + with: + repository: apache/rocketmq-docker.git + ref: master + path: rocketmq-docker + - uses: actions/download-artifact@v3 + name: Download distribution tar + with: + name: rocketmq + path: rocketmq + - name: docker-login + uses: docker/login-action@v2 + with: + registry: ${{ env.REGISTRY }} + username: ${{ secrets.DOCKERHUB_USER }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: Build and save docker images + id: build-images + run: | + cd rocketmq-docker/image-build-ci + version=${{ github.event.pull_request.number || github.ref_name }}-$(uuidgen) + mkdir versionlist + touch versionlist/"${version}-`echo ${{ matrix.base-image }} | sed -e "s/:/-/g"`" + sh ./build-image-local.sh ${version} ${{ matrix.base-image }} ${{ matrix.java-version }} ${DOCKER_REPO} + - uses: actions/upload-artifact@v3 + name: Upload distribution tar + with: + name: versionlist + path: rocketmq-docker/image-build-ci/versionlist/* + + list-version: + if: always() + name: List version + needs: [ docker-build ] + runs-on: ubuntu-latest + timeout-minutes: 30 + outputs: + version-json: ${{ steps.show_versions.outputs.version-json }} + steps: + - uses: actions/download-artifact@v3 + name: Download versionlist + with: + name: versionlist + path: versionlist + - name: Show versions + id: show_versions + run: | + a=(`ls versionlist`) + printf '%s\n' "${a[@]}" | jq -R . | jq -s . + echo version-json=`printf '%s\n' "${a[@]}" | jq -R . | jq -s .` >> $GITHUB_OUTPUT + + deploy-rocketmq: + if: ${{ success() }} + name: Deploy RocketMQ + needs: [ list-version,docker-build ] + runs-on: ubuntu-latest + timeout-minutes: 60 + strategy: + matrix: + version: ${{ fromJSON(needs.list-version.outputs.version-json) }} + steps: + - uses: apache/rocketmq-test-tool@1a646589accad17070423eabf0f54925e52b0666 + name: Deploy rocketmq + with: + action: "deploy" + ask-config: "${{ secrets.ASK_CONFIG_VIRGINA }}" + test-version: "${{ matrix.version }}" + chart-git: "https://ghproxy.com/https://github.com/apache/rocketmq-docker.git" + chart-branch: "master" + chart-path: "./rocketmq-k8s-helm" + job-id: ${{ strategy.job-index }} + helm-values: | + nameserver: + image: + repository: ${{env.DOCKER_REPO}} + tag: ${{ matrix.version }} + broker: + image: + repository: ${{env.DOCKER_REPO}} + tag: ${{ matrix.version }} + proxy: + image: + repository: ${{env.DOCKER_REPO}} + tag: ${{ matrix.version }} + + java-grpc-e2e-test: + if: ${{ success() }} + name: E2E Test + needs: [ list-version, deploy-rocketmq ] + runs-on: ubuntu-latest + timeout-minutes: 60 + strategy: + matrix: + version: ${{ fromJSON(needs.list-version.outputs.version-json) }} + steps: + - uses: apache/rocketmq-test-tool@1a646589accad17070423eabf0f54925e52b0666 + name: e2e test + with: + action: "test" + ask-config: "${{ secrets.ASK_CONFIG_VIRGINA }}" + test-version: "${{ matrix.version }}" + test-code-git: "https://ghproxy.com/https://github.com/apache/rocketmq-e2e.git" + test-code-branch: "master" + test-code-path: java/e2e + test-cmd: "mvn -B test" + job-id: ${{ strategy.job-index }} + - name: Publish Test Report + uses: mikepenz/action-junit-report@v3 + if: always() # always run even if the previous step fails + with: + report_paths: '**/test_report/TEST-*.xml' + annotate_only: true + include_passed: true + detailed_summary: true + - uses: actions/upload-artifact@v3 + if: always() + name: Upload test log + with: + name: testlog.txt + path: testlog.txt + + clean: + if: always() + name: Clean + needs: [ list-version, java-grpc-e2e-test ] + runs-on: ubuntu-latest + timeout-minutes: 60 + strategy: + matrix: + version: ${{ fromJSON(needs.list-version.outputs.version-json) }} + steps: + - uses: apache/rocketmq-test-tool@1a646589accad17070423eabf0f54925e52b0666 + name: clean + with: + action: "clean" + ask-config: "${{ secrets.ASK_CONFIG_VIRGINA }}" + test-version: "${{ matrix.version }}" + job-id: ${{ strategy.job-index }} + snapshot: runs-on: ubuntu-latest + needs: [ java-grpc-e2e-test ] env: NEXUS_DEPLOY_USERNAME: ${{ secrets.NEXUS_USER }} NEXUS_DEPLOY_PASSWORD: ${{ secrets.NEXUS_PW }} From f5f9b10a57903df5a938591c05c9fc9bcdaeba2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Wed, 10 May 2023 20:08:17 +0800 Subject: [PATCH 02/16] Update to support "Snapshot Release" daily test --- .github/workflows/snapshot-automation.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 8c5af7755a9..4bdf1eac9ad 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -11,6 +11,8 @@ jobs: steps: - uses: actions/checkout@v3 with: + ref: develop + persist-credentials: false submodules: true - uses: actions/setup-java@v3 with: From 95974f8c6a3c63c227ca153a0c7bc6dfc86cb173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Thu, 11 May 2023 10:01:05 +0800 Subject: [PATCH 03/16] Modify 'snapshot-automation.yml' --- .github/workflows/snapshot-automation.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 4bdf1eac9ad..a490e1f08bf 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -1,10 +1,11 @@ name: Snapshot Release Automation on: schedule: # schedule the job to run at 12 a.m. daily - - cron: "0 0 * * *" + - cron: "*/10 * * * *" jobs: dist-tar: + if: github.ref == 'refs/heads/cicd' name: Build dist tar runs-on: ubuntu-latest timeout-minutes: 30 @@ -181,6 +182,7 @@ jobs: job-id: ${{ strategy.job-index }} snapshot: + if: github.ref == 'refs/heads/cicd' runs-on: ubuntu-latest needs: [ java-grpc-e2e-test ] env: From 90cc33003f60a07f754a155e963b6800ff1b2eaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Thu, 11 May 2023 10:33:03 +0800 Subject: [PATCH 04/16] Modify 'snapshot-automation.yml' --- .github/workflows/snapshot-automation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index a490e1f08bf..a735a1e2b2f 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -2,10 +2,11 @@ name: Snapshot Release Automation on: schedule: # schedule the job to run at 12 a.m. daily - cron: "*/10 * * * *" + push: + branches: [ cicd ] jobs: dist-tar: - if: github.ref == 'refs/heads/cicd' name: Build dist tar runs-on: ubuntu-latest timeout-minutes: 30 @@ -182,7 +183,6 @@ jobs: job-id: ${{ strategy.job-index }} snapshot: - if: github.ref == 'refs/heads/cicd' runs-on: ubuntu-latest needs: [ java-grpc-e2e-test ] env: From e2765d2655ad81a90f7455a722765be81902f6c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Thu, 11 May 2023 10:45:45 +0800 Subject: [PATCH 05/16] Modify 'snapshot-automation.yml' --- .github/workflows/snapshot-automation.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index a735a1e2b2f..c84cdc08a86 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -5,6 +5,13 @@ on: push: branches: [ cicd ] +concurrency: + group: rocketmq-${{ github.ref }} + +env: + MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 + DOCKER_REPO: zychen143/rocketmq + jobs: dist-tar: name: Build dist tar @@ -13,8 +20,6 @@ jobs: steps: - uses: actions/checkout@v3 with: - ref: develop - persist-credentials: false submodules: true - uses: actions/setup-java@v3 with: @@ -25,7 +30,7 @@ jobs: env: MAVEN_SETTINGS: ${{ github.workspace }}/.github/asf-deploy-settings.xml run: | - mvn -Prelease-all -DskipTests -Dspotbugs.skip=true install -s $MAVEN_SETTINGS + mvn -Prelease-all -DskipTests -Dspotbugs.skip=true clean install -U - uses: actions/upload-artifact@v3 name: Upload distribution tar with: From 8c6c3fba8ac012c2dd049d3f72244d6ac553b373 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Thu, 11 May 2023 14:10:23 +0800 Subject: [PATCH 06/16] Modify 'snapshot-automation.yml' --- .github/workflows/snapshot-automation.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index c84cdc08a86..6a8918fb31d 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -5,9 +5,6 @@ on: push: branches: [ cicd ] -concurrency: - group: rocketmq-${{ github.ref }} - env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 DOCKER_REPO: zychen143/rocketmq @@ -200,11 +197,17 @@ jobs: ref: develop persist-credentials: false - name: Set up JDK - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: java-version: 8 - distribution: "adopt" + distribution: "temurin" cache: "maven" + - name: Update pom version + run: | + VERSION=$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive exec:exec) + VERSION=$(echo $VERSION | awk -F '-SNAPSHOT' '{print $1}') + VERSION=$VERSION-stable-SNAPSHOT + mvn versions:set -DnewVersion=$VERSION - name: Deploy to ASF Snapshots Repository timeout-minutes: 40 run: mvn clean deploy -DskipTests=true --settings .github/asf-deploy-settings.xml From fc8975e4ca488135f01476e807b148c623df20cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Fri, 12 May 2023 10:30:48 +0800 Subject: [PATCH 07/16] Update 'snapshot-automation.yml' --- .github/workflows/snapshot-automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 6a8918fb31d..13b7aff2bca 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -1,7 +1,7 @@ name: Snapshot Release Automation on: schedule: # schedule the job to run at 12 a.m. daily - - cron: "*/10 * * * *" + - cron: "0 0 * * *" push: branches: [ cicd ] From ea22d3b7d55d8ac43ec8fabbfd1fbc5ce070c5fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Fri, 12 May 2023 14:43:55 +0800 Subject: [PATCH 08/16] Update 'snapshot-automation.yml' --- .github/workflows/snapshot-automation.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 13b7aff2bca..ae739969d3f 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -2,12 +2,10 @@ name: Snapshot Release Automation on: schedule: # schedule the job to run at 12 a.m. daily - cron: "0 0 * * *" - push: - branches: [ cicd ] env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - DOCKER_REPO: zychen143/rocketmq + DOCKER_REPO: apache/rocketmq-ci jobs: dist-tar: From f2826f06178f67e11f4bd76e34fb8b4019a6b328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Thu, 18 May 2023 11:40:58 +0800 Subject: [PATCH 09/16] Add Apache header --- .github/workflows/snapshot-automation.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index ae739969d3f..ea40599b66c 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -1,3 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + name: Snapshot Release Automation on: schedule: # schedule the job to run at 12 a.m. daily From ce649c4a66fe2e7d52d27668453443019351a316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Fri, 2 Jun 2023 17:11:33 +0800 Subject: [PATCH 10/16] Supports manual triggering through branch and commitId --- .github/workflows/snapshot-automation.yml | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index ea40599b66c..c89c993794d 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -14,14 +14,23 @@ # See the License for the specific language governing permissions and # limitations under the License. -name: Snapshot Release Automation +name: Snapshot Daily Release Automation on: schedule: # schedule the job to run at 12 a.m. daily - cron: "0 0 * * *" + workflow_dispatch: + inputs: + branch: + description: 'The branch to trigger the workflow' + required: true + default: 'develop' + commit_id: + description: 'The commit id to trigger the workflow' + required: false env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - DOCKER_REPO: apache/rocketmq-ci + DOCKER_REPO: zychen143/rocketmq jobs: dist-tar: @@ -31,6 +40,7 @@ jobs: steps: - uses: actions/checkout@v3 with: + ref: ${{ github.event.inputs.branch }}/${{ github.event.inputs.commit_id || github.sha }} submodules: true - uses: actions/setup-java@v3 with: From 8d94cda9306f99716a6041e5b0199ca05e94e35d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Mon, 5 Jun 2023 18:59:52 +0800 Subject: [PATCH 11/16] Supports manual triggering through branch and commitId --- .github/workflows/snapshot-automation.yml | 37 ++++++++++++++++++----- 1 file changed, 29 insertions(+), 8 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index c89c993794d..5427e2eec1d 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -21,11 +21,13 @@ on: workflow_dispatch: inputs: branch: - description: 'The branch to trigger the workflow' - required: true - default: 'develop' + description: 'The branch to trigger the workflow, The default branch is "develop" when both branch and commit_id are empty' + required: false commit_id: - description: 'The commit id to trigger the workflow' + description: 'The commit id to trigger the workflow. Do not set branch and commit_id together' + required: false + rocketmq_version: + description: 'Name of the SNAPSHOT version to be generated. The default version is "$VERSION-stable-SNAPSHOT"' required: false env: @@ -38,10 +40,24 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 30 steps: - - uses: actions/checkout@v3 + - name: Checkout develop + if: github.event.inputs.branch == '' && github.event.inputs.commit_id == '' + uses: actions/checkout@v3 with: - ref: ${{ github.event.inputs.branch }}/${{ github.event.inputs.commit_id || github.sha }} - submodules: true + ref: develop + + - name: Checkout specific commit + if: github.event.inputs.branch == '' && github.event.inputs.commit_id != '' + uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.commit_id }} + + - name: Checkout specific branch + if: github.event.inputs.branch != '' && github.event.inputs.commit_id == '' + uses: actions/checkout@v3 + with: + ref: ${{ github.event.inputs.branch }} + - uses: actions/setup-java@v3 with: distribution: "temurin" @@ -226,12 +242,17 @@ jobs: java-version: 8 distribution: "temurin" cache: "maven" - - name: Update pom version + - name: Update default pom version + if: github.event.inputs.rocketmq_version == '' run: | VERSION=$(mvn -q -Dexec.executable='echo' -Dexec.args='${project.version}' --non-recursive exec:exec) VERSION=$(echo $VERSION | awk -F '-SNAPSHOT' '{print $1}') VERSION=$VERSION-stable-SNAPSHOT mvn versions:set -DnewVersion=$VERSION + - name: Update User-defined pom version + if: github.event.inputs.rocketmq_version != '' + run: | + mvn versions:set -DnewVersion=${{ github.event.inputs.commit_id }} - name: Deploy to ASF Snapshots Repository timeout-minutes: 40 run: mvn clean deploy -DskipTests=true --settings .github/asf-deploy-settings.xml From 1bfbb80b6c266ff20853d45d003d3fce43767d9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Mon, 5 Jun 2023 19:34:55 +0800 Subject: [PATCH 12/16] Supports manual triggering through branch and commitId --- .github/workflows/snapshot-automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 5427e2eec1d..bc54818458a 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -252,7 +252,7 @@ jobs: - name: Update User-defined pom version if: github.event.inputs.rocketmq_version != '' run: | - mvn versions:set -DnewVersion=${{ github.event.inputs.commit_id }} + mvn versions:set -DnewVersion=${{ github.event.inputs.rocketmq_version }} - name: Deploy to ASF Snapshots Repository timeout-minutes: 40 run: mvn clean deploy -DskipTests=true --settings .github/asf-deploy-settings.xml From f70f9984d1616b6085af4873b794ab715fb69684 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Mon, 5 Jun 2023 19:55:18 +0800 Subject: [PATCH 13/16] Supports manual triggering through branch and commitId --- .github/workflows/snapshot-automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index bc54818458a..0b0c0761569 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -32,7 +32,7 @@ on: env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - DOCKER_REPO: zychen143/rocketmq + DOCKER_REPO: apache/rocketmq-ci jobs: dist-tar: From 4ac26b1a7d1c64b6d48e96a48974a5703461a518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Wed, 14 Jun 2023 16:40:29 +0800 Subject: [PATCH 14/16] Remove the proxy in servers of github actions. --- .github/workflows/snapshot-automation.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 0b0c0761569..88f5f4e0ccb 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -152,7 +152,7 @@ jobs: action: "deploy" ask-config: "${{ secrets.ASK_CONFIG_VIRGINA }}" test-version: "${{ matrix.version }}" - chart-git: "https://ghproxy.com/https://github.com/apache/rocketmq-docker.git" + chart-git: "https://github.com/apache/rocketmq-docker.git" chart-branch: "master" chart-path: "./rocketmq-k8s-helm" job-id: ${{ strategy.job-index }} @@ -186,7 +186,7 @@ jobs: action: "test" ask-config: "${{ secrets.ASK_CONFIG_VIRGINA }}" test-version: "${{ matrix.version }}" - test-code-git: "https://ghproxy.com/https://github.com/apache/rocketmq-e2e.git" + test-code-git: "https://github.com/apache/rocketmq-e2e.git" test-code-branch: "master" test-code-path: java/e2e test-cmd: "mvn -B test" From 73f46ba03ac84a97952ce3a81979e92bf9069bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Wed, 14 Jun 2023 16:56:07 +0800 Subject: [PATCH 15/16] Remove the proxy in servers of github actions. --- .github/workflows/snapshot-automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 88f5f4e0ccb..440ef760141 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -32,7 +32,7 @@ on: env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - DOCKER_REPO: apache/rocketmq-ci + DOCKER_REPO: zychen143/rocketmq jobs: dist-tar: From 22f3aac383e0fb79c5ccfccad8b557aa91afe26f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=88=E4=BC=A2?= Date: Wed, 14 Jun 2023 17:13:21 +0800 Subject: [PATCH 16/16] Update docker repo --- .github/workflows/snapshot-automation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-automation.yml b/.github/workflows/snapshot-automation.yml index 440ef760141..88f5f4e0ccb 100644 --- a/.github/workflows/snapshot-automation.yml +++ b/.github/workflows/snapshot-automation.yml @@ -32,7 +32,7 @@ on: env: MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 - DOCKER_REPO: zychen143/rocketmq + DOCKER_REPO: apache/rocketmq-ci jobs: dist-tar: