Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
18 changes: 9 additions & 9 deletions buildenv/jenkins/JenkinsfileBase
Original file line number Diff line number Diff line change
Expand Up @@ -50,22 +50,22 @@ def setupEnv() {

env.SPEC = "${SPEC}"
if(!params.USE_TESTENV_PROPERTIES){
env.ADOPTOPENJDK_REPO = params.ADOPTOPENJDK_REPO ? params.ADOPTOPENJDK_REPO : "https://github.com/adoptium/aqa-tests.git"
env.ADOPTIUM_REPO = params.ADOPTIUM_REPO ? params.ADOPTIUM_REPO : "https://github.com/adoptium/aqa-tests.git"
OPENJ9_REPO = params.OPENJ9_REPO ? params.OPENJ9_REPO : "https://github.com/eclipse-openj9/openj9.git"
String[] tkg = getGitRepoBranch(params.TKG_OWNER_BRANCH, "adoptium:master", "TKG")
TKG_REPO = tkg[0]
TKG_BRANCH = tkg[1]
//For Zos, the right repo should be something like: [email protected]:runtimes/openj9-openjdk-jdk**-zos.git and for now there is only jdk11
env.JDK_REPO = params.JDK_REPO ? params.JDK_REPO : ""
if (env.SPEC.startsWith('zos')) {
env.ADOPTOPENJDK_REPO = env.ADOPTOPENJDK_REPO.replace("https://github.com/","[email protected]:")
env.ADOPTIUM_REPO = env.ADOPTIUM_REPO.replace("https://github.com/","[email protected]:")
OPENJ9_REPO = OPENJ9_REPO.replace("https://github.com/","[email protected]:")
}
OPENJ9_BRANCH = params.OPENJ9_BRANCH ? params.OPENJ9_BRANCH : "master"
}

PLATFORM = params.PLATFORM ? params.PLATFORM : ""
env.ADOPTOPENJDK_BRANCH = params.ADOPTOPENJDK_BRANCH ? params.ADOPTOPENJDK_BRANCH : "master"
env.ADOPTIUM_BRANCH = params.ADOPTIUM_BRANCH ? params.ADOPTIUM_BRANCH : "master"
CLONE_OPENJ9 = params.CLONE_OPENJ9 ? params.CLONE_OPENJ9 : "true"
CUSTOM_TARGET = params.CUSTOM_TARGET ? params.CUSTOM_TARGET : ""
UPSTREAM_JOB_NAME = params.UPSTREAM_JOB_NAME ? params.UPSTREAM_JOB_NAME : ""
Expand Down Expand Up @@ -121,10 +121,10 @@ def setupEnv() {
// to take personal repo and branch.
// Therefore, set LIGHT_WEIGHT_CHECKOUTto false and GENERATE_JOBS to true.
// This is a known Jenkins issue: https://issues.jenkins.io/browse/JENKINS-42971
if (!env.ADOPTOPENJDK_REPO.contains("adoptium/aqa-tests")) {
if (!env.ADOPTIUM_REPO.contains("adoptium/aqa-tests")) {
env.LIGHT_WEIGHT_CHECKOUT = false
env.GENERATE_JOBS = true
echo "ADOPTOPENJDK_REPO is set to personal repo in Grinder. Auto-set LIGHT_WEIGHT_CHECKOUT: ${env.LIGHT_WEIGHT_CHECKOUT} and GENERATE_JOBS: ${env.GENERATE_JOBS}"
echo "ADOPTIUM_REPO is set to personal repo in Grinder. Auto-set LIGHT_WEIGHT_CHECKOUT: ${env.LIGHT_WEIGHT_CHECKOUT} and GENERATE_JOBS: ${env.GENERATE_JOBS}"
}
} else {
env.TAP_NAME = "${JOB_NAME}.tap"
Expand Down Expand Up @@ -497,9 +497,9 @@ def setup() {

// system test repository exports to be used by system/common.xml
if(!params.USE_TESTENV_PROPERTIES){
String[] adoptSystemTest = getGitRepoBranch(params.ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH, "adoptium:master", "aqa-systemtest")
env.ADOPTOPENJDK_SYSTEMTEST_REPO = adoptSystemTest[0]
env.ADOPTOPENJDK_SYSTEMTEST_BRANCH = adoptSystemTest[1]
String[] adoptSystemTest = getGitRepoBranch(params.ADOPTIUM_SYSTEMTEST_OWNER_BRANCH, "adoptium:master", "aqa-systemtest")
env.ADOPTIUM_SYSTEMTEST_REPO = adoptSystemTest[0]
env.ADOPTIUM_SYSTEMTEST_BRANCH = adoptSystemTest[1]

String[] openj9SystemTest = getGitRepoBranch(params.OPENJ9_SYSTEMTEST_OWNER_BRANCH, "eclipse:master", "openj9-systemtest")
env.OPENJ9_SYSTEMTEST_REPO = openj9SystemTest[0]
Expand Down Expand Up @@ -1089,7 +1089,7 @@ def archiveAQAvitFiles() {
if (params.ARTIFACTORY_SERVER) {
def currentDate = new Date()
def currentDateTime = currentDate.format("yyyyMMddHHmmss", TimeZone.getTimeZone('UTC'))
def uploadDir = "AQAvit/${JDK_IMPL}/${env.ADOPTOPENJDK_BRANCH}/${JDK_VERSION}/${PLATFORM}/${currentDateTime}"
def uploadDir = "AQAvit/${JDK_IMPL}/${env.ADOPTIUM_BRANCH}/${JDK_VERSION}/${PLATFORM}/${currentDateTime}"
uploadToArtifactory("${env.WORKSPACE}/**/*.tap", uploadDir)
}
}
Expand Down
2 changes: 1 addition & 1 deletion buildenv/jenkins/aqaTestPipeline.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ def generateJobs(jobJdkVersion, jobTestFlag, jobPlatforms, jobTargets, jobParall
}
} else {
VENDOR_TEST_REPOS = '[email protected]:runtimes/test.git'
VENDOR_TEST_BRANCHES = params.ADOPTOPENJDK_BRANCH ?: 'master'
VENDOR_TEST_BRANCHES = params.ADOPTIUM_BRANCH ?: 'master'
VENDOR_TEST_DIRS = 'functional'
}
} else if (TARGET.contains('jck')) {
Expand Down
2 changes: 1 addition & 1 deletion buildenv/jenkins/getDependency
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ def testBuild() {
timeout(time: time_limit, unit: 'HOURS') {
try {
if( params.BUILD_TYPE == "systemtest" ){
sh 'curl -OLJks "https://api.adoptopenjdk.net/v3/binary/latest/8/ga/linux/x64/jdk/hotspot/normal/adoptopenjdk"'
sh 'curl -OLJks "https://api.adoptium.net/v3/binary/latest/8/ga/linux/x64/jdk/hotspot/normal/eclipse"'
sh 'mkdir ${WORKSPACE}/j2sdk-image'
sh 'tar -xzf OpenJDK8U-jdk_x64_linux_hotspot*.gz -C ${WORKSPACE}/j2sdk-image --strip-components 1'
sh '${WORKSPACE}/j2sdk-image/jre/bin/java -version'
Expand Down
25 changes: 13 additions & 12 deletions buildenv/jenkins/testJobTemplate
Original file line number Diff line number Diff line change
Expand Up @@ -141,22 +141,22 @@ println "GROUPS: ${GROUPS}"
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 ADOPTIUM_REPO = "https://github.com/adoptium/aqa-tests.git"
def ADOPTIUM_BRANCH = "master"
def USE_TESTENV_PROPERTIES = false
def SETUP_JCK_RUN = false

// https://issues.jenkins.io/browse/JENKINS-42971 is resolved, but it seems to be a partial fix for Branch Specifier parameter.
// Repository URL still has problem with lightweight checkout
// Set Repository URL and Branch Specifier as build parameters by default
// If LIGHT_WEIGHT_CHECKOUT is set to true, set Repository URL to its explicit value and keep Branch Specifier as parameter
def ADOPTOPENJDK_REPO_BUILD_PARAM = '${ADOPTOPENJDK_REPO}'
def ADOPTOPENJDK_BRANCH_BUILD_PARAM = '${ADOPTOPENJDK_BRANCH}'
def ADOPTIUM_REPO_BUILD_PARAM = '${ADOPTIUM_REPO}'
def ADOPTIUM_BRANCH_BUILD_PARAM = '${ADOPTIUM_BRANCH}'
def SCRIPT_PATH = "aqa-tests/buildenv/jenkins/openjdk_tests"

LIGHT_WEIGHT_CHECKOUT = LIGHT_WEIGHT_CHECKOUT.toBoolean()
if (LIGHT_WEIGHT_CHECKOUT) {
ADOPTOPENJDK_REPO_BUILD_PARAM = ADOPTOPENJDK_REPO
ADOPTIUM_REPO_BUILD_PARAM = ADOPTIUM_REPO
SCRIPT_PATH = "buildenv/jenkins/openjdk_tests"
}

Expand Down Expand Up @@ -228,16 +228,16 @@ ARCH_OS_LIST.each { ARCH_OS ->
sectionHeader('Repositories where we pull test material from. Unless you are testing test code, these do not need to be changed.')
sectionHeaderStyle(sectionHeaderHelpTextStyleCss)
}
stringParam('ADOPTOPENJDK_REPO', ADOPTOPENJDK_REPO, "AdoptOpenJDK git repo. Please use ssh for zos.")
stringParam('ADOPTOPENJDK_BRANCH', ADOPTOPENJDK_BRANCH, "AdoptOpenJDK branch")
stringParam('ADOPTIUM_REPO', ADOPTIUM_REPO, "Adoptium git repo. Please use ssh for zos.")
stringParam('ADOPTIUM_BRANCH', ADOPTIUM_BRANCH, "Adoptium branch")
stringParam('OPENJ9_REPO', OPENJ9_REPO, "OpenJ9 git repo. Please use ssh for zos.")
stringParam('OPENJ9_BRANCH', "master", "OpenJ9 branch")
stringParam('OPENJ9_SHA', "", "OpenJ9 sha")
stringParam('JDK_REPO', JDK_REPO, "JDK git repo. Please use ssh for zos.")
stringParam('JDK_BRANCH', JDK_BRANCH, "JDK branch")
stringParam('OPENJDK_SHA', "", "OpenJDK SHA from which to run tests")
stringParam('TKG_OWNER_BRANCH', "adoptium:master", "TestKitGen git [owner]:[branch]. Default is adoptium:master")
stringParam('ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH', "adoptium:master", "Personal Adoptium/aqa-systemtest repository owner:branch")
stringParam('ADOPTIUM_SYSTEMTEST_OWNER_BRANCH', "adoptium:master", "Personal Adoptium/aqa-systemtest repository owner:branch")
stringParam('OPENJ9_SYSTEMTEST_OWNER_BRANCH', "eclipse:master", "Personal eclipse-openj9/openj9-systemtest repository owner:branch")
stringParam('STF_OWNER_BRANCH', "adoptium:master", "Personal stf repo owner:branch")
stringParam('JCK_GIT_REPO', ACTUAL_JCK_GIT_REPO, "JCK git repo. For JCK test only")
Expand Down Expand Up @@ -282,6 +282,7 @@ ARCH_OS_LIST.each { ARCH_OS ->
<br/>x86-64_linux
<br/>x86-64_mac
<br/>x86-64_windows
<br/>aarch64_windows
<br/>x86-32_windows
<br/>sparcv9_solaris
<br/>riscv64_linux
Expand Down Expand Up @@ -424,8 +425,8 @@ ARCH_OS_LIST.each { ARCH_OS ->
stringParam('UPSTREAM_TEST_JOB_NUMBER', "", "Auto-populated. Upstream test job number. It will be used together with PARALLEL=Dynamic")
booleanParam('GENERATE_JOBS', GENERATE_JOBS.toBoolean(), "Force generate child jobs?")
booleanParam('LIGHT_WEIGHT_CHECKOUT', LIGHT_WEIGHT_CHECKOUT.toBoolean(), '''Optional. It takes effects if GENERATE_JOBS sets to true. <br>
If LIGHT_WEIGHT_CHECKOUT sets to true, generated job will check out faster. But the generated child job will NOT take ADOPTOPENJDK_REPO and ADOPTOPENJDK_BRANCH as parameters in job configure. <br>
If LIGHT_WEIGHT_CHECKOUT sets to false, the generated child job will take user-provided ADOPTOPENJDK_REPO and ADOPTOPENJDK_BRANCH in job configure. <br>
If LIGHT_WEIGHT_CHECKOUT sets to true, generated job will check out faster. But the generated child job will NOT take ADOPTIUM_REPO and ADOPTIUM_BRANCH as parameters in job configure. <br>
If LIGHT_WEIGHT_CHECKOUT sets to false, the generated child job will take user-provided ADOPTIUM_REPO and ADOPTIUM_BRANCH in job configure. <br>
LIGHT_WEIGHT_CHECKOUT is expected to be set to false for Grinder. For regular nightly/weekly runs, the value is expected to be set to true.<br>''')

parameterSeparatorDefinition {
Expand Down Expand Up @@ -458,9 +459,9 @@ ARCH_OS_LIST.each { ARCH_OS ->
scm {
git {
remote {
url(ADOPTOPENJDK_REPO_BUILD_PARAM)
url(ADOPTIUM_REPO_BUILD_PARAM)
}
branch(ADOPTOPENJDK_BRANCH_BUILD_PARAM)
branch(ADOPTIUM_BRANCH_BUILD_PARAM)
extensions {
relativeTargetDirectory('aqa-tests')
cleanBeforeCheckout()
Expand Down
8 changes: 4 additions & 4 deletions doc/pages/JenkinFeatures.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,17 @@ Repositories where we pull test material from. Unless you are testing test code,

| Parameter | Description |
|--------------------------------------|-----------------------------------------------------------------------------------------------------------|
| `ADOPTOPENJDK_REPO` | Optional. Your fork of `aqa-tests`. |
| `ADOPTOPENJDK_BRANCH` | Optional. Your branch off of your fork of `aqa-tests`. |
| `ADOPTIUM_REPO` | Optional. Your fork of `aqa-tests`. |
| `ADOPTIUM_BRANCH` | Optional. Your branch off of your fork of `aqa-tests`. |
| `OPENJ9_REPO` | Optional. Your fork of `openj9`. |
| `OPENJ9_BRANCH` | Optional. Your branch of your fork of `openj9`. |
| `OPENJ9_SHA` | Optional. Pin to a specific SHA of `openj9`. |
| `JDK_REPO` | Optional. Use test material from a specific OpenJDK repository. |
| `JDK_BRANCH` | Optional. Use test material from a specific OpenJDK branch. |
| `OPENJDK_SHA` | Optional. Pin to a specific OpenJDK SHA. |
| `TKG_OWNER_BRANCH` | Optional. Use a specific `adoptium/TKG` fork/branch. |
| `ADOPTOPENJDK_SYSTEMTEST_OWNER_BRANCH`| Optional. Use a specific `adoptium/aqa-systemtest` fork/branch. |
| `OPENJ9_SYSTEMTEST_OWNER_BRANCH` | Optional. Use a specific `openj9/openj9-systemtest` fork/branch. |
| `ADOPTIUM_SYSTEMTEST_OWNER_BRANCH` | Optional. Use a specific `adoptium/aqa-systemtest` fork/branch. |
| `OPENJ9_SYSTEMTEST_OWNER_BRANCH` | Optional. Use a specific `openj9/openj9-systemtest` fork/branch. |
| `STF_OWNER_BRANCH` | Optional. Use a specific `adoptium/STF` fork/branch. |
| `JCK_GIT_REPO` | Optional. Use a specific private repository for JCK test material supplied under OCTLA. |

Expand Down
8 changes: 4 additions & 4 deletions doc/userGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,11 @@ git push origin env_var

7. Click “Build with Parameters” on the left side of the page, third down from the top

8. In the ADOPTOPENJDK_REPO section, put in the repository you were working from when you made those changes
8. In the ADOPTIUM_REPO section, put in the repository you were working from when you made those changes

![repo](/doc/diagrams/repo.jpg)

9. In the ADOPTOPENJDK_BRANCH section, put in the branch you were on
9. In the ADOPTIUM_BRANCH section, put in the branch you were on

![branch](/doc/diagrams/branch.jpg)

Expand Down Expand Up @@ -122,11 +122,11 @@ git push origin env_var

7. Click “Build with Parameters” on the left side of the page, third down from the top

8. In the ADOPTOPENJDK_REPO section, put in the repository you were working from when you made those changes
8. In the ADOPTIUM_REPO section, put in the repository you were working from when you made those changes

![repo](/doc/diagrams/repo.jpg)

9. In the ADOPTOPENJDK_BRANCH section, put in the branch you were on
9. In the ADOPTIUM_BRANCH section, put in the branch you were on

![branch](/doc/diagrams/branch.jpg)

Expand Down
2 changes: 1 addition & 1 deletion docs/pages/howto/first-contrib.markdown
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ An actual OpenJDK compatible testsuite that you want to contribute.

4. Once you think you have both the build.xml and playlist.xml you can ***test your integration*** locally or with [Grinder Job](https://ci.adoptium.net/view/Test_grinder/job/Grinder/) on Jenkins if you have been given access.
Click the ***"Build with Parameters" button*** in the left panel (if there is no such option, make sure you are logged in, and have appropriate permissions set for your account).
Here you can configure your run. Main two parameters that are of interest to us are ADOPTOPENJDK_REPO, where you can put URL of your forked aqa-tests repository and ADOPTOPENJDK_BRANCH that specified the branch your integration is on.
Here you can configure your run. Main two parameters that are of interest to us are ADOPTIUM_REPO, where you can put URL of your forked aqa-tests repository and ADOPTIUM_BRANCH that specified the branch your integration is on.
The documentation in the Grinder configurator is pretty descriptive, so let's just mention a few other key paremeters you might find useful and their usage.

| Parameter | Purpose |
Expand Down
6 changes: 3 additions & 3 deletions external/dockerfile_functions.sh
Original file line number Diff line number Diff line change
Expand Up @@ -519,9 +519,9 @@ print_clone_project() {
git_branch_tag="master"
if [[ "${github_url}" == *"aqa-tests"* ]]; then
if [[ ! -z ${USE_TESTENV_PROPERTIES} ]]; then
if [[ "${USE_TESTENV_PROPERTIES}" == "true" && ! -z ${ADOPTOPENJDK_REPO} && ! -z ${ADOPTOPENJDK_BRANCH} ]]; then
github_url=${ADOPTOPENJDK_REPO}
git_branch_tag=${ADOPTOPENJDK_BRANCH}
if [[ "${USE_TESTENV_PROPERTIES}" == "true" && ! -z ${ADOPTIUM_REPO} && ! -z ${ADOPTIUM_BRANCH} ]]; then
github_url=${ADOPTIUM_REPO}
git_branch_tag=${ADOPTIUM_BRANCH}
echo -e "\nENV USE_TESTENV_PROPERTIES=true\n" >> ${file}
fi
fi
Expand Down
8 changes: 4 additions & 4 deletions system/common.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@
<isset property="isZOS"/>
</condition>

<condition property="openjdk_systemtest_repo" value="${env.ADOPTOPENJDK_SYSTEMTEST_REPO}" else="${git-prefix}://github.com/adoptium/aqa-systemtest.git">
<isset property="env.ADOPTOPENJDK_SYSTEMTEST_REPO"/>
<condition property="openjdk_systemtest_repo" value="${env.ADOPTIUM_SYSTEMTEST_REPO}" else="${git-prefix}://github.com/adoptium/aqa-systemtest.git">
<isset property="env.ADOPTIUM_SYSTEMTEST_REPO"/>
</condition>
<condition property="openjdk_systemtest_branch" value="${env.ADOPTOPENJDK_SYSTEMTEST_BRANCH}" else="master">
<isset property="env.ADOPTOPENJDK_SYSTEMTEST_BRANCH"/>
<condition property="openjdk_systemtest_branch" value="${env.ADOPTIUM_SYSTEMTEST_BRANCH}" else="master">
<isset property="env.ADOPTIUM_SYSTEMTEST_BRANCH"/>
</condition>

<condition property="openj9_systemtest_repo" value="${env.OPENJ9_SYSTEMTEST_REPO}" else="${git-prefix}://github.com/eclipse-openj9/openj9-systemtest.git">
Expand Down
4 changes: 2 additions & 2 deletions testenv/testenv.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ STF_REPO=https://github.com/adoptium/STF.git
STF_BRANCH=master
OPENJ9_SYSTEMTEST_REPO=https://github.com/eclipse-openj9/openj9-systemtest.git
OPENJ9_SYSTEMTEST_BRANCH=master
ADOPTOPENJDK_SYSTEMTEST_REPO=https://github.com/adoptium/aqa-systemtest.git
ADOPTOPENJDK_SYSTEMTEST_BRANCH=master
ADOPTIUM_SYSTEMTEST_REPO=https://github.com/adoptium/aqa-systemtest.git
ADOPTIUM_SYSTEMTEST_BRANCH=master
JDK8_REPO=https://github.com/adoptium/jdk8u.git
JDK8_BRANCH=dev
JDK11_REPO=https://github.com/adoptium/jdk11u.git
Expand Down
4 changes: 2 additions & 2 deletions testenv/testenv_arm32.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ STF_REPO=https://github.com/adoptium/STF.git
STF_BRANCH=master
OPENJ9_SYSTEMTEST_REPO=https://github.com/eclipse-openj9/openj9-systemtest.git
OPENJ9_SYSTEMTEST_BRANCH=master
ADOPTOPENJDK_SYSTEMTEST_REPO=https://github.com/adoptium/aqa-systemtest.git
ADOPTOPENJDK_SYSTEMTEST_BRANCH=master
ADOPTIUM_SYSTEMTEST_REPO=https://github.com/adoptium/aqa-systemtest.git
ADOPTIUM_SYSTEMTEST_BRANCH=master
JDK8_REPO=https://github.com/adoptium/aarch32-jdk8u.git
JDK8_BRANCH=dev
AQA_REQUIRED_TARGETS=sanity.functional,extended.functional,special.functional,sanity.openjdk,extended.openjdk,sanity.system,extended.system,sanity.perf,extended.perf
Expand Down
4 changes: 2 additions & 2 deletions testenv/testenv_zos.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ [email protected]:adoptium/STF.git
STF_BRANCH=master
[email protected]:eclipse-openj9/openj9-systemtest.git
OPENJ9_SYSTEMTEST_BRANCH=master
ADOPTOPENJDK_SYSTEMTEST_REPO[email protected]:adoptium/aqa-systemtest.git
ADOPTOPENJDK_SYSTEMTEST_BRANCH=master
ADOPTIUM_SYSTEMTEST_REPO[email protected]:adoptium/aqa-systemtest.git
ADOPTIUM_SYSTEMTEST_BRANCH=master
[email protected]:runtimes/openj9-openjdk-jdk11-zos.git
JDK11_OPENJ9_BRANCH=ibm-jdk11-jcldev
AQA_REQUIRED_TARGETS=sanity.functional,extended.functional,special.functional,sanity.openjdk,extended.openjdk,sanity.system,extended.system,sanity.perf,extended.perf