Skip to content

Commit

Permalink
Disable experimental publish
Browse files Browse the repository at this point in the history
  • Loading branch information
slide committed Jan 29, 2021
1 parent f786dd8 commit 8c05ce0
Showing 1 changed file with 22 additions and 19 deletions.
41 changes: 22 additions & 19 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -42,16 +42,18 @@ stage('Build') {
}
}

def branchName = "${env.BRANCH_NAME}"
if (branchName ==~ 'master'){
stage('Publish Experimental') {
infra.withDockerCredentials {
withEnv(['DOCKERHUB_ORGANISATION=jenkins4eval','DOCKERHUB_REPO=jenkins']) {
powershell './make.ps1 publish'
}
}
}
}
// disable until we get the parallel changes merged in
//def branchName = "${env.BRANCH_NAME}"
//if (branchName ==~ 'master'){
// stage('Publish Experimental') {
// infra.withDockerCredentials {
// withEnv(['DOCKERHUB_ORGANISATION=jenkins4eval','DOCKERHUB_REPO=jenkins']) {
// powershell './make.ps1 publish'
// }
// }
// }
//}

// Let's always clean up the docker images at the very end
powershell(script: '& docker system prune --force --all', returnStatus: true)
} else {
Expand Down Expand Up @@ -121,15 +123,16 @@ stage('Build') {

parallel builders

def branchName = "${env.BRANCH_NAME}"
if (branchName ==~ 'master'){
stage('Publish Experimental') {
infra.withDockerCredentials {
sh 'make publish-tags'
sh 'make publish-manifests'
}
}
}
// disable until we get the parallel changes merged in
//def branchName = "${env.BRANCH_NAME}"
//if (branchName ==~ 'master'){
// stage('Publish Experimental') {
// infra.withDockerCredentials {
// sh 'make publish-tags'
// sh 'make publish-manifests'
// }
// }
//}

// Let's always clean up the docker images at the very end
sh(script: 'docker system prune --force --all', returnStatus: true)
Expand Down

0 comments on commit 8c05ce0

Please sign in to comment.