This is an automated email from the ASF dual-hosted git repository. orpiske pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/camel.git
commit 959abcca1fcfdf0b6652a8c14314eb52469e6036 Author: Otavio Rodolfo Piske <[email protected]> AuthorDate: Sat Sep 10 09:00:30 2022 +0200 (chores) ci: use a more flexible way for defining the CI environment name --- .github/actions/quick-test/quick-test.sh | 2 +- Jenkinsfile.jdk11 | 3 ++- Jenkinsfile.jdk17 | 3 ++- Jenkinsfile.s390x | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/actions/quick-test/quick-test.sh b/.github/actions/quick-test/quick-test.sh index 0dfea87f865..8abe54ec44c 100755 --- a/.github/actions/quick-test/quick-test.sh +++ b/.github/actions/quick-test/quick-test.sh @@ -22,7 +22,7 @@ # The log file is archived by the action (see: action.yaml file) # Modify maven options here if needed -MVN_DEFAULT_OPTS="-Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=2" +MVN_DEFAULT_OPTS="-Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2 -Dfailsafe.rerunFailingTestsCount=2 -Dci.env.name=github.com" MVN_OPTS=${MVN_OPTS:-$MVN_DEFAULT_OPTS} # Script variables diff --git a/Jenkinsfile.jdk11 b/Jenkinsfile.jdk11 index d678b0ccefd..9dfab336837 100644 --- a/Jenkinsfile.jdk11 +++ b/Jenkinsfile.jdk11 @@ -21,6 +21,7 @@ def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest' def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2" +def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.org" pipeline { @@ -81,7 +82,7 @@ pipeline { stage('Test') { steps { timeout(unit: 'HOURS', time: 7) { - sh "./mvnw $MAVEN_PARAMS -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify" + sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify" } } post { diff --git a/Jenkinsfile.jdk17 b/Jenkinsfile.jdk17 index 4d775cb94a6..8280c5fd4c9 100644 --- a/Jenkinsfile.jdk17 +++ b/Jenkinsfile.jdk17 @@ -21,6 +21,7 @@ def AGENT_LABEL = env.AGENT_LABEL ?: 'ubuntu' def JDK_NAME = env.JDK_NAME ?: 'jdk_17_latest' def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2" +def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dci.env.name=apache.org" pipeline { @@ -73,7 +74,7 @@ pipeline { stage('Test') { steps { timeout(unit: 'HOURS', time: 7) { - sh "./mvnw $MAVEN_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify" + sh "./mvnw $MAVEN_PARAMS $MAVEN_TEST_PARAMS -Darchetype.test.skip -Dmaven.test.failure.ignore=true -Dcheckstyle.skip=true verify" } } post { diff --git a/Jenkinsfile.s390x b/Jenkinsfile.s390x index 0e0db55df00..157d834f808 100644 --- a/Jenkinsfile.s390x +++ b/Jenkinsfile.s390x @@ -21,7 +21,7 @@ def AGENT_LABEL = 's390x' def JDK_NAME = env.JDK_NAME ?: 'jdk_11_latest' def MAVEN_PARAMS = "-B -e -fae -V -Dnoassembly -Dmaven.compiler.fork=true -Dsurefire.rerunFailingTestsCount=2" -def MAVEN_TEST_PARAMS = "-Dkafka.instance.type=local-strimzi-container" +def MAVEN_TEST_PARAMS = env.MAVEN_TEST_PARAMS ?: "-Dkafka.instance.type=local-strimzi-container -Dci.env.name=apache.org" /* Below parameters are required for camel/core/camel-core module's test cases to pass - xpathExprGrpLimit: limits the number of groups an Xpath expression can contain
