|
1 | 1 | properties([ |
2 | 2 | parameters([ |
3 | 3 | string(name: 'executionId', defaultValue: UUID.randomUUID().toString(), description: 'Unique execution ID'), |
4 | | - string(name: 'ebcShortlist', defaultValue: 'rh-openjdk-qe-rhel9-jenkins_medium.yml', |
| 4 | + string(name: 'ebcShortlist', defaultValue: 'rh-openjdk-qe-rhel9-jenkins.yml', |
5 | 5 | description: 'This controls the EBC shortlist to use when provisioning a Jenkins node.'), |
6 | 6 | string(name: 'ecosystemTracking', defaultValue: "", |
7 | 7 | description: 'Tracking Map as string often containing information about CI Orchestrator pipeline'), |
8 | 8 | string(name: 'JENKINS_JOBS_BRANCH', defaultValue: 'dev', description: 'Branch of Jenkins jobs to use for scripts execution'), |
9 | 9 | string(name: 'JENKINS_JOBS_ORG', defaultValue: 'cognitive-software-delivery', description: 'GitHub Org of Jenkins jobs to use for scripts execution'), |
10 | | - string(name: 'TEST_SUITE_BRANCH', defaultValue: 'dev', description: 'Branch to test'), |
| 10 | + string(name: 'TEST_SUITE_BRANCH', defaultValue: 'main', description: 'Branch to test'), |
11 | 11 | string(name: 'TEST_SUITE_URL', |
12 | 12 | defaultValue: 'https://github.com/rh-openjdk/TestHeadlessComponents.git', |
13 | 13 | description: 'URL to download for prepared suites'), |
14 | 14 | string(name: 'TEST_COMMAND', |
15 | | - defaultValue: 'export TEST_JDK_HOME=/usr/lib/jvm/java-17-openjdk JAVA_TO_TEST=/usr/lib/jvm/java-17-openjdk/bin/java OJDK_VERSION_NUMBER=17 JREJDK=jdk TMPRESULTS=tmpresults ; bash testHeadlessComponents.sh ; ls', |
| 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', |
16 | 16 | description: 'Test command to execute on the target machine'), |
17 | 17 | string(name: 'GET_JAVA_COMMAND', |
18 | | - defaultValue: 'sudo dnf install -y java-17-openjdk-devel', |
| 18 | + defaultValue: 'sudo apt install -y default-jdk', |
19 | 19 | description: 'The command to get jdk installed.'), |
20 | 20 | string(name: 'FILE_SERVER', defaultValue: '', |
21 | 21 | description: 'File server where the final results and artifacts will be stored for Cognitive UI'), |
@@ -144,8 +144,33 @@ timestamps { |
144 | 144 |
|
145 | 145 | stage('jvm-setup') { |
146 | 146 | reportActivity(name: 'jvm-setup', executionId: params.executionId) { |
| 147 | + // Download latest Koji build |
| 148 | + checkout([$class: 'KojiSCM', |
| 149 | + kojiBuildProviders: [[ |
| 150 | + $class: 'KojiBuildProvider', |
| 151 | + topUrl: params.KOJI_TOP_URLS, |
| 152 | + downloadUrl: params.KOJI_DOWNLOAD_URLS |
| 153 | + ]], |
| 154 | + kojiXmlRpcApi: [ |
| 155 | + $class: 'RealKojiXmlRpcApi', |
| 156 | + packageName: params.KOJI_PACKAGE_NAME, |
| 157 | + arch: params.KOJI_PACKAGE_ARCH, |
| 158 | + tag: params.KOJI_TAG, |
| 159 | + subpackageDenylist: params.KOJI_SUBPACKAGE_DENYLIST, |
| 160 | + subpackageAllowlist: params.KOJI_SUBPACKAGE_ALLOWLIST |
| 161 | + ], |
| 162 | + downloadDir: params.KOJI_DOWNLOAD_DIR, |
| 163 | + cleanDownloadDir: params.KOJI_CLEAN_DESTINATION, |
| 164 | + dirPerNvr: params.KOJI_CREATE_SUBDIR_PER_NVR, |
| 165 | + maxPreviousBuilds: params.KOJI_MAX_PREV_BUILDS as Integer |
| 166 | + ]) |
| 167 | + |
147 | 168 | withCredentials([usernamePassword(credentialsId: "intranetId", usernameVariable: 'intranetId_USR', passwordVariable: 'intranetId_PSW')]) { |
148 | | - sh params.GET_JAVA_COMMAND |
| 169 | + // Install RPMs from downloaded Koji build |
| 170 | + sh """ |
| 171 | + echo "Installing RPMs from ${params.KOJI_DOWNLOAD_DIR}" |
| 172 | + sudo dnf install -y ${params.KOJI_DOWNLOAD_DIR}/**/*.rpm |
| 173 | + """ |
149 | 174 | } |
150 | 175 | } |
151 | 176 | } |
|
0 commit comments