Skip to content

Commit

Permalink
Update customUrl to dynamically use Jenkins domain
Browse files Browse the repository at this point in the history
- Dynamically build the customUrl using the extracted domain using getJenkinsDomain()

resolves:adoptium#5286

Signed-off-by: Anna Babu Palathingal <anna.bp@ibm.com>
  • Loading branch information
annaibm committed May 7, 2024
1 parent 9639787 commit a4cefa1
Showing 1 changed file with 22 additions and 11 deletions.
33 changes: 22 additions & 11 deletions buildenv/jenkins/JenkinsfileBase
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def setupEnv() {
env.JOBSTARTTIME = sh(script: 'LC_TIME=C date +"%a, %d %b %Y %T %z"', returnStdout: true).trim()

// Terminate any previous test related processes that are running
terminateTestProcesses()
terminateTestProcesses()

if ( params.JDK_VERSION ) {
env.ORIGIN_JDK_VERSION = params.JDK_VERSION
Expand Down Expand Up @@ -207,7 +207,8 @@ def setupParallelEnv() {
// check for each lib. If lib does not exist, donwload it.
// If lib exists, SHA will be checked. Re-download if SHA does not match.
timeout(time: 20, unit: 'MINUTES') {
def customUrl = "https://ci.adoptium.net/job/test.getDependency/lastSuccessfulBuild/artifact/"
def customUrl = getCustomUrl()
echo "Custom URL: ${customUrl}"
if (PLATFORM.contains("windows")) {
env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
}
Expand Down Expand Up @@ -315,7 +316,7 @@ def setupParallelEnv() {

}

// Returns NUM_LIST from parallelList.mk.
// Returns NUM_LIST from parallelList.mk.
// NUM_LIST can be different than numOfMachines.
def genParallelList(PARALLEL_OPTIONS) {
String unsetLLP = ""
Expand Down Expand Up @@ -415,7 +416,7 @@ def setup() {
if (params.SDK_RESOURCE == 'nightly') {
// remove single quote to allow variables to be set in CUSTOMIZED_SDK_URL
CUSTOMIZED_SDK_URL_OPTION = "-c ${params.CUSTOMIZED_SDK_URL}"
} else if (!params.SDK_RESOURCE || params.SDK_RESOURCE == 'customized') {
} else if (!params.SDK_RESOURCE || params.SDK_RESOURCE == 'customized') {
SDK_RESOURCE = "customized"
CUSTOMIZED_SDK_URL_OPTION = "-c '${params.CUSTOMIZED_SDK_URL}'"
if (params.ADDITIONAL_ARTIFACTS_REQUIRED == "RI_JDK") {
Expand All @@ -437,7 +438,7 @@ def setup() {
error("SDK_RESOURCE: ${params.SDK_RESOURCE} and CUSTOMIZED_SDK_URL: ${params.CUSTOMIZED_SDK_URL} combo is not supported!")
}
} else {
if (params.SDK_RESOURCE == 'customized') {
if (params.SDK_RESOURCE == 'customized') {
error("SDK_RESOURCE: ${params.SDK_RESOURCE}, please provide CUSTOMIZED_SDK_URL")
} else {
CUSTOMIZED_SDK_URL_OPTION = ""
Expand Down Expand Up @@ -466,7 +467,7 @@ def setup() {
if (CLONE_OPENJ9_OPTION == "") {
if (env.BUILD_LIST.contains('functional')) {
CLONE_OPENJ9_OPTION = "--clone_openj9 true"
// If USE_TESTENV_PROPERTIES = false, set Openj9 repo and brnach.
// If USE_TESTENV_PROPERTIES = false, set Openj9 repo and brnach.
// Otherwise, testenv.properties will be used.
// And the Openj9 repo and brnach values will be set in get.sh
if(!params.USE_TESTENV_PROPERTIES) {
Expand Down Expand Up @@ -655,7 +656,8 @@ def buildTest() {
// check for each lib. If lib does not exist, donwload it.
// If lib exists, SHA will be checked. Re-download if SHA does not match.
timeout(time: 20, unit: 'MINUTES') {
def customUrl = "https://ci.adoptium.net/job/test.getDependency/lastSuccessfulBuild/artifact/"
def customUrl = getCustomUrl()
echo "Custom URL: ${customUrl}"
if (PLATFORM.contains("windows")) {
env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
}
Expand Down Expand Up @@ -1013,10 +1015,10 @@ def testExecution() {
def terminateTestProcesses() {
echo "PROCESSCATCH: Terminating any hung/left over test processes:"

def statusCode=sh(script:"aqa-tests/terminateTestProcesses.sh ${env.USER} 2>&1", returnStatus:true)
if (statusCode != 0) {
echo "rc = ${statusCode}, Unable to terminate all processes."
}
def statusCode=sh(script:"aqa-tests/terminateTestProcesses.sh ${env.USER} 2>&1", returnStatus:true)
if (statusCode != 0) {
echo "rc = ${statusCode}, Unable to terminate all processes."
}
}

def getJDKImpl(jvm_version) {
Expand Down Expand Up @@ -1054,6 +1056,15 @@ def getJenkinsDomain() {
return domainName
}

def getCustomUrl() {
def jenkinsDomain = getJenkinsDomain()
if (jenkinsDomain.contains("hyc-runtimes")) {
jenkinsDomain = "openj9-jenkins.osuosl.org"
}
def customUrl = "https://${jenkinsDomain}/job/test.getDependency/lastSuccessfulBuild/artifact/"
return customUrl
}

def archiveAQAvitFiles() {
if (params.USE_TESTENV_PROPERTIES && !JOB_NAME.contains("_testList_")) {
if (params.ARTIFACTORY_SERVER) {
Expand Down

0 comments on commit a4cefa1

Please sign in to comment.