Revert "set branch evn variables for PR check Jenkinsfile (#1087)"

This reverts commit 2fd3249.
apache · Sep 19, 2023 · de0ca2b · de0ca2b
1 parent 2fd3249
commit de0ca2b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 6 deletions.
diff --git a/dsl/scripts/pr_check.groovy b/dsl/scripts/pr_check.groovy
@@ -91,7 +91,7 @@ String getBuildChainCommandline() {
     // Those can be overriden in Jenkinsfiles
     String buildChainProject = env.BUILDCHAIN_PROJECT ?: CHANGE_REPO
     String buildChainConfigRepo = env.BUILDCHAIN_CONFIG_REPO ?: 'incubator-kie-kogito-pipelines'
-    String buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${GENERATION_BRANCH:main}'
+    String buildChainConfigBranch = env.BUILDCHAIN_CONFIG_BRANCH ?: '\${BRANCH:main}'
     String buildChainConfigGitAuthor = env.BUILDCHAIN_CONFIG_AUTHOR ?: '\${AUTHOR:apache}'
     String buildChainConfigDefinitionFilePath = env.BUILDCHAIN_CONFIG_FILE_PATH ?: '.ci/pull-request-config.yaml'
 

diff --git a/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy b/dsl/seed/src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy
@@ -502,11 +502,6 @@ class KogitoJobTemplate {
                     buildOriginPRMerge(true)
                 }
             }
-            properties { """
-BRANCH=${Utils.getGitMainBranch(script)}
-GENERATION_BRANCH=${Utils.getGenerationBranch(script)}
-"""
-            }
             orphanedItemStrategy {
                 discardOldItems {
                     daysToKeep(10)