[mater] Jenkins build/release job git fix (#12)

* Pipeline Git checkout fix Signed-off-by: Radek Felcman <radek.felcman@oracle.com>
eclipse-ee4j · Sep 11, 2020 · a334dab · a334dab
1 parent 275820b
commit a334dab
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/etc/jenkins/build.groovy b/etc/jenkins/build.groovy
@@ -34,7 +34,7 @@ pipeline {
         // Initialize build environment
         stage('Init') {
             steps {
-                git branch: '${GIT_BRANCH}', url: '${GIT_REPOSITORY_URL}'
+                git branch: GIT_BRANCH, 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
@@ -117,7 +117,7 @@ spec:
         stage('Init') {
             steps {
                 container('el-build') {
-                    git branch: '${GIT_BRANCH}', credentialsId: '${SSH_CREDENTIALS_ID}', url: '${GIT_REPOSITORY_URL}'
+                    git branch: GIT_BRANCH, 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 +138,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, 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}"