Skip to content

Commit

Permalink
Add USE_TESTENV_PROPERTIES in template (adoptium#3209)
Browse files Browse the repository at this point in the history
* Add USE_TESTENV_PROPERTIES in template

Update default branch to dev for adoptium jdk

Signed-off-by: Sophia Guo <sophia.gwf@gmail.com>
  • Loading branch information
sophia-guo authored Jan 11, 2022
1 parent 2f9da9a commit 1cd5ad1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
2 changes: 2 additions & 0 deletions buildenv/jenkins/testJobTemplate
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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 {
Expand Down
8 changes: 4 additions & 4 deletions testenv/testenv.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1cd5ad1

Please sign in to comment.