From afaf564a1788744bb3be5f8a42fcffb36c357d2f Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 25 Oct 2024 10:28:30 -0500 Subject: [PATCH 1/3] test 24-development builds --- opensciencegrid/access-amie/build-config.json | 4 ++-- opensciencegrid/central-syslog/build-config.json | 4 ++-- opensciencegrid/contact-sync/build-config.json | 4 ++-- opensciencegrid/default-build-config.json | 4 ++-- opensciencegrid/gracc-apel/build-config.json | 4 ++-- opensciencegrid/koji-builder/build-config.json | 4 ++-- opensciencegrid/logrotate/build-config.json | 4 ++-- opensciencegrid/mailchimp-sync/build-config.json | 4 ++-- opensciencegrid/osgconnect-report/build-config.json | 4 ++-- opensciencegrid/ospool-static-registry/build-config.json | 4 ++-- opensciencegrid/s3-backup/build-config.json | 4 ++-- opensciencegrid/sssd/build-config.json | 4 ++-- opensciencegrid/stompclt/build-config.json | 4 ++-- opensciencegrid/svn-to-git/build-config.json | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/opensciencegrid/access-amie/build-config.json b/opensciencegrid/access-amie/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/access-amie/build-config.json +++ b/opensciencegrid/access-amie/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/central-syslog/build-config.json b/opensciencegrid/central-syslog/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/central-syslog/build-config.json +++ b/opensciencegrid/central-syslog/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/contact-sync/build-config.json b/opensciencegrid/contact-sync/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/contact-sync/build-config.json +++ b/opensciencegrid/contact-sync/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/default-build-config.json b/opensciencegrid/default-build-config.json index 78b018b1..234d8808 100644 --- a/opensciencegrid/default-build-config.json +++ b/opensciencegrid/default-build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["development", "testing", "release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/gracc-apel/build-config.json b/opensciencegrid/gracc-apel/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/gracc-apel/build-config.json +++ b/opensciencegrid/gracc-apel/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/koji-builder/build-config.json b/opensciencegrid/koji-builder/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/koji-builder/build-config.json +++ b/opensciencegrid/koji-builder/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/logrotate/build-config.json b/opensciencegrid/logrotate/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/logrotate/build-config.json +++ b/opensciencegrid/logrotate/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/mailchimp-sync/build-config.json b/opensciencegrid/mailchimp-sync/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/mailchimp-sync/build-config.json +++ b/opensciencegrid/mailchimp-sync/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/osgconnect-report/build-config.json b/opensciencegrid/osgconnect-report/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/osgconnect-report/build-config.json +++ b/opensciencegrid/osgconnect-report/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/ospool-static-registry/build-config.json b/opensciencegrid/ospool-static-registry/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/ospool-static-registry/build-config.json +++ b/opensciencegrid/ospool-static-registry/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/s3-backup/build-config.json b/opensciencegrid/s3-backup/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/s3-backup/build-config.json +++ b/opensciencegrid/s3-backup/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/sssd/build-config.json b/opensciencegrid/sssd/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/sssd/build-config.json +++ b/opensciencegrid/sssd/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/stompclt/build-config.json b/opensciencegrid/stompclt/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/stompclt/build-config.json +++ b/opensciencegrid/stompclt/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } diff --git a/opensciencegrid/svn-to-git/build-config.json b/opensciencegrid/svn-to-git/build-config.json index 10ad38e8..234d8808 100644 --- a/opensciencegrid/svn-to-git/build-config.json +++ b/opensciencegrid/svn-to-git/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], - "base_repo": ["release"] + "osg_series": ["24"], + "base_repo": ["development"] } From f8381ed7cef503114ff8d46534b5aa3e1954df42 Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 25 Oct 2024 10:37:18 -0500 Subject: [PATCH 2/3] Revert "test 24-development builds" This reverts commit afaf564a1788744bb3be5f8a42fcffb36c357d2f. --- opensciencegrid/access-amie/build-config.json | 4 ++-- opensciencegrid/central-syslog/build-config.json | 4 ++-- opensciencegrid/contact-sync/build-config.json | 4 ++-- opensciencegrid/default-build-config.json | 4 ++-- opensciencegrid/gracc-apel/build-config.json | 4 ++-- opensciencegrid/koji-builder/build-config.json | 4 ++-- opensciencegrid/logrotate/build-config.json | 4 ++-- opensciencegrid/mailchimp-sync/build-config.json | 4 ++-- opensciencegrid/osgconnect-report/build-config.json | 4 ++-- opensciencegrid/ospool-static-registry/build-config.json | 4 ++-- opensciencegrid/s3-backup/build-config.json | 4 ++-- opensciencegrid/sssd/build-config.json | 4 ++-- opensciencegrid/stompclt/build-config.json | 4 ++-- opensciencegrid/svn-to-git/build-config.json | 4 ++-- 14 files changed, 28 insertions(+), 28 deletions(-) diff --git a/opensciencegrid/access-amie/build-config.json b/opensciencegrid/access-amie/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/access-amie/build-config.json +++ b/opensciencegrid/access-amie/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/central-syslog/build-config.json b/opensciencegrid/central-syslog/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/central-syslog/build-config.json +++ b/opensciencegrid/central-syslog/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/contact-sync/build-config.json b/opensciencegrid/contact-sync/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/contact-sync/build-config.json +++ b/opensciencegrid/contact-sync/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/default-build-config.json b/opensciencegrid/default-build-config.json index 234d8808..78b018b1 100644 --- a/opensciencegrid/default-build-config.json +++ b/opensciencegrid/default-build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["development", "testing", "release"] } diff --git a/opensciencegrid/gracc-apel/build-config.json b/opensciencegrid/gracc-apel/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/gracc-apel/build-config.json +++ b/opensciencegrid/gracc-apel/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/koji-builder/build-config.json b/opensciencegrid/koji-builder/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/koji-builder/build-config.json +++ b/opensciencegrid/koji-builder/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/logrotate/build-config.json b/opensciencegrid/logrotate/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/logrotate/build-config.json +++ b/opensciencegrid/logrotate/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/mailchimp-sync/build-config.json b/opensciencegrid/mailchimp-sync/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/mailchimp-sync/build-config.json +++ b/opensciencegrid/mailchimp-sync/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/osgconnect-report/build-config.json b/opensciencegrid/osgconnect-report/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/osgconnect-report/build-config.json +++ b/opensciencegrid/osgconnect-report/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/ospool-static-registry/build-config.json b/opensciencegrid/ospool-static-registry/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/ospool-static-registry/build-config.json +++ b/opensciencegrid/ospool-static-registry/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/s3-backup/build-config.json b/opensciencegrid/s3-backup/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/s3-backup/build-config.json +++ b/opensciencegrid/s3-backup/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/sssd/build-config.json b/opensciencegrid/sssd/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/sssd/build-config.json +++ b/opensciencegrid/sssd/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/stompclt/build-config.json b/opensciencegrid/stompclt/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/stompclt/build-config.json +++ b/opensciencegrid/stompclt/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } diff --git a/opensciencegrid/svn-to-git/build-config.json b/opensciencegrid/svn-to-git/build-config.json index 234d8808..10ad38e8 100644 --- a/opensciencegrid/svn-to-git/build-config.json +++ b/opensciencegrid/svn-to-git/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["24"], - "base_repo": ["development"] + "osg_series": ["23"], + "base_repo": ["release"] } From 2c21235461f53bd477c1d9dc1b1144f16b098fad Mon Sep 17 00:00:00 2001 From: Matthew Westphall Date: Fri, 25 Oct 2024 10:39:07 -0500 Subject: [PATCH 3/3] Add OSG 24 to build matrices --- opensciencegrid/access-amie/build-config.json | 2 +- opensciencegrid/central-syslog/build-config.json | 2 +- opensciencegrid/contact-sync/build-config.json | 2 +- opensciencegrid/default-build-config.json | 2 +- opensciencegrid/gracc-apel/build-config.json | 2 +- opensciencegrid/koji-builder/build-config.json | 2 +- opensciencegrid/logrotate/build-config.json | 2 +- opensciencegrid/mailchimp-sync/build-config.json | 2 +- opensciencegrid/osgconnect-report/build-config.json | 2 +- opensciencegrid/ospool-static-registry/build-config.json | 2 +- opensciencegrid/s3-backup/build-config.json | 2 +- opensciencegrid/sssd/build-config.json | 2 +- opensciencegrid/stompclt/build-config.json | 2 +- opensciencegrid/svn-to-git/build-config.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/opensciencegrid/access-amie/build-config.json b/opensciencegrid/access-amie/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/access-amie/build-config.json +++ b/opensciencegrid/access-amie/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/central-syslog/build-config.json b/opensciencegrid/central-syslog/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/central-syslog/build-config.json +++ b/opensciencegrid/central-syslog/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/contact-sync/build-config.json b/opensciencegrid/contact-sync/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/contact-sync/build-config.json +++ b/opensciencegrid/contact-sync/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/default-build-config.json b/opensciencegrid/default-build-config.json index 78b018b1..66ed49ea 100644 --- a/opensciencegrid/default-build-config.json +++ b/opensciencegrid/default-build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["development", "testing", "release"] } diff --git a/opensciencegrid/gracc-apel/build-config.json b/opensciencegrid/gracc-apel/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/gracc-apel/build-config.json +++ b/opensciencegrid/gracc-apel/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/koji-builder/build-config.json b/opensciencegrid/koji-builder/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/koji-builder/build-config.json +++ b/opensciencegrid/koji-builder/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/logrotate/build-config.json b/opensciencegrid/logrotate/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/logrotate/build-config.json +++ b/opensciencegrid/logrotate/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/mailchimp-sync/build-config.json b/opensciencegrid/mailchimp-sync/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/mailchimp-sync/build-config.json +++ b/opensciencegrid/mailchimp-sync/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/osgconnect-report/build-config.json b/opensciencegrid/osgconnect-report/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/osgconnect-report/build-config.json +++ b/opensciencegrid/osgconnect-report/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/ospool-static-registry/build-config.json b/opensciencegrid/ospool-static-registry/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/ospool-static-registry/build-config.json +++ b/opensciencegrid/ospool-static-registry/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/s3-backup/build-config.json b/opensciencegrid/s3-backup/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/s3-backup/build-config.json +++ b/opensciencegrid/s3-backup/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/sssd/build-config.json b/opensciencegrid/sssd/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/sssd/build-config.json +++ b/opensciencegrid/sssd/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/stompclt/build-config.json b/opensciencegrid/stompclt/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/stompclt/build-config.json +++ b/opensciencegrid/stompclt/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] } diff --git a/opensciencegrid/svn-to-git/build-config.json b/opensciencegrid/svn-to-git/build-config.json index 10ad38e8..781ae34c 100644 --- a/opensciencegrid/svn-to-git/build-config.json +++ b/opensciencegrid/svn-to-git/build-config.json @@ -2,6 +2,6 @@ "standard_build": true, "repo_build": false, "base_os": ["el9"], - "osg_series": ["23"], + "osg_series": ["23", "24"], "base_repo": ["release"] }