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

Fix/jenkinsfile branch name #16

Merged
merged 2 commits into from
Dec 7, 2017
Merged

Fix/jenkinsfile branch name #16

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ceb6f6e
Add fixed Jenkinsfile, fix branch names
ONS-Tom Dec 6, 2017
06def01
Change Gitlab branch to develop
ONS-Tom Dec 6, 2017
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
20 changes: 10 additions & 10 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ pipeline {
deleteDir()
checkout scm
dir('conf') {
git(url: "$GITLAB_URL/BusinessIndex/bi-ui.git", credentialsId: 'bi-gitlab-id', branch: 'feature/manifests')
git(url: "$GITLAB_URL/BusinessIndex/bi-ui.git", credentialsId: 'bi-gitlab-id', branch: 'develop')
}
stash name: 'app'
script {
Expand Down Expand Up @@ -155,9 +155,9 @@ pipeline {
agent { label 'GMU' }
when {
anyOf {
branch DEPLOY_DEV
branch DEPLOY_TEST
branch DEPLOY_PROD
branch BRANCH_DEV
branch BRANCH_TEST
branch BRANCH_PROD
}
}
steps {
Expand Down Expand Up @@ -189,8 +189,8 @@ pipeline {
agent { label 'GMU' }
when {
anyOf {
branch DEPLOY_DEV
branch DEPLOY_TEST
branch BRANCH_DEV
branch BRANCH_TEST
}
}
steps {
Expand All @@ -205,8 +205,8 @@ pipeline {
agent { label 'GMU' }
when {
anyOf {
branch DEPLOY_DEV
branch DEPLOY_TEST
branch BRANCH_DEV
branch BRANCH_TEST
}
}
steps {
Expand All @@ -219,7 +219,7 @@ pipeline {
agent { label 'GMU' }
when {
anyOf {
branch DEPLOY_PROD
branch BRANCH_PROD
}
}
steps {
Expand All @@ -235,7 +235,7 @@ pipeline {
agent { label 'GMU' }
when {
anyOf {
branch "master"
branch BRANCH_PROD
}
}
steps {
Expand Down