This is an automated email from the ASF dual-hosted git repository.
jstastnycz pushed a commit to branch apache_migration
in repository
https://gitbox.apache.org/repos/asf/incubator-kie-kogito-pipelines.git
The following commit(s) were added to refs/heads/apache_migration by this push:
new de0ca2b2 Revert "set branch evn variables for PR check Jenkinsfile
(#1087)"
de0ca2b2 is described below
commit de0ca2b2a37f7d033409b52dc3dc78de42c5cea7
Author: jstastny-cz <[email protected]>
AuthorDate: Tue Sep 19 08:38:04 2023 +0200
Revert "set branch evn variables for PR check Jenkinsfile (#1087)"
This reverts commit 2fd3249afa74331b84b0b5da020160c410038f66.
---
dsl/scripts/pr_check.groovy | 2 +-
.../src/main/groovy/org/kie/jenkins/jobdsl/KogitoJobTemplate.groovy | 5 -----
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/dsl/scripts/pr_check.groovy b/dsl/scripts/pr_check.groovy
index 78c3fe84..ea74d7ab 100644
--- 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
index b8417aac..019c8c2f 100644
--- 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)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
