From d570089f96d86eed47adc3684f3777e1eeb29c4e Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Wed, 17 Dec 2025 21:05:20 +0100 Subject: [PATCH 01/10] add image_version and modify target_stash Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index 0f6c2d8a3..25237d85d 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -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) { @@ -136,19 +138,27 @@ 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) - String target_stash = "${stage_info['target']}-${stage_info['compiler']}" + String target_stash = config.get('image_version') ?: + ${stage_info['target']} + target_stash += '-' + stage_info['compiler'] if (stage_info['build_type']) { target_stash += '-' + stage_info['build_type'] } + println("target_stash = ${target_stash}") + List stashes = [] if (config['stashes']) { stashes = config['stashes'] From de8bc80bf72928e17be8964a1661e9434640d9e6 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Thu, 18 Dec 2025 08:12:59 +0100 Subject: [PATCH 02/10] print stashes Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 1 + 1 file changed, 1 insertion(+) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index 25237d85d..0ae89f17f 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -162,6 +162,7 @@ Map call(Map config = [:]) { List stashes = [] if (config['stashes']) { stashes = config['stashes'] + println("stashes from config = ${stashes}") } else { if (config.get('unstash_tests', true)) { stashes.add("${target_stash}-tests") From 6f9af1f70c752387eb07bfdd18ce4dee096135fc Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Thu, 8 Jan 2026 11:59:09 +0100 Subject: [PATCH 03/10] revert the distro variable Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index 0ae89f17f..81f8da785 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -146,7 +146,8 @@ Map call(Map config = [:]) { Map runData = provisionNodes( NODELIST: nodelist, node_count: stage_info['node_count'], - distro: image_version, + distro: (stage_info['ci_target'] =~ + /([a-z]+)(.*)/)[0][1] + stage_info['distro_version'], inst_repos: config.get('inst_repos', ''), inst_rpms: inst_rpms) From 6e3ea17d8edaf1eb799e24db1945683717eec6bd Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Thu, 8 Jan 2026 14:19:22 +0100 Subject: [PATCH 04/10] remove println Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index 81f8da785..afb046f1e 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -163,7 +163,6 @@ Map call(Map config = [:]) { List stashes = [] if (config['stashes']) { stashes = config['stashes'] - println("stashes from config = ${stashes}") } else { if (config.get('unstash_tests', true)) { stashes.add("${target_stash}-tests") From fbae68f58b6f8ca85236884c1a61b4246fc0c365 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Mon, 12 Jan 2026 14:14:43 +0100 Subject: [PATCH 05/10] change el9 from 9.4 to 9.7 Signed-off-by: Oksana Salyk --- vars/distroVersion.groovy | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index 8f66f9600..96fc9b708 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -33,8 +33,8 @@ String call(String distro, String branch) { return ['el8': ['master': '8.8', '2.4': '8.8', '2.6': '8.8'], - 'el9': ['master': '9.4', - '2.6': '9.4'], + 'el9': ['master': '9.7', + '2.6': '9.7'], 'leap15': ['master': '15.6', '2.4': '15.6', '2.6': '15.6'], @@ -48,8 +48,8 @@ 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', '2.6') == '9.4') +assert(call('el9', 'master') == '9.7') +assert(call('el9', '2.6') == '9.7') /* Uncomment to do further testing env = [:] From b80c0d65a5c9d5a6fe48176c56e0b77c22def63c Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Fri, 23 Jan 2026 11:31:56 +0100 Subject: [PATCH 06/10] revert the target_stash Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index afb046f1e..68bbc31fc 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -151,9 +151,7 @@ Map call(Map config = [:]) { inst_repos: config.get('inst_repos', ''), inst_rpms: inst_rpms) - String target_stash = config.get('image_version') ?: - ${stage_info['target']} - target_stash += '-' + stage_info['compiler'] + String target_stash = "${stage_info['target']}-${stage_info['compiler']}" if (stage_info['build_type']) { target_stash += '-' + stage_info['build_type'] } From 6c45625d14433e0704ae73ae29ff19a83b005d4b Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Fri, 23 Jan 2026 13:14:41 +0100 Subject: [PATCH 07/10] try to create target_stash from image_version Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index 68bbc31fc..7207c459b 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -151,7 +151,9 @@ Map call(Map config = [:]) { inst_repos: config.get('inst_repos', ''), inst_rpms: inst_rpms) - String target_stash = "${stage_info['target']}-${stage_info['compiler']}" + String target_stash = image_version ?: + ${stage_info['target']} + target_stash += '-' + stage_info['compiler'] if (stage_info['build_type']) { target_stash += '-' + stage_info['build_type'] } From 8929bc991510f286953758942bc504319592aa7d Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Mon, 26 Jan 2026 12:28:12 +0100 Subject: [PATCH 08/10] remove unneeded println Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index 7207c459b..dde9a6b01 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -141,8 +141,6 @@ 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'], @@ -158,8 +156,6 @@ Map call(Map config = [:]) { target_stash += '-' + stage_info['build_type'] } - println("target_stash = ${target_stash}") - List stashes = [] if (config['stashes']) { stashes = config['stashes'] From 0ed2eae3f913d99ed2473be3d176471047845707 Mon Sep 17 00:00:00 2001 From: Oksana Salyk Date: Mon, 26 Jan 2026 13:55:28 +0100 Subject: [PATCH 09/10] use image_version Signed-off-by: Oksana Salyk --- vars/unitTest.groovy | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/vars/unitTest.groovy b/vars/unitTest.groovy index dde9a6b01..6e88f7898 100755 --- a/vars/unitTest.groovy +++ b/vars/unitTest.groovy @@ -144,8 +144,7 @@ Map call(Map config = [:]) { 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) From 3ed18d151dbcff6bcd63325099033e2b09d598d8 Mon Sep 17 00:00:00 2001 From: Jan Michalski Date: Mon, 26 Jan 2026 19:39:19 +0000 Subject: [PATCH 10/10] 2.6 -> EL9.4 (build test) Signed-off-by: Jan Michalski --- vars/distroVersion.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/distroVersion.groovy b/vars/distroVersion.groovy index 96fc9b708..8aa686987 100755 --- a/vars/distroVersion.groovy +++ b/vars/distroVersion.groovy @@ -34,7 +34,7 @@ String call(String distro, String branch) { '2.4': '8.8', '2.6': '8.8'], 'el9': ['master': '9.7', - '2.6': '9.7'], + '2.6': '9.4'], 'leap15': ['master': '15.6', '2.4': '15.6', '2.6': '15.6'],