Skip to content

Commit

Permalink
Set OPENJ9_BRANCH and JDK_BRANCH to release_tag in test pipeline
Browse files Browse the repository at this point in the history
- If release_tag is provided, set OPENJ9_BRANCH to release_tag
(buildConfig.SCM_REF). Otherwise, set OPENJ9_BRANCH to master
- If release_tag is provided, set JDK_BRANCH to release_tag
(buildConfig.SCM_REF). Otherwise, set JDK_BRANCH according to
buildConfig.VARIANT

Resolves: adoptium#2131
Related: adoptium/aqa-tests#2006

Signed-off-by: lanxia <lan_xia@ca.ibm.com>
  • Loading branch information
llxia committed Oct 28, 2020
1 parent 8be49e5 commit 16c1aea
Showing 1 changed file with 18 additions and 11 deletions.
29 changes: 18 additions & 11 deletions pipelines/build/common/openjdk_build_pipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -133,19 +133,24 @@ class Build {
private def getJDKBranch() {

def jdkBranch

if (buildConfig.VARIANT == "corretto") {
jdkBranch = 'develop'
} else if (buildConfig.VARIANT == "openj9") {
jdkBranch = 'openj9'
} else if (buildConfig.VARIANT == "hotspot"){
jdkBranch = 'dev'
} else if (buildConfig.VARIANT == "dragonwell") {
jdkBranch = 'master'

if (buildConfig.SCM_REF) {
jdkBranch = buildConfig.SCM_REF
} else {
context.error("Unrecognised build variant '${buildConfig.VARIANT}' ")
throw new Exception()
if (buildConfig.VARIANT == "corretto") {
jdkBranch = 'develop'
} else if (buildConfig.VARIANT == "openj9") {
jdkBranch = 'openj9'
} else if (buildConfig.VARIANT == "hotspot"){
jdkBranch = 'dev'
} else if (buildConfig.VARIANT == "dragonwell") {
jdkBranch = 'master'
} else {
context.error("Unrecognised build variant '${buildConfig.VARIANT}' ")
throw new Exception()
}
}

return jdkBranch
}

Expand Down Expand Up @@ -189,6 +194,7 @@ class Build {
List testList = []
def jdkBranch = getJDKBranch()
def jdkRepo = getJDKRepo()
def openj9Branch = buildConfig.SCM_REF ? buildConfig.SCM_REF : "master"

if (buildConfig.VARIANT == "corretto") {
testList = buildConfig.TEST_LIST.minus(['sanity.external'])
Expand Down Expand Up @@ -220,6 +226,7 @@ class Build {
context.string(name: 'RELEASE_TAG', value: "${buildConfig.SCM_REF}"),
context.string(name: 'JDK_REPO', value: jdkRepo),
context.string(name: 'JDK_BRANCH', value: jdkBranch),
context.string(name: 'OPENJ9_BRANCH', value: openj9Branch),
context.string(name: 'ACTIVE_NODE_TIMEOUT', value: "${buildConfig.ACTIVE_NODE_TIMEOUT}")]
}
} else {
Expand Down

0 comments on commit 16c1aea

Please sign in to comment.