Skip to content

add image_version and modify target_stash #488

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

Draft
osalyk wants to merge 6 commits into
base: master
Choose a base branch
from
+11 −2
Draft

add image_version and modify target_stash #488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d570089
add image_version and modify target_stash
osalyk Dec 17, 2025
4a8fd49
revert target_stash
osalyk Dec 17, 2025
562592d
print stashes
osalyk Dec 18, 2025
efb06cd
revert the distro variable
osalyk Jan 8, 2026
0b40016
remove println
osalyk Jan 8, 2026
279da37
change el9 from 9.4 to 9.7
osalyk Jan 12, 2026
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: 2 additions & 2 deletions vars/distroVersion.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ String call(String distro, String branch) {
return ['el8': ['master': '8.8',
'2.4': '8.8',
'2.6': '8.8'],
'el9': ['master': '9.4',
'el9': ['master': '9.7',
'2.6': '9.4'],
'leap15': ['master': '15.6',
'2.4': '15.6',
Expand All @@ -48,7 +48,7 @@ assert(call('leap15', 'master') == '15.6')
assert(call('el8', '2.4') == '8.8')
assert(call('el8', '2.6') == '8.8')
assert(call('el8', 'master') == '8.8')
assert(call('el9', 'master') == '9.4')
assert(call('el9', 'master') == '9.7')
assert(call('el9', '2.6') == '9.4')

/* Uncomment to do further testing
Expand Down
9 changes: 9 additions & 0 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 @@ -136,6 +138,11 @@ 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'],
Expand All @@ -149,6 +156,8 @@ Map call(Map config = [:]) {
target_stash += '-' + stage_info['build_type']
}

println("target_stash = ${target_stash}")

List stashes = []
if (config['stashes']) {
stashes = config['stashes']
Expand Down