Skip to content

SRE-3459 ci: explicitly image version for unit tests #485

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

Open
osalyk wants to merge 7 commits into
base: master
Choose a base branch
from
+13 −5
Open

SRE-3459 ci: explicitly image version for unit tests #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
8b57412
add image_version parameter for unitTest.groovy
osalyk Nov 25, 2025
2217f56
fix image_versiom
osalyk Nov 25, 2025
22f9cbc
print image_version variable
osalyk Nov 26, 2025
9f14f12
add EL_9 in provisionNodes.groovy
osalyk Nov 26, 2025
c07d532
Add new parameter to unitPackages.groovy
osalyk Dec 5, 2025
e3b8811
reverse last change
osalyk Dec 5, 2025
9b5db78
change unitPackages.groovy
osalyk Dec 5, 2025
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
4 changes: 3 additions & 1 deletion vars/provisionNodes.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,11 @@ Map call(Map config = [:]) {
provision_script += 'EL_7'
break
case 'el8':
case 'el9':
provision_script += 'EL_8'
break
case 'el9':
provision_script += 'EL_9'
break
case 'suse':
provision_script += 'LEAP_15'
break
Expand Down
5 changes: 3 additions & 2 deletions vars/unitPackages.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
* Method to return the list of Unit Testing packages
*/

String call() {
String call(Map args = [:]) {
String script = 'ci/unit/required_packages.sh'
if (!fileExists(script)) {
echo "${script} doesn't exist. " +
Expand All @@ -20,7 +20,8 @@ String call() {
}

Map stage_info = parseStageInfo()
String target = stage_info['target']
String target = args.get('image_version') ?:
(stage_info['target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version']
boolean quick_build = quickBuild()

if (target.startsWith('centos') || target.startsWith('el')) {
Expand Down
9 changes: 7 additions & 2 deletions vars/unitTest.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,8 @@
* default is false.
*
* config['unstash_tests'] Un-stash -tests, default is true.
*
* config['image_version'] Image version to use for provisioning, e.g. el8.8, leap15.6, etc.
*/

Map afterTest(Map config, Map testRunInfo) {
Expand Down Expand Up @@ -137,11 +139,14 @@ Map call(Map config = [:]) {
}
}

String image_version = config.get('image_version') ?:
(stage_info['ci_target'] =~ /([a-z]+)(.*)/)[0][1] + stage_info['distro_version']

println("image_version = ${image_version}")
Map runData = provisionNodes(
NODELIST: nodelist,
node_count: stage_info['node_count'],
distro: (stage_info['ci_target'] =~
/([a-z]+)(.*)/)[0][1] + stage_info['distro_version'],
distro: image_version,
inst_repos: config.get('inst_repos', ''),
inst_rpms: inst_rpms)

Expand Down