diff --git a/Jenkinsfile b/Jenkinsfile index 8efc2f880..8abb84672 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -12,15 +12,16 @@ def BRANCH_ENV = [ node { stage('Setup') { env.NODE_ENV = BRANCH_ENV[env.BRANCH_NAME] ?: 'dev' - - PROTECTED_BRANCH = [ + GIT_PROTECTED_BRANCH = [ 'dev', 'test', 'master', - 'main', - 'beta' - ].contains(env.BRANCH_NAME) + ] + PROTECTED_BRANCH = GIT_PROTECTED_BRANCH + ['main','beta'] + TARGET_BRANCH = GIT_PROTECTED_BRANCH.find { it == env.CHANGE_TARGET } ?: "dev" + + IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME) IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME) // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables @@ -36,7 +37,7 @@ node { props.each {key, value -> echo "${key}: ${value}" } } - if (PROTECTED_BRANCH) { + if (IS_PROTECTED_BRANCH) { configFileProvider([ configFile(fileId: "salix-front.branch.${env.BRANCH_NAME}", variable: 'BRANCH_PROPS_FILE') @@ -63,7 +64,7 @@ pipeline { stages { stage('Version') { when { - expression { PROTECTED_BRANCH } + expression { IS_PROTECTED_BRANCH } } steps { script { @@ -84,7 +85,7 @@ pipeline { } stage('Test') { when { - expression { !PROTECTED_BRANCH } + expression { !IS_PROTECTED_BRANCH } } environment { NODE_ENV = '' @@ -134,7 +135,7 @@ pipeline { } stage('Build') { when { - expression { PROTECTED_BRANCH } + expression { IS_PROTECTED_BRANCH } } environment { CREDENTIALS = credentials('docker-registry') @@ -156,7 +157,7 @@ pipeline { } stage('Deploy') { when { - expression { PROTECTED_BRANCH } + expression { IS_PROTECTED_BRANCH } } environment { VERSION = readFile 'VERSION.txt' diff --git a/test/cypress/docker-compose.yml b/test/cypress/docker-compose.yml index bf22c5877..5b0303e07 100644 --- a/test/cypress/docker-compose.yml +++ b/test/cypress/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.7' services: back: - image: 'registry.verdnatura.es/salix-back:${CHANGE_TARGET:-dev}' + image: 'registry.verdnatura.es/salix-back:${TARGET_BRANCH:-dev}' volumes: - ./test/cypress/storage:/salix/storage - ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json @@ -18,4 +18,4 @@ services: - TZ dns_search: . db: - image: 'registry.verdnatura.es/salix-db:${CHANGE_TARGET:-dev}' + image: 'registry.verdnatura.es/salix-db:${TARGET_BRANCH:-dev}'