diff --git a/.github/workflows/release-series-builds.yml b/.github/workflows/release-series-builds.yml index 240d8c7..85d6535 100644 --- a/.github/workflows/release-series-builds.yml +++ b/.github/workflows/release-series-builds.yml @@ -66,6 +66,15 @@ jobs: osg_series: - name: '23' os: 'el9' + - name: '24' + os: 'el9' + exclude: + - osg_series: + name: 24 + image: stash-cache + - osg_series: + name: 24 + image: stash-origin runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 @@ -107,6 +116,7 @@ jobs: matrix: repo: ['development', 'testing', 'release'] osg_series: + # TODO build new test suite for osg 24 pelican origin/cache tooling - name: '23' os: 'el9' steps: @@ -177,6 +187,17 @@ jobs: osg_series: - name: '23' os: 'el9' + organization: 'opensciencegrid' + - name: '24' + os: 'el9' + organization: 'osg-htc' + exclude: + - osg_series: + name: 24 + image: stash-cache + - osg_series: + name: 24 + image: stash-origin needs: [make-date-tag, test-stash-cache] runs-on: ubuntu-latest steps: @@ -194,11 +215,16 @@ jobs: REPO: ${{ matrix.repo }} SERIES: ${{ matrix.osg_series.name }} IMAGE: ${{ matrix.image }} + ORGANIZATION: ${{ matrix.osg_series.organization }} TIMESTAMP: ${{ needs.make-date-tag.outputs.dtag }} run: | - docker_repo=opensciencegrid/$IMAGE + docker_repo=$ORGANIZATION/$IMAGE tag_list=() for registry in hub.opensciencegrid.org docker.io; do + # osg-htc org doesn't exist in docker.io + if [[ "$registry" == "docker.io" && "$ORGANIZATION" == "osg-htc" ]]; then + continue + fi for image_tag in "$SERIES-$REPO" "$SERIES-$REPO-$TIMESTAMP"; do tag_list+=("$registry/$docker_repo":"$image_tag") done