From 1cd5ad1ca10fd1b84e0982437d6d3009b73f0a39 Mon Sep 17 00:00:00 2001 From: sophia-guo Date: Tue, 11 Jan 2022 12:15:26 -0500 Subject: [PATCH] Add USE_TESTENV_PROPERTIES in template (#3209) * Add USE_TESTENV_PROPERTIES in template Update default branch to dev for adoptium jdk Signed-off-by: Sophia Guo --- buildenv/jenkins/testJobTemplate | 2 ++ testenv/testenv.properties | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/buildenv/jenkins/testJobTemplate b/buildenv/jenkins/testJobTemplate index 36cbad840e..2e88135481 100644 --- a/buildenv/jenkins/testJobTemplate +++ b/buildenv/jenkins/testJobTemplate @@ -133,6 +133,7 @@ println "ARCH_OS_LIST: ${ARCH_OS_LIST}" def OPENJ9_REPO = "https://github.com/eclipse-openj9/openj9.git" def ADOPTOPENJDK_REPO = "https://github.com/adoptium/aqa-tests.git" def ADOPTOPENJDK_BRANCH = "master" +def USE_TESTENV_PROPERTIES = false // Jenkins does not support using Repository URL and Branch build parameters with lightweight checkout together // (See https://issues.jenkins.io/browse/JENKINS-48431) @@ -427,6 +428,7 @@ ARCH_OS_LIST.each { ARCH_OS -> stringParam('ARTIFACTORY_ROOT_DIR', ARTIFACTORY_ROOT_DIR, "Optional. It should be used with ARTIFACTORY_SERVER and ARTIFACTORY_REPO. Default is to set root dir to be the same as the current Jenkins domain") stringParam('SLACK_CHANNEL', SLACK_CHANNEL, "Slack channel. e.g., #rt-jenkins") booleanParam('PERSONAL_BUILD', false, "Is this a personal build?") + booleanParam('USE_TESTENV_PROPERTIES', USE_TESTENV_PROPERTIES.toBoolean(), "use properties defined in the testenv.properties") } cpsScm { scm { diff --git a/testenv/testenv.properties b/testenv/testenv.properties index 6d8ee4fbfc..00b14b253d 100644 --- a/testenv/testenv.properties +++ b/testenv/testenv.properties @@ -9,11 +9,11 @@ OPENJ9_SYSTEMTEST_BRANCH=master ADOPTOPENJDK_SYSTEMTEST_REPO=https://github.com/adoptium/aqa-systemtest.git ADOPTOPENJDK_SYSTEMTEST_BRANCH=master JDK8_REPO=https://github.com/adoptium/jdk8u.git -JDK8_BRANCH=master +JDK8_BRANCH=dev JDK11_REPO=https://github.com/adoptium/jdk11u.git -JDK11_BRANCH=master -JDK17_REPO=https://github.com/adoptium/jdk17.git -JDK17_BRANCH=master +JDK11_BRANCH=dev +JDK17_REPO=https://github.com/adoptium/jdk17u.git +JDK17_BRANCH=dev JDK8_OPENJ9_REPO=https://github.com/ibmruntimes/openj9-openjdk-jdk8.git JDK8_OPENJ9_BRANCH=master JDK11_OPENJ9_REPO=https://github.com/ibmruntimes/openj9-openjdk-jdk11.git