ci: strip dash if master (#15498)

Signed-off-by: TonsV2 <[email protected]> (cherry picked from commit 3a36b68)
dhis2 · Oct 26, 2023 · 64881b7 · 64881b7
1 parent caad7fa
commit 64881b7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/jenkinsfiles/dev b/jenkinsfiles/dev
@@ -216,7 +216,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(
@@ -230,7 +230,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}")
                                 }