From 3a36b68c2166a5ebfd44ab0c0eee1112de280d34 Mon Sep 17 00:00:00 2001 From: tonsV2 Date: Thu, 26 Oct 2023 21:47:42 +0800 Subject: [PATCH] ci: strip dash if master (#15498) Signed-off-by: TonsV2 --- jenkinsfiles/dev | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkinsfiles/dev b/jenkinsfiles/dev index de406f195dbe..b8015688f593 100644 --- a/jenkinsfiles/dev +++ b/jenkinsfiles/dev @@ -217,7 +217,7 @@ pipeline { env.DATABASE_ID = "test-dbs-sierra-leone-dev-sql-gz" } else { env.IMAGE_TAG = env.GIT_BRANCH - branch = env.GIT_BRANCH.replaceAll(".", "-") + branch = "-${env.GIT_BRANCH.replaceAll(".", "-")}" dir('scripts/databases') { env.DATABASE_ID = sh( @@ -231,7 +231,7 @@ pipeline { echo "Database: ${env.DATABASE_ID}" dir('scripts/instances') { - sh "(./findByName.sh play dev-${branch} && ./restart.sh play dev-${branch}) || ./deploy-dhis2.sh play dev-${branch}" + sh "(./findByName.sh play dev${branch} && ./restart.sh play dev${branch}) || ./deploy-dhis2.sh play dev${branch}" timeout(5) { waitFor.statusOk("${env.INSTANCE_URL}") }