verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

ci: refs #6695 use TARGET_BRANCH #1466

Merged
alexm merged 27 commits from 6695-fix_CHANGE_TARGET into dev 2025-02-27 08:22:36 +00:00
Conversation 0 Commits 27 Files Changed 2 +3 -4
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d09b753a66 - Show all commits

3
Jenkinsfile vendored
View File

@ -20,8 +20,6 @@ node {
'beta'
]
alexm marked this conversation as resolved
juan commented 2025-02-21 14:07:22 +00:00
Review
Copy Link

contains mes simple, comilles simples en 'dev'

contains mes simple, comilles simples en 'dev'
TARGET_BRANCH = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : "dev"
IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME)
juan commented 2025-02-21 14:09:21 +00:00
Outdated
Review
Copy Link

COMPOSE_TAG , defineixla en el stage E2E

COMPOSE_TAG , defineixla en el stage E2E
IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME)
alexm marked this conversation as resolved Outdated
alexm commented 2025-02-21 13:54:02 +00:00
Outdated
Review
Copy Link

Ns si estava de antes

Ns si estava de antes
@ -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 {
juan commented 2025-02-24 08:14:27 +00:00
Outdated
Review
Copy Link

Ficala en environment, si no no l'agafara

Ficala en environment, si no no l'agafara

4
test/cypress/docker-compose.yml
View File

@ -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}'