PR#540: Let pungi make all comps files during compose - pungi-fedora

		`@@ -16,8 +16,6 @@`
		`SHORT="Fedora-Cloud"`
		`RELEASE="27"`
		`RELEASE_TITLE="27"`
		`- COMPSFILE="comps-f27.xml"`
		- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"`
		`FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`
		`RSYNCPREFIX="sudo -u ftpsync"`
		`@@ -40,14 +38,6 @@`
		`. ./releng/scripts/fedmsg-functions.sh`
		`# Announce that we are starting, even though we don't know the compose_id yet..`
		`send_fedmsg "${fedmsg_json_start}" ${RELEASE} start`
		`- pushd $TMPDIR`
		`- git clone https://pagure.io/fedora-comps.git && {`
		`- pushd fedora-comps`
		`- make "${COMPSFILE}"`
		`- cp "${COMPSFILE}" $DEST/`
		`- popd`
		`- }`
		`- popd`
		`CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"`
		`if [ -z "$COMPOSE_ID" ]; then`
		`CMD="$CMD --target-dir=$TARGET_DIR"`

docker-nightly.sh

file modified

-10

		`@@ -15,8 +15,6 @@`
		`SHORT="Fedora-Docker"`
		`RELEASE="27"`
		`RELEASE_TITLE="27"`
		`- COMPSFILE="comps-f27.xml"`
		- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"`
		`FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`
		`RSYNCPREFIX="sudo -u ftpsync"`
		`@@ -39,14 +37,6 @@`
		`. ./releng/scripts/fedmsg-functions.sh`
		`# Announce that we are starting...`
		`send_fedmsg "${fedmsg_json_start}" ${RELEASE} start`
		`- pushd $TMPDIR`
		`- git clone https://pagure.io/fedora-comps.git && {`
		`- pushd fedora-comps`
		`- make "${COMPSFILE}"`
		`- cp "${COMPSFILE}" $DEST/`
		`- popd`
		`- }`
		`- popd`
		`CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"`
		`if [ -z "$COMPOSE_ID" ]; then`
		`CMD="$CMD --target-dir=$TARGET_DIR"`

fedora-atomic.conf

file modified

+7 -6

		`@@ -16,12 +16,13 @@`
		`}`
		`})`
		`]`
		`- comps_file = 'comps-f26.xml' #{`
		`- # 'scm': 'git',`
		`- # 'repo': 'git://git.fedorahosted.org/git/comps.git',`
		`- # 'branch': None, # defaults to cvs/HEAD or git/master`
		`- # 'file': 'comps-f23.xml',`
		`- #}`
		`+ comps_file = {`
		`+ 'scm': 'git',`
		`+ 'repo': 'https://pagure.io/fedora-comps.git',`
		`+ 'branch': 'master',`
		`+ 'file': 'comps-f27.xml',`
		`+ 'command': 'make comps-f27.xml'`
		`+ }`
		`variants_file='variants-fedora.xml'`
		`sigkeys = ['64DAB85D'] # None = unsigned`
		`# limit tree architectures`

fedora-cloud.conf

file modified

+7 -6

		`@@ -5,12 +5,13 @@`
		`release_is_layered = False`
		`# GENERAL SETTINGS`
		`bootable = False`
		`- comps_file = 'comps-f26.xml' #{`
		`- # 'scm': 'git',`
		`- # 'repo': 'git://git.fedorahosted.org/git/comps.git',`
		`- # 'branch': None, # defaults to cvs/HEAD or git/master`
		`- # 'file': 'comps-f23.xml',`
		`- #}`
		`+ comps_file = {`
		`+ 'scm': 'git',`
		`+ 'repo': 'https://pagure.io/fedora-comps.git',`
		`+ 'branch': 'master',`
		`+ 'file': 'comps-f27.xml',`
		`+ 'command': 'make comps-f27.xml'`
		`+ }`
		`variants_file='variants-fedora.xml'`
		`sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned`
		`# limit tree architectures`

fedora-container.conf

file modified

+7 -6

		`@@ -5,12 +5,13 @@`
		`release_is_layered = False`
		`# GENERAL SETTINGS`
		`bootable = False`
		`- comps_file = 'comps-f29.xml' #{`
		`- # 'scm': 'git',`
		`- # 'repo': 'git://git.fedorahosted.org/git/comps.git',`
		`- # 'branch': None, # defaults to cvs/HEAD or git/master`
		`- # 'file': 'comps-f23.xml',`
		`- #}`
		`+ comps_file = {`
		`+ 'scm': 'git',`
		`+ 'repo': 'https://pagure.io/fedora-comps.git',`
		`+ 'branch': 'master',`
		`+ 'file': 'comps-f27.xml',`
		`+ 'command': 'make comps-f27.xml'`
		`+ }`
		`variants_file='variants-fedora.xml'`
		`sigkeys = ['FDB19C98', 'E372E838'] # None = unsigned`
		`# limit tree architectures`

nightly-dnf.sh

file modified

-9

		`@@ -8,15 +8,6 @@`
		`CONFIG=fedora-dnf.conf`
		`TARGET_DIR=/mnt/koji/compose/rawhide-dnf`
		`DATE=$(date +%Y%m%d)`
		`- COMPSDIR=$(mktemp -d "/tmp/rawhide-dnf.$DATE.XXXX")`
		`- COMPSFILE=comps-rawhide.xml`
		`-`
		`- # Clone comps repo, create comps file for rawhide and copy it into current`
		`- # directory.`
		`- git clone https://pagure.io/fedora-comps.git "$COMPSDIR"`
		`- make -C "$COMPSDIR" "$COMPSFILE"`
		`- cp "$COMPSDIR/$COMPSFILE" "$(pwd)/"`
		`- rm -rf "$COMPSDIR"`

		`# Pick yum-based compose to replicate: the one from the same day should do.`
		`YUM_COMPOSE=/mnt/koji/compose/rawhide/Fedora-Rawhide-$DATE.n.0`

nightly.sh

file modified

-9

		`@@ -48,15 +48,6 @@`
		`fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")`
		`send_fedmsg "${fedmsg_json_start}" ${RELEASE} start`

		`- #pushd $TMPDIR`
		`- #git clone https://pagure.io/fedora-comps.git && {`
		`- # pushd fedora-comps`
		`- # make "${COMPSFILE}"`
		`- # cp "${COMPSFILE}" $DEST/`
		`- # popd`
		`- #}`
		`- #popd`
		`-`
		`./releng/scripts/block_retired.py --profile compose_koji`
		`./releng/scripts/block_retired.py --profile compose_koji --namespace=container`

twoweek-nightly.sh

file modified

-10

		`@@ -15,8 +15,6 @@`
		`SHORT="Fedora-Atomic"`
		`RELEASE="27"`
		`RELEASE_TITLE="27"`
		`- COMPSFILE="comps-f27.xml"`
		- TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
		`TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"`
		`FROM="Fedora Branched Report <rawhide@fedoraproject.org>"`
		`RSYNCPREFIX="sudo -u ftpsync"`
		`@@ -40,14 +38,6 @@`
		`. ./releng/scripts/fedmsg-functions.sh`
		`# Announce that we are starting...`
		`send_fedmsg "${fedmsg_json_start}" ${RELEASE} start`
		`- pushd $TMPDIR`
		`- git clone https://pagure.io/fedora-comps.git && {`
		`- pushd fedora-comps`
		`- make "${COMPSFILE}"`
		`- cp "${COMPSFILE}" $DEST/`
		`- popd`
		`- }`
		`- popd`
		`CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"`
		`if [ -z "$COMPOSE_ID" ]; then`
		`CMD="$CMD --target-dir=$TARGET_DIR"`

kellin commented 6 years ago

allow pungi to create comps files for atomic, container, dnf, and cloud
remove commented out comp file relics in nightly shell script

ausil commented 6 years ago

comps files in master should be comps-f29.xml

kellin commented 6 years ago

@ausil - I had a conversation with @mohanboddu and still have questions.

It seems inefficient/confusing to have the master branch have both comps-rawhide which also has a manual update to point at a specific comps XML file.

Why not have master always have all files be the comps file for rawhide and then, when we branch and make a new rawhide, we have everything we need in the branch and update the master branch to be the comps file for the new rawhide.

is there a specific reason we need to keep this comps-rawhide file copy mechanic in place inside the makefile?

ausil commented 6 years ago

@kellin comps-rawhide.xml should be used universally for rawhide. it is not currently in this request