diff --git a/Jenkinsfile b/Jenkinsfile index ab17177..e940f3d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -4,7 +4,7 @@ pipeline { stage('Checkout') { when { beforeAgent true - expression { env.BRANCH_NAME == 'main' } + expression { env.GIT_BRANCH == 'origin/main' } } agent { label 'agent-12' } steps { @@ -14,7 +14,7 @@ pipeline { stage('Build') { when { beforeAgent true - expression { env.BRANCH_NAME == 'main' } + expression { env.GIT_BRANCH == 'origin/main' } } agent { label 'agent-12' } steps { @@ -26,7 +26,7 @@ pipeline { stage('Deploy') { when { beforeAgent true - expression { env.BRANCH_NAME == 'main' } + expression { env.GIT_BRANCH == 'origin/main' } } agent { label 'agent-12' } steps { @@ -37,7 +37,7 @@ pipeline { stage('Test Checkout') { when { beforeAgent true - expression { env.BRANCH_NAME != 'main' } + expression { env.GIT_BRANCH != 'origin/main' } } agent { label 'agent-13' } steps { @@ -47,11 +47,10 @@ pipeline { stage('Test Build') { when { beforeAgent true - expression { env.BRANCH_NAME != 'main' } + expression { env.GIT_BRANCH != 'origin/main' } } agent { label 'agent-13' } steps { - sh 'printenv' script { docker.build('test.trianta.dev:latest') } @@ -60,7 +59,7 @@ pipeline { stage('Test Deploy') { when { beforeAgent true - expression { env.BRANCH_NAME != 'main' } + expression { env.GIT_BRANCH != 'origin/main' } } agent { label 'agent-13' } steps {