Merge branch 'release-2.1' into bugfix/no-matching-column

pingcap · Oct 22, 2019 · feeba26 · feeba26
2 parents 3256ee0 + 6daab4e
commit feeba26
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/.ci/build.groovy b/.ci/build.groovy
@@ -11,7 +11,7 @@ def call(ghprbActualCommit, ghprbPullId, ghprbPullTitle, ghprbPullLink, ghprbPul
             deleteDir()
             container("java") {
                 stage('Checkout') {
-                    dir("/home/jenkins/git/tispark") {
+                    dir("/home/jenkins/agent/git") {
                         sh """
                         archive_url=http://172.16.30.25/download/builds/pingcap/tiflash/cache/tiflash-m2-cache_latest.tar.gz
                         if [ ! "\$(ls -A /maven/.m2/repository)" ]; then curl -sL \$archive_url | tar -zx -C /maven || true; fi
@@ -26,7 +26,7 @@ def call(ghprbActualCommit, ghprbPullId, ghprbPullTitle, ghprbPullLink, ghprbPul
                 stage('Build') {
                     dir("go/src/github.com/pingcap/tispark") {
                         sh """
-                        cp -R /home/jenkins/git/tispark/. ./
+                        cp -R /home/jenkins/agent/git/. ./
                         git checkout -f ${ghprbActualCommit}
                         mvn clean install -Dmaven.test.skip=true
                         """

diff --git a/.ci/integration_test.groovy b/.ci/integration_test.groovy
@@ -77,7 +77,7 @@ def call(ghprbActualCommit, ghprbCommentBody, ghprbPullId, ghprbPullTitle, ghprb
                     sh "curl ${FILE_SERVER_URL}/download/builds/pingcap/pd/${pd_sha1}/centos7/pd-server.tar.gz | tar xz"
                     stash includes: "bin/**", name: "binaries"
 
-                    dir("/home/jenkins/git/tispark") {
+                    dir("/home/jenkins/agent/git") {
                         if (sh(returnStatus: true, script: '[ -d .git ] && [ -f Makefile ] && git rev-parse --git-dir > /dev/null 2>&1') != 0) {
                             deleteDir()
                         }
@@ -87,7 +87,7 @@ def call(ghprbActualCommit, ghprbCommentBody, ghprbPullId, ghprbPullTitle, ghprb
                     dir("go/src/github.com/pingcap/tispark") {
                         deleteDir()
                         sh """
-                        cp -R /home/jenkins/git/tispark/. ./
+                        cp -R /home/jenkins/agent/git/. ./
                         git checkout -f ${ghprbActualCommit}
                         find core/src -name '*Suite*' > test
                         sed -i 's/core\\/src\\/test\\/scala\\///g' test