Use ${sha1} instead of ${ghprbActualCommit} for Pre-commit Jobs

Descriptions of the changes in this PR: ### Motivation According to the documentation of the GitHub Pull Request plugin: - ${sha1} means a commit which is the result of merging the PR branch with the target branch - ${ghprbActualCommit} is directly the PR branch So currently we are not testing the PR branch against the target branch, but only the branch "as it is" see: https://www.google.com/url?sa=t&rct=j&q=&esrc=s&source=web&cd=4&ved=2ahUKEwje0PjpnuDeAhUF2SwKHXN4BgYQFjADegQIAxAB&url=https%3A%2F%2Fwiki.jenkins.io%2Fdisplay%2FJENKINS%2FGitHub%2Bpull%2Brequest%2Bbuilder%2Bplugin&usg=AOvVaw2XvPL5ynRYnqVEWqpe9cs1 ### Changes Use ${sha1} instead of ${ghprbActualCommit} for Pre-commit Jobs Reviewers: Ivan Kelly <[email protected]>, Sijie Guo This closes apache#1818 from eolivelli/fix/jenskin-use-sha1
horizonzy · Nov 28, 2018 · 6d4e5c8 · 6d4e5c8
1 parent 5602c51
commit 6d4e5c8
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_bookie_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_bookie_tests.groovy
@@ -35,7 +35,7 @@ freeStyleJob('bookkeeper_precommit_bookie_tests') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_client_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_client_tests.groovy
@@ -35,7 +35,7 @@ freeStyleJob('bookkeeper_precommit_client_tests') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_integrationtests.groovy
@@ -32,7 +32,7 @@ freeStyleJob('bookkeeper_precommit_integrationtests') {
         'JDK 1.8 (latest)',
         200,
         'ubuntu',
-        '${ghprbActualCommit}')
+        '${sha1}')
 
     throttleConcurrentBuilds {
         // limit builds to 1 per node to avoid conflicts on building docker images

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_java8.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_java8.groovy
@@ -44,7 +44,7 @@ mavenJob('bookkeeper_precommit_pullrequest_java8') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_java9.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_java9.groovy
@@ -44,7 +44,7 @@ mavenJob('bookkeeper_precommit_pullrequest_java9') {
     'JDK 1.9 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_remaining_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_remaining_tests.groovy
@@ -39,7 +39,7 @@ freeStyleJob('bookkeeper_precommit_remaining_tests') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_replication_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_replication_tests.groovy
@@ -35,7 +35,7 @@ freeStyleJob('bookkeeper_precommit_replication_tests') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_tls_tests.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_tls_tests.groovy
@@ -35,7 +35,7 @@ freeStyleJob('bookkeeper_precommit_tls_tests') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(

diff --git a/.test-infra/jenkins/job_bookkeeper_precommit_validation.groovy b/.test-infra/jenkins/job_bookkeeper_precommit_validation.groovy
@@ -35,7 +35,7 @@ mavenJob('bookkeeper_precommit_pullrequest_validation') {
     'JDK 1.8 (latest)',
     200,
     'ubuntu',
-    '${ghprbActualCommit}')
+    '${sha1}')
 
   // Sets that this is a PreCommit job.
   common_job_properties.setPreCommit(