diff --git a/Jenkinsfile b/Jenkinsfile index c38317328..963b96a40 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -20,8 +20,6 @@ node { 'beta' ] - TARGET_BRANCH = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : "dev" - IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME) IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME) @@ -112,6 +110,7 @@ pipeline { CREDENTIALS = credentials('docker-registry') COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ." + COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' } steps { script { diff --git a/test/cypress/docker-compose.yml b/test/cypress/docker-compose.yml index 5b0303e07..8d70c5248 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:${TARGET_BRANCH:-dev}' + image: 'registry.verdnatura.es/salix-back:${COMPOSE_TAG:-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:${TARGET_BRANCH:-dev}' + image: 'registry.verdnatura.es/salix-db:${COMPOSE_TAG:-dev}'