Skip to content

Commit 24a94c2

Browse files
Accelerator1996Accelerator1996
committed
fix aqaTestPipeline.groovy
1 parent 52a3f90 commit 24a94c2

File tree

1 file changed

+68
-64
lines changed

1 file changed

+68
-64
lines changed

‎buildenv/jenkins/aqaTestPipeline.groovy‎

Lines changed: 68 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,10 @@ node {
4040
short_name = "j9"
4141
jdk_impl = params.VARIANT
4242
}
43+
//if (params.VARIANT == "ajdk") {
44+
// short_name = "ajdk"
45+
// jdk_impl = params.VARIANT
46+
//}
4347
def download_url = params.CUSTOMIZED_SDK_URL ? params.CUSTOMIZED_SDK_URL : ""
4448
def sdk_resource_value = SDK_RESOURCE
4549

@@ -71,83 +75,83 @@ node {
7175
}
7276
}
7377

74-
if (AUTO_AQA_GEN) {
75-
String[] targetTokens = TARGET.split("\\.")
76-
def level = targetTokens[0];
77-
def group = targetTokens[1];
78-
def parameters = [
79-
string(name: 'LEVELS', value: level),
80-
string(name: 'GROUPS', value: group),
81-
string(name: 'JDK_VERSIONS', value: JDK_VERSION),
82-
string(name: 'ARCH_OS_LIST', value: PLATFORM),
83-
string(name: 'JDK_IMPL', value: jdk_impl),
84-
booleanParam(name: 'LIGHT_WEIGHT_CHECKOUT', value: false)
85-
]
86-
build job: 'Test_Job_Auto_Gen', parameters: parameters, propagate: true
87-
}
78+
if (AUTO_AQA_GEN) {
79+
String[] targetTokens = TARGET.split("\\.")
80+
def level = targetTokens[0];
81+
def group = targetTokens[1];
82+
def parameters = [
83+
string(name: 'LEVELS', value: level),
84+
string(name: 'GROUPS', value: group),
85+
string(name: 'JDK_VERSIONS', value: JDK_VERSION),
86+
string(name: 'ARCH_OS_LIST', value: PLATFORM),
87+
string(name: 'JDK_IMPL', value: jdk_impl),
88+
booleanParam(name: 'LIGHT_WEIGHT_CHECKOUT', value: false)
89+
]
90+
build job: 'Test_Job_Auto_Gen', parameters: parameters, propagate: true
91+
}
8892

89-
def JobHelper = library(identifier: 'openjdk-jenkins-helper@master').JobHelper
90-
if (JobHelper.jobIsRunnable(TEST_JOB_NAME as String)) {
91-
JOBS["${TEST_JOB_NAME}"] = {
92-
def downstreamJob = build job: TEST_JOB_NAME, propagate: false, parameters: [
93-
string(name: 'ADOPTOPENJDK_REPO', value: params.ADOPTOPENJDK_REPO),
94-
string(name: 'ADOPTOPENJDK_BRANCH', value: params.ADOPTOPENJDK_BRANCH),
95-
booleanParam(name: 'USE_TESTENV_PROPERTIES', value: USE_TESTENV_PROPERTIES),
96-
string(name: 'SDK_RESOURCE', value: sdk_resource_value),
97-
string(name: 'CUSTOMIZED_SDK_URL', value: download_url),
98-
string(name: 'CUSTOMIZED_SDK_URL_CREDENTIAL_ID', value: params.CUSTOMIZED_SDK_URL_CREDENTIAL_ID),
99-
string(name: 'UPSTREAM_JOB_NAME', value: params.UPSTREAM_JOB_NAME),
100-
string(name: 'UPSTREAM_JOB_NUMBER', value: params.UPSTREAM_JOB_NUMBER),
101-
string(name: 'PARALLEL', value: PARALLEL),
102-
string(name: 'NUM_MACHINES', value: NUM_MACHINES.toString()),
103-
booleanParam(name: 'GENERATE_JOBS', value: AUTO_AQA_GEN),
104-
booleanParam(name: 'LIGHT_WEIGHT_CHECKOUT', value: false),
105-
string(name: 'TIME_LIMIT', value: TIME_LIMIT.toString()),
106-
string(name: 'TRSS_URL', value: TRSS_URL),
107-
string(name: 'LABEL', value: LABEL),
108-
string(name: 'LABEL_ADDITION', value: LABEL_ADDITION),
109-
string(name: 'TEST_FLAG', value: TEST_FLAG),
110-
string(name: 'APPLICATION_OPTIONS', value: APPLICATION_OPTIONS),
111-
booleanParam(name: 'KEEP_REPORTDIR', value: keep_reportdir),
112-
booleanParam(name: 'SETUP_JCK_RUN', value: SETUP_JCK_RUN),
113-
booleanParam(name: 'DYNAMIC_COMPILE', value: params.DYNAMIC_COMPILE)
114-
], wait: true
115-
def result = downstreamJob.getResult()
116-
echo " ${TEST_JOB_NAME} result is ${result}"
117-
if (downstreamJob.getResult() == 'SUCCESS' || downstreamJob.getResult() == 'UNSTABLE') {
118-
echo "[NODE SHIFT] MOVING INTO CONTROLLER NODE..."
119-
node("worker || (ci.role.test&&hw.arch.x86&&sw.os.linux)") {
120-
try {
121-
timeout(time: 2, unit: 'HOURS') {
122-
copyArtifacts(
123-
projectName: TEST_JOB_NAME,
124-
selector:specific("${downstreamJob.getNumber()}"),
125-
filter: "**/${TEST_JOB_NAME}*.tap",
126-
fingerprintArtifacts: true,
127-
flatten: true
128-
)
93+
def JobHelper = library(identifier: 'openjdk-jenkins-helper@master').JobHelper
94+
if (JobHelper.jobIsRunnable(TEST_JOB_NAME as String)) {
95+
JOBS["${TEST_JOB_NAME}"] = {
96+
def downstreamJob = build job: TEST_JOB_NAME, propagate: false, parameters: [
97+
string(name: 'ADOPTOPENJDK_REPO', value: params.ADOPTOPENJDK_REPO),
98+
string(name: 'ADOPTOPENJDK_BRANCH', value: params.ADOPTOPENJDK_BRANCH),
99+
booleanParam(name: 'USE_TESTENV_PROPERTIES', value: USE_TESTENV_PROPERTIES),
100+
string(name: 'SDK_RESOURCE', value: sdk_resource_value),
101+
string(name: 'CUSTOMIZED_SDK_URL', value: download_url),
102+
string(name: 'CUSTOMIZED_SDK_URL_CREDENTIAL_ID', value: params.CUSTOMIZED_SDK_URL_CREDENTIAL_ID),
103+
string(name: 'UPSTREAM_JOB_NAME', value: params.UPSTREAM_JOB_NAME),
104+
string(name: 'UPSTREAM_JOB_NUMBER', value: params.UPSTREAM_JOB_NUMBER),
105+
string(name: 'PARALLEL', value: PARALLEL),
106+
string(name: 'NUM_MACHINES', value: NUM_MACHINES.toString()),
107+
booleanParam(name: 'GENERATE_JOBS', value: AUTO_AQA_GEN),
108+
booleanParam(name: 'LIGHT_WEIGHT_CHECKOUT', value: false),
109+
string(name: 'TIME_LIMIT', value: TIME_LIMIT.toString()),
110+
string(name: 'TRSS_URL', value: TRSS_URL),
111+
string(name: 'LABEL', value: LABEL),
112+
string(name: 'LABEL_ADDITION', value: LABEL_ADDITION),
113+
string(name: 'TEST_FLAG', value: TEST_FLAG),
114+
//string(name: 'APPLICATION_OPTIONS', value: APPLICATION_OPTIONS),
115+
booleanParam(name: 'KEEP_REPORTDIR', value: keep_reportdir),
116+
//booleanParam(name: 'SETUP_JCK_RUN', value: SETUP_JCK_RUN),
117+
booleanParam(name: 'DYNAMIC_COMPILE', value: params.DYNAMIC_COMPILE)
118+
], wait: true
119+
def result = downstreamJob.getResult()
120+
echo " ${TEST_JOB_NAME} result is ${result}"
121+
if (downstreamJob.getResult() == 'SUCCESS' || downstreamJob.getResult() == 'UNSTABLE') {
122+
echo "[NODE SHIFT] MOVING INTO CONTROLLER NODE..."
123+
node("worker || (ci.role.test&&hw.arch.x86&&sw.os.linux)") {
124+
try {
125+
timeout(time: 2, unit: 'HOURS') {
126+
copyArtifacts(
127+
projectName: TEST_JOB_NAME,
128+
selector:specific("${downstreamJob.getNumber()}"),
129+
filter: "**/${TEST_JOB_NAME}*.tap",
130+
fingerprintArtifacts: true,
131+
flatten: true
132+
)
133+
}
134+
} catch (Exception e) {
135+
echo "Cannot run copyArtifacts from job ${TEST_JOB_NAME}. Skipping copyArtifacts..."
129136
}
130-
} catch (Exception e) {
131-
echo "Cannot run copyArtifacts from job ${TEST_JOB_NAME}. Skipping copyArtifacts..."
132-
}
133-
try {
134-
timeout(time: 1, unit: 'HOURS') {
135-
archiveArtifacts artifacts: "*.tap", fingerprint: true
137+
try {
138+
timeout(time: 1, unit: 'HOURS') {
139+
archiveArtifacts artifacts: "*.tap", fingerprint: true
140+
}
141+
} catch (Exception e) {
142+
echo "Cannot archiveArtifacts from job ${TEST_JOB_NAME}. "
136143
}
137-
} catch (Exception e) {
138-
echo "Cannot archiveArtifacts from job ${TEST_JOB_NAME}. "
139144
}
140145
} else {
141146
echo " ${TEST_JOB_NAME} result is ${result}"
142147
currentBuild.result = "FAILURE"
143148
}
144149
}
145150
} else {
146-
println "[WARNING] Requested test job that does not exist or is disabled: ${TEST_JOB_NAME}"
151+
println "[WARNING] Requested test job that does not exist or is disabled: ${TEST_JOB_NAME}"
147152
}
148153
}
149154
}
150-
151155
}
152156
parallel JOBS
153157
cleanWs disableDeferredWipeout: true, deleteDirs: true

0 commit comments

Comments
 (0)