[BXMSPROD-2019] fix prod branch creation job (#1006)

* [BXMSPROD-2019] fix prod branch creation job * fix setup branch when condition * push prod branches pr checks update
apache · Jun 26, 2023 · 4001fde · 4001fde
1 parent 2439a76
commit 4001fde
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/.ci/jenkins/Jenkinsfile.setup-branch b/.ci/jenkins/Jenkinsfile.setup-branch
@@ -182,7 +182,7 @@ pipeline {
         // Launch the nightly to deploy all artifacts from the branch
         stage('Launch the nightly') {
             when {
-                return params.DEPLOY_ARTIFACTS
+                expression { return params.DEPLOY_ARTIFACTS }
             }
             steps {
                 script {

diff --git a/dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare b/dsl/seed/jenkinsfiles/Jenkinsfile.prod.prepare
@@ -197,7 +197,7 @@ pipeline{
                             // here productized branches should have been already created on repos to be productized
                             checkout(githubscm.resolveRepository(repository, repoAuthor, getProductizedBranchFromRepository(repository), false, repoCredsId))
 
-                            getOrCreateGitBranch(repoConfig.branch, getRepositoryAuthorCredsId())
+                            getOrCreateGitBranch(repoConfig.branch, repoCredsId)
 
                             if (fileExists("${jobsGroovyPath}")) {
                                 // def jobsGroovy = readFile file: jobsGroovyPath
@@ -212,6 +212,9 @@ pipeline{
                             // TODO iterate over PR workflows
                             // - comment out if not needed (get these from param?)
                             // - if PR check is needed, keep it and add -Dproductized
+
+                            // push changes
+                            pushIfChanged(repoConfig.branch, repoCredsId, "Pull request checks updated for productized branch", "Pull request checks updated for productized branch")
                         }
                     }
                 }