Merge pull request #607 from htcondor/V23-HTCONDOR-2544-package-condo…

…r_ce_upgrade_check HTCONDOR-2544: Update CE build and test to use OSG 23.
htcondor · Jul 19, 2024 · 640b988 · 640b988
2 parents 2bdfa1a + bb19b87
commit 640b988
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/build_and_test_rpms.yml b/.github/workflows/build_and_test_rpms.yml
@@ -12,10 +12,10 @@ jobs:
           - almalinux:9
         target_env:
           - uw_build
-          - osg-3.6
-          - osg-3.6-testing
-          - osg-3.6-upcoming
-          - osg-3.6-upcoming-testing
+          - osg-23
+          - osg-23-testing
+          - osg-23-upcoming
+          - osg-23-upcoming-testing
     steps:
       - uses: actions/checkout@v3
         with:

diff --git a/tests/build_rpms.sh b/tests/build_rpms.sh
@@ -62,6 +62,7 @@ yum -y install \
 
 if [[ $BUILD_ENV == osg* ]]; then
     OSG_SERIES=$(cut -d- -f2 <<< "$BUILD_ENV")
+    OSG_SERIES="${OSG_SERIES}-main"
     yum install -y https://repo.opensciencegrid.org/osg/${OSG_SERIES}/osg-${OSG_SERIES}-el${OS_VERSION}-release-latest.rpm
 else
     # This is currently tracking the 10.x feature release.