Skip to content

ceph-dev-cron: Convert to groovy, trigger ceph-dev-pipeline instead#2533

Merged
djgalloway merged 1 commit intomainfrom
cron-pipe
Feb 11, 2026
Merged

ceph-dev-cron: Convert to groovy, trigger ceph-dev-pipeline instead#2533
djgalloway merged 1 commit intomainfrom
cron-pipe

Conversation

@djgalloway
Copy link
Copy Markdown
Contributor

Screenshot 2026-01-28 at 4 34 03 PM

Copy link
Copy Markdown
Member

@dmick dmick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

going to look at more but yeah, what's happening with the sha1 business would be a great framework for understanding the code

Comment thread ceph-dev-cron/build/Jenkinsfile
@djgalloway djgalloway force-pushed the cron-pipe branch 3 times, most recently from f133e9d to ac175a8 Compare January 29, 2026 21:15
Comment thread ceph-dev-cron/build/Jenkinsfile
Copy link
Copy Markdown
Member

@dmick dmick left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

other than being worried about state management, this seems simple and now understandable with the comments

@dmick dmick requested a review from zmc January 30, 2026 04:33
@djgalloway
Copy link
Copy Markdown
Contributor Author

@zmc ping

Copy link
Copy Markdown
Member

@zmc zmc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me, only have one non-blocking suggestion about log output.

Comment thread ceph-dev-cron/build/Jenkinsfile Outdated
def winDistros = toks.findAll { it == 'windows' }.join(' ')

if (linuxDistros) {
echo "Triggering BRANCH=${b}, DISTROS=${linuxDistros}, FLAVOR=default, ARCH=x86_64"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think that if the log message mentions parameter values, we should also use them explicitly below, to avoid confusion if e.g. ceph-dev-pipeline defaults change.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fair enough, here's the only change in the force push

diff --git a/ceph-dev-cron/build/Jenkinsfile b/ceph-dev-cron/build/Jenkinsfile
index 1e391664..7420658a 100644
--- a/ceph-dev-cron/build/Jenkinsfile
+++ b/ceph-dev-cron/build/Jenkinsfile
@@ -121,11 +121,13 @@ node('built-in') {
           def winDistros   = toks.findAll { it == 'windows' }.join(' ')
     
           if (linuxDistros) {
-            echo "Triggering BRANCH=${b}, DISTROS=${linuxDistros}, FLAVOR=default, ARCH=x86_64"
+            echo "Triggering BRANCH=${b}, DISTROS=${linuxDistros}, FLAVORS=default, ARCHS=x86_64"
             build job: 'ceph-dev-pipeline',
                   parameters: [
                     string(name: 'BRANCH',    value: b),
                     string(name: 'DISTROS',   value: linuxDistros),
+                    string(name: 'FLAVORS',   value: 'default'),
+                    string(name: 'ARCHS',     value: 'x86_64'),
                     string(name: 'CEPH_REPO', value: repoUrl),
                     string(name: 'SETUP_JOB', value: 'ceph-source-dist'),
                     booleanParam(name: 'FORCE', value: true)
@@ -134,11 +136,13 @@ node('built-in') {
           }
     
           if (winDistros) {
-            echo "Triggering BRANCH=${b}, DISTROS=${winDistros}, FLAVOR=default, ARCH=x86_64"
+            echo "Triggering BRANCH=${b}, DISTROS=${winDistros}, FLAVOR=default, ARCHS=x86_64"
             build job: 'ceph-dev',
                   parameters: [
                     string(name: 'BRANCH',    value: b),
                     string(name: 'DISTROS',   value: winDistros),
+                    string(name: 'FLAVOR',    value: 'default'),
+                    string(name: 'ARCHS',     value: 'x86_64'),
                     booleanParam(name: 'FORCE', value: true)
                   ],
                   wait: false
@@ -146,7 +150,7 @@ node('built-in') {
     
           // This block is for FLAVOR=debug and/or ARCHS=arm64
           cfg[b].extras.each { ex ->
-            echo "Triggering BRANCH=${b}, FLAVOR=${ex.flavors}, ARCH=${ex.archs}"
+            echo "Triggering BRANCH=${b}, FLAVORS=${ex.flavors}, ARCHS=${ex.archs}"
             build job: 'ceph-dev-pipeline',
                   parameters: [
                     string(name: 'BRANCH',    value: b),

Signed-off-by: David Galloway <david.galloway@ibm.com>
@djgalloway djgalloway merged commit cf7ebff into main Feb 11, 2026
1 check passed
@djgalloway djgalloway deleted the cron-pipe branch February 11, 2026 15:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants