From f8f0d1d5fcea4a36f76e1d703a4701677dc0d45f Mon Sep 17 00:00:00 2001 From: Jeff Olivier Date: Mon, 25 Aug 2025 12:55:00 -0600 Subject: [PATCH 1/3] DAOS-17472 build: Promote rpms to separate repos Change-Id: Iafe3932bbb7f2cfd5c5d2695cece9fa051130391 Signed-off-by: Jeff Olivier --- vars/buildRpmPost.groovy | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/vars/buildRpmPost.groovy b/vars/buildRpmPost.groovy index b5a81b42f..3eef80ce1 100755 --- a/vars/buildRpmPost.groovy +++ b/vars/buildRpmPost.groovy @@ -49,6 +49,8 @@ * * config['rpmlint'] Whether to run rpmlint on resulting RPMs. * Default false. + * config['new_rpm'] Whether we are using new RPM or not + * Default false * * config['unsuccessful_script'] Script to run if build is not successful. * Default 'ci/rpm/build_unsuccessful.sh' @@ -88,11 +90,26 @@ void call(Map config = [:]) { } String product = config.get('product', 'daos-stack') - publishToRepository product: product, - format: repo_format, - maturity: 'stable', - tech: target, - repo_dir: 'artifacts/' + target + if (config.get('new_rpm', false)) { + publishToRepository product: product, + format: repo_format, + maturity: 'stable', + tech: target, + repo_dir: 'artifacts/' + target + } else { + if fileExists('artifacts/' + target + '/deps') { + publishToRepository product: 'deps', + format: repo_format, + maturity: 'stable', + tech: target, + repo_dir: 'artifacts/' + target + '/deps' + } + publishToRepository product: product, + format: repo_format, + maturity: 'stable', + tech: target, + repo_dir: 'artifacts/' + target + '/daos' + } if (config.get('rpmlint', false)) { rpmlintMockResults(sh(label: 'Get chroot name', From 8fcebb23484a085154a72543f1f2fb3d7f7144f7 Mon Sep 17 00:00:00 2001 From: Jeff Olivier Date: Mon, 25 Aug 2025 13:18:49 -0600 Subject: [PATCH 2/3] Fix tabs Change-Id: Ie77cb83f6aada50b9812809d233dbccabdb805a2 Signed-off-by: Jeff Olivier --- vars/buildRpmPost.groovy | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/vars/buildRpmPost.groovy b/vars/buildRpmPost.groovy index 3eef80ce1..2ebea4f56 100755 --- a/vars/buildRpmPost.groovy +++ b/vars/buildRpmPost.groovy @@ -90,26 +90,26 @@ void call(Map config = [:]) { } String product = config.get('product', 'daos-stack') - if (config.get('new_rpm', false)) { - publishToRepository product: product, - format: repo_format, + if (config.get('new_rpm', false)) { + publishToRepository product: product, + format: repo_format, maturity: 'stable', tech: target, repo_dir: 'artifacts/' + target } else { - if fileExists('artifacts/' + target + '/deps') { - publishToRepository product: 'deps', - format: repo_format, + if fileExists('artifacts/' + target + '/deps') { + publishToRepository product: 'deps', + format: repo_format, maturity: 'stable', tech: target, repo_dir: 'artifacts/' + target + '/deps' } - publishToRepository product: product, - format: repo_format, + publishToRepository product: product, + format: repo_format, maturity: 'stable', tech: target, repo_dir: 'artifacts/' + target + '/daos' - } + } if (config.get('rpmlint', false)) { rpmlintMockResults(sh(label: 'Get chroot name', From 276fd8fb51e960751b2b1c46128c07cdb3354d96 Mon Sep 17 00:00:00 2001 From: Jeff Olivier Date: Mon, 25 Aug 2025 14:21:57 -0600 Subject: [PATCH 3/3] Fix a typo Change-Id: I8591a3b330ff624a03fba5fd7ca30d60688f9185 Signed-off-by: Jeff Olivier --- vars/buildRpmPost.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars/buildRpmPost.groovy b/vars/buildRpmPost.groovy index 2ebea4f56..19b2927e9 100755 --- a/vars/buildRpmPost.groovy +++ b/vars/buildRpmPost.groovy @@ -97,7 +97,7 @@ void call(Map config = [:]) { tech: target, repo_dir: 'artifacts/' + target } else { - if fileExists('artifacts/' + target + '/deps') { + if (fileExists('artifacts/' + target + '/deps')) { publishToRepository product: 'deps', format: repo_format, maturity: 'stable',