Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

SOFTWARE-5960: OSG 24 koji updates #10

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

SOFTWARE-5960: OSG 24 koji updates #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f427bc2
Add empty/contrib build targets, seperate script for empty/contrib
mwestphall Aug 16, 2024
f919356
add aarch64 to supported arches for osg-24
mwestphall Aug 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 60 additions & 0 deletions koji/osg-24/create-24-empty-contrib-tags-etc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
#!/bin/bash
set -eu

# create koji tags/targets/etc for empty and contrib in the new osg series

SERIES=24

build_tag_extras=(-x rebuild_srpm=False -x mock.yum.module_hotfixes=1)


ask_yn () {
echo -n "$@"
while read -r; do
case $REPLY in
[Yy]*) return 0 ;;
[Nn]*) return 1 ;;
*) echo "Enter yes or no" ;;
esac
done
return 2
}


if ask_yn "Dry run? "; then
koji="echo osg-koji"
else
koji="osg-koji"
set -x
fi


for REPO in empty contrib; do
for EL in el8 el9; do
PREFIX=osg-$SERIES-$EL-$REPO

### new tags ###

$koji add-tag --arches=x86_64,aarch64 "${build_tag_extras[@]}" $PREFIX-build
$koji add-tag --arches=x86_64,aarch64 $PREFIX

### tag inheritance ###

$koji add-tag-inheritance --priority=2 --noconfig $PREFIX osg-$EL
$koji add-tag-inheritance --priority=1 $PREFIX dist-$EL

$koji add-tag-inheritance --priority=1 $PREFIX-build $PREFIX
$koji add-tag-inheritance --priority=2 $PREFIX-build dist-$EL-build

### build targets ###

$koji add-target $PREFIX $PREFIX-build $PREFIX

### auto-generated ("minefield-style") repos
done
done

echo "IF YOU HAVE CREATED NEW BUILD TAGS, BE SURE TO EDIT"
echo "/etc/koji-hub/plugins/sign.conf AND SET UP PACKAGE SIGNING FOR THE NEW BUILD"
echo "TAGS."

6 changes: 3 additions & 3 deletions koji/osg-24/create-24-internal-tags-etc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,9 @@ do_koji () {

### NEW TAGS
# OPTIONS TAG
$koji add-tag --arches=x86_64 "${BUILD_TAG_EXTRAS[@]}" ${prefix}-build
$koji add-tag --arches=x86_64 ${prefix}-development
$koji add-tag --arches=x86_64 ${prefix}-release
$koji add-tag --arches=x86_64,aarch64 "${BUILD_TAG_EXTRAS[@]}" ${prefix}-build
$koji add-tag --arches=x86_64,aarch64 ${prefix}-development
$koji add-tag --arches=x86_64,aarch64 ${prefix}-release

### TAG INHERITANCE
# PRIORITY CHILD PARENT
Expand Down
18 changes: 6 additions & 12 deletions koji/osg-24/create-24-main-tags-etc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,27 @@ for EL in el8 el9; do

### new tags ###

$koji add-tag --arches=x86_64 "${build_tag_extras[@]}" $PREFIX-build
$koji add-tag --arches=x86_64 $PREFIX_NO_MAIN-contrib
$koji add-tag --arches=x86_64 $PREFIX-development
$koji add-tag --arches=x86_64 $PREFIX_NO_MAIN-empty
$koji add-tag --arches=x86_64 $PREFIX-prerelease
$koji add-tag --arches=x86_64 $PREFIX-release
$koji add-tag --arches=x86_64 $PREFIX-testing
$koji add-tag --arches=x86_64,aarch64 "${build_tag_extras[@]}" $PREFIX-build
$koji add-tag --arches=x86_64,aarch64 $PREFIX-development
$koji add-tag --arches=x86_64,aarch64 $PREFIX-prerelease
$koji add-tag --arches=x86_64,aarch64 $PREFIX-release
$koji add-tag --arches=x86_64,aarch64 $PREFIX-testing

$koji add-tag --arches=x86_64 $PREFIX-bootstrap
$koji add-tag --arches=x86_64,aarch64 $PREFIX-bootstrap

### tag permissions ###

$koji edit-tag --perm=release-team --lock $PREFIX-release

### tag inheritance ###

$koji add-tag-inheritance --priority=2 --noconfig $PREFIX_NO_MAIN-contrib osg-$EL
$koji add-tag-inheritance --priority=2 --noconfig $PREFIX_NO_MAIN-empty osg-$EL
$koji add-tag-inheritance --priority=1 --noconfig $PREFIX-prerelease osg-$EL

$koji add-tag-inheritance --priority=0 $PREFIX-build $PREFIX-development
$koji add-tag-inheritance --priority=2 $PREFIX-build osg-$EL-internal
$koji add-tag-inheritance --priority=4 $PREFIX-build $PREFIX-bootstrap
$koji add-tag-inheritance --priority=10 $PREFIX-build dist-$EL-build
$koji add-tag-inheritance --priority=1 $PREFIX_NO_MAIN-contrib dist-$EL
$koji add-tag-inheritance --priority=1 $PREFIX-development $PREFIX-testing
$koji add-tag-inheritance --priority=0 $PREFIX_NO_MAIN-empty dist-$EL
$koji add-tag-inheritance --priority=0 $PREFIX-release osg-$EL
$koji add-tag-inheritance --priority=0 $PREFIX-testing $PREFIX-release

Expand Down
12 changes: 6 additions & 6 deletions koji/osg-24/create-24-upcoming-tags-etc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ do_koji () {

### NEW TAGS
# OPTIONS TAG
$koji add-tag --arches=x86_64 "${BUILD_TAG_EXTRAS[@]}" ${prefix}-build
$koji add-tag --arches=x86_64 ${prefix}-development
$koji add-tag --arches=x86_64 ${prefix}-prerelease
$koji add-tag --arches=x86_64 ${prefix}-release
$koji add-tag --arches=x86_64,aarch64 "${BUILD_TAG_EXTRAS[@]}" ${prefix}-build
$koji add-tag --arches=x86_64,aarch64 ${prefix}-development
$koji add-tag --arches=x86_64,aarch64 ${prefix}-prerelease
$koji add-tag --arches=x86_64,aarch64 ${prefix}-release
$koji edit-tag --perm=release-team --lock ${prefix}-release
$koji add-tag --arches=x86_64 ${prefix}-testing
$koji add-tag --arches=x86_64,aarch64 ${prefix}-testing

if $create_bootstrap; then
$koji add-tag --arches=x86_64 ${prefix}-bootstrap
$koji add-tag --arches=x86_64,aarch64 ${prefix}-bootstrap
fi

### TAG INHERITANCE
Expand Down