Skip to content

Commit 5353037

Browse files
committed
parametrizing java installation and test command
1 parent 6bd79d9 commit 5353037

1 file changed

Lines changed: 7 additions & 5 deletions

File tree

testHeadlessComponents.jenkinsfile

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
properties([
22
parameters([
33
string(name: 'executionId', defaultValue: UUID.randomUUID().toString(), description: 'Unique execution ID'),
4-
string(name: 'ebcShortlist', defaultValue: 'jenkins-child.yml',
4+
string(name: 'ebcShortlist', defaultValue: 'rh-openjdk-qe-rhel9-jenkins.yml',
55
description: 'This controls the EBC shortlist to use when provisioning a Jenkins node.'),
66
string(name: 'ecosystemTracking', defaultValue: "",
77
description: 'Tracking Map as string often containing information about CI Orchestrator pipeline'),
@@ -12,9 +12,11 @@ properties([
1212
defaultValue: 'https://github.com/rh-openjdk/TestHeadlessComponents.git',
1313
description: 'URL to download for prepared suites'),
1414
string(name: 'TEST_COMMAND',
15-
defaultValue: 'export TMPRESULTS=$(Q)$(REPORTDIR)$(D)report$(Q); \
16-
bash $(TEST_ROOT)$(D)functional$(D)testHeadlessComponents$(D)TestHeadlessComponents$(D)testHeadlessComponents.sh;',
15+
defaultValue: 'export TEST_JDK_HOME=/usr/lib/jvm/default-java JAVA_TO_TEST=/usr/lib/jvm/default-java/bin/java OJDK_VERSION_NUMBER=17 JREJDK=jdk TMPRESULTS=tmpresults ; bash testHeadlessComponents.sh ; ls',
1716
description: 'Test command to execute on the target machine'),
17+
string(name: 'GET_JAVA_COMMAND',
18+
defaultValue: 'sudo apt install -y default-jdk',
19+
description: 'The command to get jdk installed.'),
1820
string(name: 'FILE_SERVER', defaultValue: '',
1921
description: 'File server where the final results and artifacts will be stored for Cognitive UI'),
2022
string(name: 'JVM_UNDER_TEST_PATH', defaultValue: '',
@@ -61,15 +63,15 @@ timestamps {
6163
stage('jvm-setup') {
6264
reportActivity(name: 'jvm-setup', executionId: params.executionId) {
6365
withCredentials([usernamePassword(credentialsId: "intranetId", usernameVariable: 'intranetId_USR', passwordVariable: 'intranetId_PSW')]) {
64-
sh "sudo apt install -y default-jdk"
66+
sh params.GET_JAVA_COMMAND
6567
}
6668
}
6769
}
6870

6971
stage('testsuite-run') {
7072
reportActivity(name: 'testsuite-run', executionId: params.executionId) {
7173
withCredentials([usernamePassword(credentialsId: "intranetId", usernameVariable: 'intranetId_USR', passwordVariable: 'intranetId_PSW')]) {
72-
sh "export TEST_JDK_HOME=/usr/lib/jvm/default-java JAVA_TO_TEST=/usr/lib/jvm/default-java/bin/java OJDK_VERSION_NUMBER=17 JREJDK=jdk TMPRESULTS=tmpresults ; bash testHeadlessComponents.sh ; ls"
74+
sh params.TEST_COMMAND
7375
}
7476
}
7577
}

0 commit comments

Comments
 (0)