Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 2 commits into from
Sep 11, 2020
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2358ab2
Pipeline Git checkout fix
rfelcman Sep 10, 2020
d07bbcc
Pipeline Git checkout fix
rfelcman Sep 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion etc/jenkins/build.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
4 changes: 2 additions & 2 deletions etc/jenkins/release.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand All @@ -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}"
Expand Down