diff --git a/Jenkinsfile b/Jenkinsfile index 7d4707b11753cdc53188eb79781e2c244feb99c3..ec0c419901a1313d5305f2188746e4986c1e40f9 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,31 +8,14 @@ pipeline { CHARTMUSEUM_CREDS = credentials('jenkins-x-chartmuseum') } stages { - stage('CI Build and push snapshot') { - when { - branch 'PR-*' - } - environment { - PREVIEW_VERSION = "0.0.0-SNAPSHOT-$BRANCH_NAME-$BUILD_NUMBER" - PREVIEW_NAMESPACE = "$APP_NAME-$BRANCH_NAME".toLowerCase() - HELM_RELEASE = "$PREVIEW_NAMESPACE".toLowerCase() - } - steps { - container('maven') { - sh "mvn versions:set -DnewVersion=$PREVIEW_VERSION" - sh "mvn install" - } - - } - } stage('Build Release') { when { - branch 'develop' + branch '7.0.x' } steps { container('maven') { // ensure we're not on a detached head - sh "git checkout develop" + sh "git checkout 7.0.x" sh "git config --global credential.helper store" sh "jx step git credentials"