Skip to content

Improve the variable name 'customUrl' to 'testDependencyUrl' #6909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smlambert merged 1 commit into from
Mar 11, 2026
+10 −10
Merged

Improve the variable name 'customUrl' to 'testDependencyUrl' #6909

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions buildenv/jenkins/JenkinsfileBase
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,15 +223,15 @@ 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 = getCustomUrl()
env.CUSTOM_URL = customUrl
def testDependencyUrl = getTestDependencyUrl()
env.TEST_DEPENDENCY_URL = testDependencyUrl
if (PLATFORM.contains("windows")) {
env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
env.SYSTEM_LIB_DIR = env.SYSTEM_LIB_DIR.replaceAll("\\\\", "/")
}
if (env.BUILD_LIST == 'system') {
env.LIB_DIR = env.SYSTEM_LIB_DIR
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -testDependencyUrl ${testDependencyUrl}"
}
}
} catch (Exception e) {
Expand Down Expand Up @@ -714,15 +714,15 @@ 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 = getCustomUrl()
env.CUSTOM_URL = customUrl
def testDependencyUrl = getTestDependencyUrl()
env.TEST_DEPENDENCY_URL = testDependencyUrl
if (PLATFORM.contains("windows")) {
env.LIB_DIR = env.LIB_DIR.replaceAll("\\\\", "/")
env.SYSTEM_LIB_DIR = env.SYSTEM_LIB_DIR.replaceAll("\\\\", "/")
}
if (env.BUILD_LIST == 'system') {
env.LIB_DIR = env.SYSTEM_LIB_DIR
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -customUrl ${customUrl}"
sh "perl ./aqa-tests/TKG/scripts/getDependencies.pl -path ${env.LIB_DIR} -task default -testDependencyUrl ${testDependencyUrl}"
}
}
} catch (Exception e) {
Expand Down Expand Up @@ -1208,17 +1208,17 @@ def getJenkinsDomain() {
return domainName
}

def getCustomUrl() {
def getTestDependencyUrl() {
def jenkinsDomain = getJenkinsDomain()
if (jenkinsDomain.contains("hyc-runtimes")) {
jenkinsDomain = "openj9-jenkins.osuosl.org"
} else if (jenkinsDomain.contains("temurin-compliance") || jenkinsDomain.contains("adoptium-team")) {
jenkinsDomain = "ci.adoptium.net"
}

def customUrl = "https://${jenkinsDomain}/job/test.getDependency/lastSuccessfulBuild/artifact/"
echo "Custom URL: ${customUrl}"
return customUrl
def testDependencyUrl = "https://${jenkinsDomain}/job/test.getDependency/lastSuccessfulBuild/artifact/"
echo "Test Dependency URL: ${testDependencyUrl}"
return testDependencyUrl
}

def archiveAQAvitFiles() {
Expand Down