Pipeline Git checkout fix - environment variable GIT_BRANCH was renam…

…ed to GIT_BRANCH_RELEASE due bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=566931 Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Sep 25, 2020 · c61f171 · c61f171
1 parent a334dab
commit c61f171
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/etc/jenkins/build.groovy b/etc/jenkins/build.groovy
@@ -9,7 +9,7 @@
 //  SPDX-License-Identifier: EPL-2.0 OR BSD-3-Clause
 
 // Job input parameters:
-//   GIT_BRANCH           - Branch to release
+//   GIT_BRANCH_RELEASE   - Branch to release
 
 // Job internal argumets:
 //   GIT_USER_NAME       - Git user name (for commits)
@@ -34,7 +34,7 @@ pipeline {
         // Initialize build environment
         stage('Init') {
             steps {
-                git branch: GIT_BRANCH, credentialsId: SSH_CREDENTIALS_ID, url: GIT_REPOSITORY_URL
+                git branch: GIT_BRANCH_RELEASE, credentialsId: SSH_CREDENTIALS_ID, url: GIT_REPOSITORY_URL
                 withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
                     sh label: '', script: '''
                         gpg --batch --import "${KEYRING}"

diff --git a/etc/jenkins/release.groovy b/etc/jenkins/release.groovy
@@ -18,6 +18,7 @@
 // Job internal argumets:
 //   GIT_USER_NAME       - Git user name (for commits)
 //   GIT_USER_EMAIL      - Git user e-mail (for commits)
+//   GIT_BRANCH_RELEASE  - Git branch to release
 //   SSH_CREDENTIALS_ID  - Jenkins ID of SSH credentials
 //   GPG_CREDENTIALS_ID  - Jenkins ID of GPG credentials (stored as KEYRING variable)
 
@@ -117,7 +118,7 @@ spec:
         stage('Init') {
             steps {
                 container('el-build') {
-                    git branch: GIT_BRANCH, credentialsId: SSH_CREDENTIALS_ID, url: GIT_REPOSITORY_URL
+                    git branch: GIT_BRANCH_RELEASE, credentialsId: SSH_CREDENTIALS_ID, url: GIT_REPOSITORY_URL
                     withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
                         sh label: '', script: '''
                             gpg --batch --import "${KEYRING}"
@@ -138,7 +139,7 @@ spec:
         stage('Build and release Oracle DDL Parser') {
             steps {
                 container('el-build') {
-                    git branch: GIT_BRANCH, credentialsId: SSH_CREDENTIALS_ID, url: GIT_REPOSITORY_URL
+                    git branch: GIT_BRANCH_RELEASE, credentialsId: SSH_CREDENTIALS_ID, url: GIT_REPOSITORY_URL
                     sshagent(['SSH_CREDENTIALS_ID']) {
                         sh '''
                             etc/jenkins/release.sh "${DDLPARSER_VERSION}" "${NEXT_DDLPARSER_VERSION}" "${DRY_RUN}" "${OVERWRITE}"