From 60fae6d79d358ae50f07f3ee03ae3e20c492fbc8 Mon Sep 17 00:00:00 2001 From: amyangfei Date: Fri, 17 Dec 2021 19:38:10 +0800 Subject: [PATCH] ci/cd: rename pingcap/ticdc to pingcap/tiflow --- .../multibranch/build_cdc_multi_branch.groovy | 8 ++++---- .../cd/nightly/build-darwin-amd64-4.0.groovy | 6 +++--- .../cd/nightly/build-darwin-arm64-4.0.groovy | 6 +++--- .../cd/nightly/build-linux-arm64-4.0.groovy | 6 +++--- .../nightly/release_cdc_docker_nightly.groovy | 10 +++++----- .../tiup-release-tidb-master-nightly.groovy | 4 ++-- .../optimization-build-tidb-linux-amd.groovy | 4 ++-- .../cd/release-enterprise-docker.groovy | 8 ++++---- .../pipelines/cd/release_cdc_docker.groovy | 10 +++++----- ...fana-tiup-mirror-update-test-hotfix.groovy | 2 +- .../grafana-tiup-mirror-update-test.groovy | 2 +- ...eus-tiup-mirrior-update-test-hotfix.groovy | 2 +- ...prometheus-tiup-mirrior-update-test.groovy | 2 +- .../ci/ticdc/cdc_ghpr_integration_test.groovy | 10 +++++----- .../cdc_ghpr_kafka_integration_test.groovy | 14 ++++++------- .../ci/ticdc/cdc_ghpr_leak_test.groovy | 12 +++++------ .../pipelines/ci/ticdc/cdc_ghpr_test.groovy | 16 +++++++-------- .../ticdc/dm_ghpr_compatibility_test.groovy | 12 +++++------ .../ci/ticdc/dm_ghpr_integration_test.groovy | 20 +++++++++---------- .../ci/ticdc/integration_test_common.groovy | 14 ++++++------- jenkins/pipelines/qa_release_test.groovy | 4 ++-- misc_tools/create_branch.sh | 4 ++-- misc_tools/create_tag.py | 6 +++--- misc_tools/get_hash.sh | 4 ++-- 24 files changed, 93 insertions(+), 93 deletions(-) diff --git a/jenkins/pipelines/cd/multibranch/build_cdc_multi_branch.groovy b/jenkins/pipelines/cd/multibranch/build_cdc_multi_branch.groovy index 23eb260ef..0d2efcb20 100644 --- a/jenkins/pipelines/cd/multibranch/build_cdc_multi_branch.groovy +++ b/jenkins/pipelines/cd/multibranch/build_cdc_multi_branch.groovy @@ -19,9 +19,9 @@ if (isNeedGo1160) { println "BUILD_NODE_NAME=${GO_BUILD_SLAVE}" println "TEST_NODE_NAME=${GO_TEST_SLAVE}" -def BUILD_URL = 'git@github.com:pingcap/ticdc.git' +def BUILD_URL = 'git@github.com:pingcap/tiflow.git' -def build_path = 'go/src/github.com/pingcap/ticdc' +def build_path = 'go/src/github.com/pingcap/tiflow' def slackcolor = 'good' def githash def ws @@ -89,7 +89,7 @@ try { stage("Upload") { dir(build_path) { def target = "ticdc-${os}-${arch}" - def refspath = "refs/pingcap/ticdc/${env.BRANCH_NAME}/sha1" + def refspath = "refs/pingcap/tiflow/${env.BRANCH_NAME}/sha1" def filepath = "builds/pingcap/ticdc/${githash}/centos7/${target}.tar.gz" container("golang") { timeout(10) { @@ -121,4 +121,4 @@ stage('Summary') { if (currentBuild.result != "SUCCESS" && (branch == "master" || branch.startsWith("release") || branch.startsWith("refs/tags/v"))) { slackSend channel: '#jenkins-ci-build-critical', color: 'danger', teamDomain: 'pingcap', tokenCredentialId: 'slack-pingcap-token', message: "${slackmsg}" } -} \ No newline at end of file +} diff --git a/jenkins/pipelines/cd/nightly/build-darwin-amd64-4.0.groovy b/jenkins/pipelines/cd/nightly/build-darwin-amd64-4.0.groovy index 85bd3df6b..8efdb37c8 100644 --- a/jenkins/pipelines/cd/nightly/build-darwin-amd64-4.0.groovy +++ b/jenkins/pipelines/cd/nightly/build-darwin-amd64-4.0.groovy @@ -233,7 +233,7 @@ try { stage("Build cdc") { - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { def target = "ticdc-${os}-${arch}" def filepath = "builds/pingcap/ticdc/${tag}/${CDC_HASH}/darwin/ticdc-${os}-${arch}.tar.gz" @@ -243,9 +243,9 @@ try { deleteDir() } if(PRE_RELEASE == "true" || RELEASE_TAG == "nightly") { - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'CloneOption', timeout: 60], [$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'CloneOption', timeout: 60], [$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/tiflow.git']]] } else { - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${RELEASE_TAG}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'LocalBranch'],[$class: 'CloneOption', noTags: true, timeout: 60]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}", url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${RELEASE_TAG}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'LocalBranch'],[$class: 'CloneOption', noTags: true, timeout: 60]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}", url: 'git@github.com:pingcap/tiflow.git']]] } } diff --git a/jenkins/pipelines/cd/nightly/build-darwin-arm64-4.0.groovy b/jenkins/pipelines/cd/nightly/build-darwin-arm64-4.0.groovy index 48219d769..3337149e4 100644 --- a/jenkins/pipelines/cd/nightly/build-darwin-arm64-4.0.groovy +++ b/jenkins/pipelines/cd/nightly/build-darwin-arm64-4.0.groovy @@ -264,7 +264,7 @@ try { if(RELEASE_TAG == "nightly" || RELEASE_TAG >= "v4.0.0") { stage("Build cdc") { - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { def target = "ticdc-${os}-${arch}" def filepath = "builds/pingcap/ticdc/${tag}/${CDC_HASH}/${platform}/ticdc-${os}-${arch}.tar.gz" @@ -274,9 +274,9 @@ try { deleteDir() } if(PRE_RELEASE == "true" || RELEASE_TAG == "nightly") { - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'CloneOption', timeout: 60], [$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'CloneOption', timeout: 60], [$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/tiflow.git']]] } else { - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${RELEASE_TAG}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'LocalBranch'],[$class: 'CloneOption', noTags: true, timeout: 60]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}", url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${RELEASE_TAG}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'LocalBranch'],[$class: 'CloneOption', noTags: true, timeout: 60]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}", url: 'git@github.com:pingcap/tiflow.git']]] } } diff --git a/jenkins/pipelines/cd/nightly/build-linux-arm64-4.0.groovy b/jenkins/pipelines/cd/nightly/build-linux-arm64-4.0.groovy index 905b83bc4..e8df463ab 100644 --- a/jenkins/pipelines/cd/nightly/build-linux-arm64-4.0.groovy +++ b/jenkins/pipelines/cd/nightly/build-linux-arm64-4.0.groovy @@ -240,7 +240,7 @@ try { if(RELEASE_TAG == "nightly" || RELEASE_TAG >= "v4.0.0") { stage("Build cdc") { - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { def target = "ticdc-${os}-${arch}" def filepath = "builds/pingcap/ticdc/${tag}/${CDC_HASH}/centos7/ticdc-${os}-${arch}.tar.gz" @@ -252,9 +252,9 @@ try { } if(PRE_RELEASE == "true" || RELEASE_TAG == "nightly") { - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'CloneOption', timeout: 60], [$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'CloneOption', timeout: 60], [$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/tiflow.git']]] } else { - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${RELEASE_TAG}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'LocalBranch'],[$class: 'CloneOption', noTags: true, timeout: 60]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}", url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${RELEASE_TAG}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'CheckoutOption', timeout: 30], [$class: 'LocalBranch'],[$class: 'CloneOption', noTags: true, timeout: 60]], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${RELEASE_TAG}:refs/tags/${RELEASE_TAG}", url: 'git@github.com:pingcap/tiflow.git']]] } } diff --git a/jenkins/pipelines/cd/nightly/release_cdc_docker_nightly.groovy b/jenkins/pipelines/cd/nightly/release_cdc_docker_nightly.groovy index 8078ef5e4..71aa5370c 100644 --- a/jenkins/pipelines/cd/nightly/release_cdc_docker_nightly.groovy +++ b/jenkins/pipelines/cd/nightly/release_cdc_docker_nightly.groovy @@ -1,4 +1,4 @@ -def BUILD_URL = 'git@github.com:pingcap/ticdc.git' +def BUILD_URL = 'git@github.com:pingcap/tiflow.git' def slackcolor = 'good' def githash @@ -30,7 +30,7 @@ try { container('delivery') { sh "rm -rf ./*" stage("Checkout") { - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { // deleteDir() git credentialsId: 'github-sre-bot-ssh', url: "${BUILD_URL}", branch: "master" sh "git checkout ${BUILD_TAG}" @@ -38,7 +38,7 @@ try { } } stage("Build & Upload") { - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { def wss = pwd() def DOCKER_TAG = "${BUILD_TAG}" if ( DOCKER_TAG == "master" ) { @@ -65,13 +65,13 @@ try { cat - >"bin/Dockerfile" < sha1 - curl -F refs/pingcap/ticdc/nightly/sha1=@sha1 ${FILE_SERVER_URL}/upload + curl -F refs/pingcap/tiflow/nightly/sha1=@sha1 ${FILE_SERVER_URL}/upload echo ${tidb_ctl_githash} > sha1 curl -F refs/pingcap/tidb-ctl/nightly/sha1=@sha1 ${FILE_SERVER_URL}/upload @@ -154,4 +154,4 @@ stage('Summary') { if (currentBuild.result != "SUCCESS") { slackSend channel: '#jenkins-ci-build-critical', color: 'danger', teamDomain: 'pingcap', tokenCredentialId: 'slack-pingcap-token', message: "${slackmsg}" } -} \ No newline at end of file +} diff --git a/jenkins/pipelines/cd/optimization-build-tidb-linux-amd.groovy b/jenkins/pipelines/cd/optimization-build-tidb-linux-amd.groovy index 433a96294..7d24f5dc2 100644 --- a/jenkins/pipelines/cd/optimization-build-tidb-linux-amd.groovy +++ b/jenkins/pipelines/cd/optimization-build-tidb-linux-amd.groovy @@ -362,13 +362,13 @@ try { container("golang") { def ws = pwd() deleteDir() - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { if (sh(returnStatus: true, script: '[ -d .git ] || git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } def target = "ticdc-linux-amd64" def filepath = "builds/pingcap/ticdc/optimization/${RELEASE_TAG}/${CDC_HASH}/centos7/ticdc-linux-amd64.tar.gz" - checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: true, scm: [$class: 'GitSCM', branches: [[name: "${CDC_HASH}"]], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: '+refs/heads/*:refs/remotes/origin/*', url: 'git@github.com:pingcap/tiflow.git']]] sh """ for a in \$(git tag --contains ${CDC_HASH}); do echo \$a && git tag -d \$a;done git tag -f ${RELEASE_TAG} ${CDC_HASH} diff --git a/jenkins/pipelines/cd/release-enterprise-docker.groovy b/jenkins/pipelines/cd/release-enterprise-docker.groovy index a5344e07f..b754e0f33 100644 --- a/jenkins/pipelines/cd/release-enterprise-docker.groovy +++ b/jenkins/pipelines/cd/release-enterprise-docker.groovy @@ -241,7 +241,7 @@ __EOF__ } builds["Push cdc Docker"] = { - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { // deleteDir() checkout changelog: false, poll: true, @@ -252,7 +252,7 @@ __EOF__ submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: "+refs/tags/${CDC_TAG}:refs/tags/${CDC_TAG}", - url: 'git@github.com:pingcap/ticdc.git']] + url: 'git@github.com:pingcap/tiflow.git']] ] def DOCKER_TAG = "${RELEASE_TAG}" @@ -266,13 +266,13 @@ __EOF__ cat - >"bin/Dockerfile" <"bin/Dockerfile" < rm -rf tikv-* wget -qnc https://raw.githubusercontent.com/pingcap/tidb-binlog/${RELEASE_BRANCH}/metrics/grafana/binlog.json || true; \ - wget -qnc https://raw.githubusercontent.com/pingcap/ticdc/${RELEASE_BRANCH}/metrics/grafana/ticdc.json || true; \ + wget -qnc https://raw.githubusercontent.com/pingcap/tiflow/${RELEASE_BRANCH}/metrics/grafana/ticdc.json || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/monitoring/master/platform-monitoring/ansible/grafana/disk_performance.json || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/monitoring/master/platform-monitoring/ansible/grafana/blackbox_exporter.json || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/monitoring/master/platform-monitoring/ansible/grafana/node.json || true; \ diff --git a/jenkins/pipelines/cd/tiup/grafana-tiup-mirror-update-test.groovy b/jenkins/pipelines/cd/tiup/grafana-tiup-mirror-update-test.groovy index 21e289bf1..3b72c8224 100644 --- a/jenkins/pipelines/cd/tiup/grafana-tiup-mirror-update-test.groovy +++ b/jenkins/pipelines/cd/tiup/grafana-tiup-mirror-update-test.groovy @@ -67,7 +67,7 @@ def pack = { version, os, arch -> rm -rf tikv-* wget -qnc https://raw.githubusercontent.com/pingcap/tidb-binlog/${tag}/metrics/grafana/binlog.json || true; \ - wget -qnc https://raw.githubusercontent.com/pingcap/ticdc/${tag}/metrics/grafana/ticdc.json || true; \ + wget -qnc https://raw.githubusercontent.com/pingcap/tiflow/${tag}/metrics/grafana/ticdc.json || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/monitoring/master/platform-monitoring/ansible/grafana/disk_performance.json || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/monitoring/master/platform-monitoring/ansible/grafana/blackbox_exporter.json || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/monitoring/master/platform-monitoring/ansible/grafana/node.json || true; \ diff --git a/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test-hotfix.groovy b/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test-hotfix.groovy index ece33dc97..e4b9f247c 100644 --- a/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test-hotfix.groovy +++ b/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test-hotfix.groovy @@ -106,7 +106,7 @@ def pack = { version, os, arch -> wget -qnc https://raw.githubusercontent.com/tikv/tikv/${RELEASE_BRANCH}/metrics/alertmanager/tikv.rules.yml || true; \ wget -qnc https://raw.githubusercontent.com/tikv/tikv/${RELEASE_BRANCH}/metrics/alertmanager/tikv.accelerate.rules.yml || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/tidb-binlog/${RELEASE_BRANCH}/metrics/alertmanager/binlog.rules.yml || true; \ - wget -qnc https://raw.githubusercontent.com/pingcap/ticdc/${RELEASE_BRANCH}/metrics/alertmanager/ticdc.rules.yml || true; \ + wget -qnc https://raw.githubusercontent.com/pingcap/tiflow/${RELEASE_BRANCH}/metrics/alertmanager/ticdc.rules.yml || true; \ if [ ${HOTFIX_TAG} \\> "v5.2.0" ] || [ ${HOTFIX_TAG} == "v5.2.0" ]; then \ wget -qnc https://raw.githubusercontent.com/pingcap/tidb/${RELEASE_BRANCH}/br/metrics/alertmanager/lightning.rules.yml || true; \ else diff --git a/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test.groovy b/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test.groovy index a369eb764..8a9998695 100644 --- a/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test.groovy +++ b/jenkins/pipelines/cd/tiup/prometheus-tiup-mirrior-update-test.groovy @@ -106,7 +106,7 @@ def pack = { version, os, arch -> wget -qnc https://raw.githubusercontent.com/tikv/tikv/${tag}/metrics/alertmanager/tikv.rules.yml || true; \ wget -qnc https://raw.githubusercontent.com/tikv/tikv/${tag}/metrics/alertmanager/tikv.accelerate.rules.yml || true; \ wget -qnc https://raw.githubusercontent.com/pingcap/tidb-binlog/${tag}/metrics/alertmanager/binlog.rules.yml || true; \ - wget -qnc https://raw.githubusercontent.com/pingcap/ticdc/${tag}/metrics/alertmanager/ticdc.rules.yml || true; \ + wget -qnc https://raw.githubusercontent.com/pingcap/tiflow/${tag}/metrics/alertmanager/ticdc.rules.yml || true; \ if [ ${RELEASE_TAG} \\> "v5.2.0" ] || [ ${RELEASE_TAG} == "v5.2.0" ]; then \ wget -qnc https://raw.githubusercontent.com/pingcap/tidb/${tag}/br/metrics/alertmanager/lightning.rules.yml || true; \ else diff --git a/jenkins/pipelines/ci/ticdc/cdc_ghpr_integration_test.groovy b/jenkins/pipelines/ci/ticdc/cdc_ghpr_integration_test.groovy index a5ad7dfa5..5443e7533 100644 --- a/jenkins/pipelines/ci/ticdc/cdc_ghpr_integration_test.groovy +++ b/jenkins/pipelines/ci/ticdc/cdc_ghpr_integration_test.groovy @@ -100,13 +100,13 @@ catchError { def ws = pwd() deleteDir() - dir("${ws}/go/src/github.com/pingcap/ticdc") { + dir("${ws}/go/src/github.com/pingcap/tiflow") { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { - echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/ticdc" + echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/tiflow" deleteDir() } try { - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } catch (info) { retry(2) { echo "checkout failed, retry.." @@ -114,7 +114,7 @@ catchError { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } } sh "git checkout -f ${ghprbActualCommit}" @@ -141,7 +141,7 @@ catchError { } - stash includes: "go/src/github.com/pingcap/ticdc/**", name: "ticdc", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/**", name: "ticdc", useDefaultExcludes: false } def script_path = "go/src/github.com/pingcap/ci/jenkins/pipelines/ci/ticdc/integration_test_common.groovy" diff --git a/jenkins/pipelines/ci/ticdc/cdc_ghpr_kafka_integration_test.groovy b/jenkins/pipelines/ci/ticdc/cdc_ghpr_kafka_integration_test.groovy index c2ae65a81..a1b14f0ee 100644 --- a/jenkins/pipelines/ci/ticdc/cdc_ghpr_kafka_integration_test.groovy +++ b/jenkins/pipelines/ci/ticdc/cdc_ghpr_kafka_integration_test.groovy @@ -76,13 +76,13 @@ catchError { def ws = pwd() deleteDir() - dir("${ws}/go/src/github.com/pingcap/ticdc") { + dir("${ws}/go/src/github.com/pingcap/tiflow") { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { - echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/ticdc" + echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/tiflow" deleteDir() } try { - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } catch (info) { retry(2) { echo "checkout failed, retry.." @@ -90,7 +90,7 @@ catchError { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } } sh "git checkout -f ${ghprbActualCommit}" @@ -117,15 +117,15 @@ catchError { } - stash includes: "go/src/github.com/pingcap/ticdc/**", name: "ticdc", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/**", name: "ticdc", useDefaultExcludes: false } def script_path = "go/src/github.com/pingcap/ci/jenkins/pipelines/ci/ticdc/integration_test_common.groovy" def common = load script_path // HACK! Download jks by injecting RACK_COMMAND - // https://git.io/JJZXX -> https://github.com/pingcap/ticdc/raw/6e62afcfecc4e3965d8818784327d4bf2600d9fa/tests/_certificates/kafka.server.keystore.jks - // https://git.io/JJZXM -> https://github.com/pingcap/ticdc/raw/6e62afcfecc4e3965d8818784327d4bf2600d9fa/tests/_certificates/kafka.server.truststore.jks + // https://git.io/JJZXX -> https://github.com/pingcap/tiflow/raw/6e62afcfecc4e3965d8818784327d4bf2600d9fa/tests/_certificates/kafka.server.keystore.jks + // https://git.io/JJZXM -> https://github.com/pingcap/tiflow/raw/6e62afcfecc4e3965d8818784327d4bf2600d9fa/tests/_certificates/kafka.server.truststore.jks def download_jks = 'curl -sfL https://git.io/JJZXX -o /tmp/kafka.server.keystore.jks && curl -sfL https://git.io/JJZXM -o /tmp/kafka.server.truststore.jks' catchError { diff --git a/jenkins/pipelines/ci/ticdc/cdc_ghpr_leak_test.groovy b/jenkins/pipelines/ci/ticdc/cdc_ghpr_leak_test.groovy index 71e2467df..4947da3c1 100644 --- a/jenkins/pipelines/ci/ticdc/cdc_ghpr_leak_test.groovy +++ b/jenkins/pipelines/ci/ticdc/cdc_ghpr_leak_test.groovy @@ -93,13 +93,13 @@ catchError { def ws = pwd() deleteDir() - dir("${ws}/go/src/github.com/pingcap/ticdc") { + dir("${ws}/go/src/github.com/pingcap/tiflow") { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { - echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/ticdc" + echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/tiflow" deleteDir() } try { - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } catch (info) { retry(2) { echo "checkout failed, retry.." @@ -107,7 +107,7 @@ catchError { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } } sh "git checkout -f ${ghprbActualCommit}" @@ -134,7 +134,7 @@ catchError { } - stash includes: "go/src/github.com/pingcap/ticdc/**", name: "ticdc", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/**", name: "ticdc", useDefaultExcludes: false } catchError { @@ -145,7 +145,7 @@ catchError { deleteDir() unstash 'ticdc' - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { sh """ GOPATH=\$GOPATH:${ws}/go PATH=\$GOPATH/bin:${ws}/go/bin:\$PATH make leak_test """ diff --git a/jenkins/pipelines/ci/ticdc/cdc_ghpr_test.groovy b/jenkins/pipelines/ci/ticdc/cdc_ghpr_test.groovy index 6d9baecdc..0729e079e 100644 --- a/jenkins/pipelines/ci/ticdc/cdc_ghpr_test.groovy +++ b/jenkins/pipelines/ci/ticdc/cdc_ghpr_test.groovy @@ -92,13 +92,13 @@ catchError { def ws = pwd() deleteDir() - dir("${ws}/go/src/github.com/pingcap/ticdc") { + dir("${ws}/go/src/github.com/pingcap/tiflow") { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { - echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/ticdc" + echo "Not a valid git folder: ${ws}/go/src/github.com/pingcap/tiflow" deleteDir() } try { - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } catch (info) { retry(2) { echo "checkout failed, retry.." @@ -106,7 +106,7 @@ catchError { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } } sh "git checkout -f ${ghprbActualCommit}" @@ -133,7 +133,7 @@ catchError { } - stash includes: "go/src/github.com/pingcap/ticdc/**", name: "ticdc", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/**", name: "ticdc", useDefaultExcludes: false } catchError { @@ -144,7 +144,7 @@ catchError { deleteDir() unstash 'ticdc' - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { sh """ rm -rf /tmp/tidb_cdc_test mkdir -p /tmp/tidb_cdc_test @@ -158,7 +158,7 @@ catchError { tail /tmp/tidb_cdc_test/cov* """ } - stash includes: "go/src/github.com/pingcap/ticdc/cov_dir/**", name: "unit_test", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/cov_dir/**", name: "unit_test", useDefaultExcludes: false } } } @@ -173,7 +173,7 @@ catchError { unstash 'ticdc' unstash 'unit_test' - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { container("golang") { archiveArtifacts artifacts: 'cov_dir/*', fingerprint: true withCredentials([string(credentialsId: 'codecov-token-ticdc', variable: 'CODECOV_TOKEN')]) { diff --git a/jenkins/pipelines/ci/ticdc/dm_ghpr_compatibility_test.groovy b/jenkins/pipelines/ci/ticdc/dm_ghpr_compatibility_test.groovy index 6d8720df3..7ccbef44b 100644 --- a/jenkins/pipelines/ci/ticdc/dm_ghpr_compatibility_test.groovy +++ b/jenkins/pipelines/ci/ticdc/dm_ghpr_compatibility_test.groovy @@ -80,7 +80,7 @@ catchError { deleteDir() } try { - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } catch (error) { retry(2) { echo "checkout failed, retry.." @@ -88,12 +88,12 @@ catchError { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } } } - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { sh """ cp -R /home/jenkins/agent/git/ticdc/. ./ @@ -112,7 +112,7 @@ catchError { """ } - stash includes: "go/src/github.com/pingcap/ticdc/**", name: "ticdc", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/**", name: "ticdc", useDefaultExcludes: false def tidb_sha1 = sh(returnStdout: true, script: "curl ${FILE_SERVER_URL}/download/refs/pingcap/tidb/${TIDB_BRANCH}/sha1").trim() sh "curl ${FILE_SERVER_URL}/download/builds/pingcap/tidb/${tidb_sha1}/centos7/tidb-server.tar.gz | tar xz" @@ -180,7 +180,7 @@ catchError { deleteDir() unstash "ticdc" unstash "binaries" - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { try { sh """ rm -rf /tmp/dm_test @@ -216,7 +216,7 @@ catchError { """ } } - stash includes: "go/src/github.com/pingcap/ticdc/cov_dir/**", name: "integration-cov-${TEST_CASE}" + stash includes: "go/src/github.com/pingcap/tiflow/cov_dir/**", name: "integration-cov-${TEST_CASE}" } } } diff --git a/jenkins/pipelines/ci/ticdc/dm_ghpr_integration_test.groovy b/jenkins/pipelines/ci/ticdc/dm_ghpr_integration_test.groovy index cc1b33f30..a2ddf73f5 100644 --- a/jenkins/pipelines/ci/ticdc/dm_ghpr_integration_test.groovy +++ b/jenkins/pipelines/ci/ticdc/dm_ghpr_integration_test.groovy @@ -53,15 +53,15 @@ def checkout_and_stash_dm_code() { dir('/home/jenkins/agent/git/ticdc') { if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) { deleteDir() } - checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/ticdc.git']]] + checkout changelog: false, poll: false, scm: [$class: 'GitSCM', branches: [[name: 'master']], doGenerateSubmoduleConfigurations: false, extensions: [[$class: 'PruneStaleBranch'], [$class: 'CleanBeforeCheckout']], submoduleCfg: [], userRemoteConfigs: [[credentialsId: 'github-sre-bot-ssh', refspec: specStr, url: 'git@github.com:pingcap/tiflow.git']]] } - dir('go/src/github.com/pingcap/ticdc') { + dir('go/src/github.com/pingcap/tiflow') { sh """cp -R /home/jenkins/agent/git/ticdc/. ./ git checkout -f ${ghprbActualCommit} """ } - stash includes: 'go/src/github.com/pingcap/ticdc/**', name: 'ticdc', useDefaultExcludes: false + stash includes: 'go/src/github.com/pingcap/tiflow/**', name: 'ticdc', useDefaultExcludes: false } } } @@ -72,7 +72,7 @@ def build_dm_bin() { deleteDir() unstash 'ticdc' ws = pwd() - dir('go/src/github.com/pingcap/ticdc') { + dir('go/src/github.com/pingcap/tiflow') { println "debug command:\nkubectl -n jenkins-tidb exec -ti ${env.NODE_NAME} bash" // build it test bin @@ -96,7 +96,7 @@ def build_dm_bin() { sh 'mv gh-ost bin/' } dir("${ws}") { - stash includes: 'go/src/github.com/pingcap/ticdc/**', name: 'ticdc-with-bin', useDefaultExcludes: false + stash includes: 'go/src/github.com/pingcap/tiflow/**', name: 'ticdc-with-bin', useDefaultExcludes: false } } } @@ -164,7 +164,7 @@ def run_tls_source_it_test(String case_name) { sh "ls /var/lib/mysql" unstash 'ticdc-with-bin' - dir('go/src/github.com/pingcap/ticdc') { + dir('go/src/github.com/pingcap/tiflow') { try { sh""" rm -rf /tmp/dm_test @@ -199,7 +199,7 @@ def run_tls_source_it_test(String case_name) { throw e } } - stash includes: 'go/src/github.com/pingcap/ticdc/cov_dir/**', name: "integration-cov-${case_name}" + stash includes: 'go/src/github.com/pingcap/tiflow/cov_dir/**', name: "integration-cov-${case_name}" } } } @@ -245,7 +245,7 @@ def run_single_it_test(String case_name) { def ws = pwd() deleteDir() unstash 'ticdc-with-bin' - dir('go/src/github.com/pingcap/ticdc') { + dir('go/src/github.com/pingcap/tiflow') { try { sh""" rm -rf /tmp/dm_test @@ -280,7 +280,7 @@ def run_single_it_test(String case_name) { throw e } } - stash includes: 'go/src/github.com/pingcap/ticdc/cov_dir/**', name: "integration-cov-${case_name}" + stash includes: 'go/src/github.com/pingcap/tiflow/cov_dir/**', name: "integration-cov-${case_name}" } } } @@ -331,7 +331,7 @@ def run_make_coverage() { } catch (Exception e) { println e } - dir('go/src/github.com/pingcap/ticdc') { + dir('go/src/github.com/pingcap/tiflow') { container('golang') { timeout(30) { sh """ diff --git a/jenkins/pipelines/ci/ticdc/integration_test_common.groovy b/jenkins/pipelines/ci/ticdc/integration_test_common.groovy index fd411b693..750e8bb06 100644 --- a/jenkins/pipelines/ci/ticdc/integration_test_common.groovy +++ b/jenkins/pipelines/ci/ticdc/integration_test_common.groovy @@ -51,7 +51,7 @@ def prepare_binaries() { deleteDir() unstash 'ticdc' - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { sh """ GOPATH=\$GOPATH:${ws}/go PATH=\$GOPATH/bin:${ws}/go/bin:\$PATH make cdc GOPATH=\$GOPATH:${ws}/go PATH=\$GOPATH/bin:${ws}/go/bin:\$PATH make integration_test_build @@ -61,14 +61,14 @@ def prepare_binaries() { curl -F test/cdc/ci/ticdc_bin_${env.BUILD_NUMBER}.tar.gz=@ticdc_bin.tar.gz http://fileserver.pingcap.net/upload """ } - dir("go/src/github.com/pingcap/ticdc/tests/integration_tests") { + dir("go/src/github.com/pingcap/tiflow/tests/integration_tests") { def cases_name = sh( script: 'find . -maxdepth 2 -mindepth 2 -name \'run.sh\' | awk -F/ \'{print $2}\'', returnStdout: true ).trim().split().join(" ") sh "echo ${cases_name} > CASES" } - stash includes: "go/src/github.com/pingcap/ticdc/tests/integration_tests/CASES", name: "cases_name", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/tests/integration_tests/CASES", name: "cases_name", useDefaultExcludes: false } } } @@ -98,7 +98,7 @@ def tests(sink_type, node_label) { println "work space path:\n${ws}" println "this step will run tests: ${case_names}" unstash 'ticdc' - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { download_binaries() try { sh """ @@ -130,7 +130,7 @@ def tests(sink_type, node_label) { throw e; } } - stash includes: "go/src/github.com/pingcap/ticdc/cov_dir/**", name: "integration_test_${step_name}", useDefaultExcludes: false + stash includes: "go/src/github.com/pingcap/tiflow/cov_dir/**", name: "integration_test_${step_name}", useDefaultExcludes: false } } } @@ -139,7 +139,7 @@ def tests(sink_type, node_label) { // Gets the name of each case. unstash 'cases_name' def cases_name = sh( - script: 'cat go/src/github.com/pingcap/ticdc/tests/integration_tests/CASES', + script: 'cat go/src/github.com/pingcap/tiflow/tests/integration_tests/CASES', returnStdout: true ).trim().split() @@ -290,7 +290,7 @@ def coverage() { unstash item } - dir("go/src/github.com/pingcap/ticdc") { + dir("go/src/github.com/pingcap/tiflow") { container("golang") { archiveArtifacts artifacts: 'cov_dir/*', fingerprint: true withCredentials([string(credentialsId: 'coveralls-token-ticdc', variable: 'COVERALLS_TOKEN')]) { diff --git a/jenkins/pipelines/qa_release_test.groovy b/jenkins/pipelines/qa_release_test.groovy index f7717c1e4..4e14f4f22 100644 --- a/jenkins/pipelines/qa_release_test.groovy +++ b/jenkins/pipelines/qa_release_test.groovy @@ -57,7 +57,7 @@ catchError { sh "inv upload --dst refs/pingcap/br/${release_info.br_commit}/sha1 --content ${release_info.br_commit}" } if (release_info.containsKey("ticdc_commit") && release_info.ticdc_commit != "") { - sh "inv upload --dst refs/pingcap/ticdc/${release_info.ticdc_commit}/sha1 --content ${release_info.ticdc_commit}" + sh "inv upload --dst refs/pingcap/tiflow/${release_info.ticdc_commit}/sha1 --content ${release_info.ticdc_commit}" } for (int i = 0; i < release_info.tidb_old_commits.size(); i++) { sh "inv upload --dst builds/download/refs/pingcap/tidb/${release_info.tidb_old_commits[i]}/sha1 --content ${release_info.tidb_old_commits[i]}" @@ -84,7 +84,7 @@ catchError { sh "inv upload --dst refs/pingcap/br/${release_info.br_commit}/sha1 --content ${release_info.br_commit}" } if (release_info.containsKey("ticdc_commit") && release_info.ticdc_commit != "") { - sh "inv upload --dst refs/pingcap/ticdc/${release_info.ticdc_commit}/sha1 --content ${release_info.ticdc_commit}" + sh "inv upload --dst refs/pingcap/tiflow/${release_info.ticdc_commit}/sha1 --content ${release_info.ticdc_commit}" } for (int i = 0; i < release_info.tidb_old_commits.size(); i++) { sh "inv upload --dst builds/download/refs/pingcap/tidb/${release_info.tidb_old_commits[i]}/sha1 --content ${release_info.tidb_old_commits[i]}" diff --git a/misc_tools/create_branch.sh b/misc_tools/create_branch.sh index 843d88404..72e29ac82 100644 --- a/misc_tools/create_branch.sh +++ b/misc_tools/create_branch.sh @@ -2,7 +2,7 @@ base_branch=master new_branch=release-5.0 # Should check if tikv/importer's base branch is master, if not, remove it from repo list and create the tikv/importer's branch by hand -repo_list="pingcap/tidb pingcap/parser tikv/tikv tikv/pd pingcap/tics pingcap/br pingcap/tidb-binlog pingcap/tidb-tools pingcap/ticdc pingcap/dumpling pingcap/tiflash" +repo_list="pingcap/tidb pingcap/parser tikv/tikv tikv/pd pingcap/tics pingcap/br pingcap/tidb-binlog pingcap/tidb-tools pingcap/tiflow pingcap/dumpling pingcap/tiflash" set -x for repo in $repo_list;do @@ -10,4 +10,4 @@ sha=$(curl -H "Authorization: token $TOKEN" https://api.github.com/repos/$repo/g curl -X POST -H "Authorization: token $TOKEN" \ -d "{\"ref\": \"refs/heads/$new_branch\",\"sha\": \"$sha\"}" "https://api.github.com/repos/$repo/git/refs" -done \ No newline at end of file +done diff --git a/misc_tools/create_tag.py b/misc_tools/create_tag.py index d6346b9d0..b9b82f641 100644 --- a/misc_tools/create_tag.py +++ b/misc_tools/create_tag.py @@ -62,7 +62,7 @@ def __init__(self, repo_name, repo_addr, tag_githash='', version=''): version=''), repo_info( repo_name='ticdc', - repo_addr='pingcap/ticdc', + repo_addr='pingcap/tiflow', tag_githash='', version=''), repo_info( @@ -96,6 +96,6 @@ def create_git_tag(): if __name__ == '__main__': token = sys.argv[1] - g = Github(token) # personal token + g = Github(token) # personal token get_repo_tags() - create_git_tag() \ No newline at end of file + create_git_tag() diff --git a/misc_tools/get_hash.sh b/misc_tools/get_hash.sh index 4b5898cf1..90bc3df50 100644 --- a/misc_tools/get_hash.sh +++ b/misc_tools/get_hash.sh @@ -3,7 +3,7 @@ branch=$1 -repo_list="pingcap/tidb tikv/tikv tikv/pd pingcap/tics pingcap/br pingcap/tidb-binlog pingcap/tidb-tools pingcap/ticdc tikv/importer" +repo_list="pingcap/tidb tikv/tikv tikv/pd pingcap/tics pingcap/br pingcap/tidb-binlog pingcap/tidb-tools pingcap/tiflow tikv/importer" for repo in $repo_list;do sha=$(curl -H "Authorization: token $TOKEN" https://api.github.com/repos/$repo/git/refs/heads/$branch | jq -r '.object.sha') @@ -15,4 +15,4 @@ branch="master" for repo in $master_base_repo_list;do sha=$(curl -H "Authorization: token $TOKEN" https://api.github.com/repos/$repo/git/refs/heads/$branch | jq -r '.object.sha') echo ${repo} ":" ${sha} -done \ No newline at end of file +done