2015-05-29 20:04:00 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
|
|
export LC_ALL=C
|
|
|
|
|
|
|
|
CONFIG="fedora.conf"
|
2015-07-07 15:14:06 +00:00
|
|
|
TARGET_DIR="/mnt/koji/compose/rawhide"
|
2015-05-29 20:04:00 +00:00
|
|
|
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
|
|
|
NIGHTLY="--nightly"
|
2015-07-24 18:09:00 +00:00
|
|
|
SKIP_PHASES="--skip-phase=productimg"
|
2015-12-08 15:15:29 +00:00
|
|
|
DEST=$(pwd)
|
|
|
|
DATE=$(date "+%Y%m%d")
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
SHORT="Fedora"
|
|
|
|
RELEASE="rawhide"
|
|
|
|
RELEASE_TITLE="Rawhide"
|
2016-02-23 22:34:37 +00:00
|
|
|
COMPSFILE="comps-rawhide.xml"
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
2016-02-23 22:34:37 +00:00
|
|
|
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
|
|
|
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
|
|
|
|
RSYNCPREFIX="sudo -u ftpsync"
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
ATOMIC=$(mktemp -d /tmp/atomic.${RELEASE}.$DATE.XXXX)
|
|
|
|
ATOMICHOSTREPO="/mnt/koji/compose/atomic/$RELEASE/"
|
|
|
|
ATOMICWSREPO="/mnt/koji/compose/ostree/$RELEASE/"
|
|
|
|
ATOMICHOSTDEST="/mnt/koji/atomic/$RELEASE/"
|
|
|
|
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
2015-05-29 20:04:00 +00:00
|
|
|
# uncomment and edit for resuming a failed compose
|
|
|
|
#COMPOSE_ID="Fedora-23-20150530.n.0"
|
|
|
|
|
2016-03-14 12:35:14 +00:00
|
|
|
# assume a releng dir is a git checkout of the releng repo
|
2016-02-29 22:22:42 +00:00
|
|
|
# if it does not exist clone it
|
|
|
|
if [ -d releng ]; then
|
|
|
|
pushd releng
|
|
|
|
git pull --rebase
|
|
|
|
popd
|
|
|
|
else
|
|
|
|
git clone https://pagure.io/releng.git
|
|
|
|
fi
|
|
|
|
|
2016-03-03 19:05:48 +00:00
|
|
|
# Set up our fedmsg function, using the releng repo definition
|
|
|
|
FEDMSG_MODNAME="compose"
|
|
|
|
FEDMSG_CERTPREFIX="releng"
|
|
|
|
. ./releng/scripts/fedmsg-functions.sh
|
|
|
|
|
2016-04-25 16:11:45 +00:00
|
|
|
# Announce that we are starting, even though we don't know the compose_id yet..
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
|
|
|
|
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
|
2016-03-03 19:05:48 +00:00
|
|
|
|
2017-11-13 21:28:19 +00:00
|
|
|
#pushd $TMPDIR
|
|
|
|
#git clone https://pagure.io/fedora-comps.git && {
|
|
|
|
# pushd fedora-comps
|
|
|
|
# make "${COMPSFILE}"
|
|
|
|
# cp "${COMPSFILE}" $DEST/
|
|
|
|
# popd
|
|
|
|
#}
|
|
|
|
#popd
|
2015-12-08 15:15:29 +00:00
|
|
|
|
2017-11-15 15:46:23 +00:00
|
|
|
./releng/scripts/block_retired.py --profile compose_koji
|
2017-09-28 21:13:41 +00:00
|
|
|
./releng/scripts/block_retired.py --profile compose_koji --namespace=docker
|
|
|
|
./releng/scripts/block_retired.py --profile compose_koji --namespace=container
|
2016-02-23 22:34:37 +00:00
|
|
|
|
2017-09-21 05:52:33 +00:00
|
|
|
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --notification-script=pungi-wait-for-signed-ostree-handler --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
|
2015-07-24 18:09:00 +00:00
|
|
|
|
2015-05-29 20:04:00 +00:00
|
|
|
if [ -z "$COMPOSE_ID" ]; then
|
|
|
|
CMD="$CMD --target-dir=$TARGET_DIR"
|
|
|
|
else
|
2015-07-24 18:09:00 +00:00
|
|
|
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
2015-05-29 20:04:00 +00:00
|
|
|
fi
|
|
|
|
|
2015-07-24 18:09:00 +00:00
|
|
|
time $CMD "$@"
|
2016-08-12 07:50:17 +00:00
|
|
|
if [ "$?" != "0" ]; then
|
|
|
|
exit 1
|
2016-02-29 04:20:37 +00:00
|
|
|
fi
|
|
|
|
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
2016-02-27 03:18:42 +00:00
|
|
|
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID")
|
|
|
|
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID")
|
2016-02-23 22:34:37 +00:00
|
|
|
|
2016-04-27 15:53:24 +00:00
|
|
|
# Set this to use later for a few items include depcheck
|
|
|
|
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
|
|
|
|
2016-02-23 22:34:37 +00:00
|
|
|
compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
|
2017-09-11 09:10:34 +00:00
|
|
|
# Figure out a version for broken deps e-mail that goes to package maintainers.
|
|
|
|
# In Rawhide it's just rawhide, for branched versions we prepend F- to the number.
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
if [ "$RELEASE" = "rawhide" ]; then
|
|
|
|
TREENAME="$RELEASE"
|
2017-09-11 09:10:34 +00:00
|
|
|
else
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
TREENAME="F-$RELEASE"
|
2017-09-11 09:10:34 +00:00
|
|
|
fi
|
|
|
|
/usr/share/mash/spam-o-matic --treename="$TREENAME" "$DESTDIR/compose/Everything/" >"$DESTDIR/logs/depcheck"
|
2016-02-29 22:22:42 +00:00
|
|
|
|
|
|
|
[ -z "$ARCH" ] && {
|
2017-08-21 20:27:43 +00:00
|
|
|
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
|
2016-02-29 22:22:42 +00:00
|
|
|
}
|
2016-02-23 22:34:37 +00:00
|
|
|
|
2017-09-15 12:40:17 +00:00
|
|
|
# prune atomic host and atomic workstation repos
|
2017-09-15 12:37:56 +00:00
|
|
|
ostree prune --repo=$ATOMICHOSTREPO --keep-younger-than="14 days ago" --refs-only
|
2017-09-15 12:40:17 +00:00
|
|
|
ostree prune --repo=$ATOMICWSREPO --keep-younger-than="14 days ago" --refs-only
|
2016-05-17 00:37:41 +00:00
|
|
|
|
2016-03-03 18:04:11 +00:00
|
|
|
# Tell interested persons that the rsync is starting (zomg!)
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
|
2016-02-27 03:08:35 +00:00
|
|
|
|
2016-09-14 03:09:23 +00:00
|
|
|
# Sync the content to /pub/fedora
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
if [ ! -d /pub/fedora/linux/development/$RELEASE ]; then
|
|
|
|
mkdir /pub/fedora/linux/development/$RELEASE
|
2017-03-04 17:42:58 +00:00
|
|
|
fi
|
2016-12-14 16:36:49 +00:00
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$RELEASE/ \
|
2016-08-18 08:21:05 +00:00
|
|
|
--variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
--link-dest=/pub/fedora/linux/development/$RELEASE/Everything --exclude=repodata
|
2016-12-14 16:36:49 +00:00
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora/linux/development/$RELEASE/ \
|
2016-08-18 08:21:05 +00:00
|
|
|
--variant Everything --variant Atomic --variant CloudImages --variant Docker --variant Server --variant Spins --variant Workstation \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
--link-dest=/pub/fedora/linux/development/$RELEASE/Everything --delete-after
|
|
|
|
$RSYNCPREFIX rm /pub/fedora/linux/development/$RELEASE/.composeinfo
|
|
|
|
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora/linux/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
|
2016-08-18 08:21:05 +00:00
|
|
|
|
2016-09-14 03:09:23 +00:00
|
|
|
# Sync the content to /pub/alt
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
if [ ! -d /pub/alt/development/$RELEASE ]; then
|
|
|
|
mkdir /pub/alt/development/$RELEASE
|
2017-03-04 17:42:58 +00:00
|
|
|
fi
|
2016-09-14 03:09:23 +00:00
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$RELEASE/ \
|
2016-08-18 08:21:05 +00:00
|
|
|
--variant Cloud --variant Labs \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
--link-dest=/pub/fedora/linux/development/$RELEASE/Everything/ --exclude=repodata
|
2016-09-14 03:09:23 +00:00
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/alt/development/$RELEASE/ \
|
2016-08-18 08:21:05 +00:00
|
|
|
--variant Cloud --variant Labs \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
--link-dest=/pub/fedora/linux/development/$RELEASE/Everything/ --delete-after
|
|
|
|
$RSYNCPREFIX rm /pub/alt/development/$RELEASE/.composeinfo
|
|
|
|
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/alt/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
|
2016-09-14 03:09:23 +00:00
|
|
|
|
|
|
|
# Sync the content to /pub/fedora-secondary
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
if [ ! -d /pub/fedora-secondary/development/$RELEASE ]; then
|
|
|
|
mkdir /pub/fedora-secondary/development/$RELEASE
|
2017-03-04 17:42:58 +00:00
|
|
|
fi
|
2017-08-16 08:05:36 +00:00
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$RELEASE/ \
|
|
|
|
--link-dest=/pub/fedora/linux/development/$RELEASE/Everything/ --exclude=repodata
|
2017-08-16 08:05:36 +00:00
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=i386 --arch=ppc64 --arch=ppc64le --arch=s390x \
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
"$TARGET_DIR/$NEWCOMPOSE_ID" /pub/fedora-secondary/development/$RELEASE/ \
|
|
|
|
--link-dest=/pub/fedora/linux/development/$RELEASE/Everything/ --delete-after
|
|
|
|
$RSYNCPREFIX rm /pub/fedora-secondary/development/$RELEASE/.composeinfo
|
|
|
|
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora-secondary/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
|
2016-08-18 08:21:05 +00:00
|
|
|
|
2017-09-15 12:37:56 +00:00
|
|
|
$RSYNCPREFIX rsync -avhH --delete-after $ATOMICHOSTREPO $ATOMICHOSTDEST
|
2016-02-27 03:08:35 +00:00
|
|
|
|
2016-03-03 18:04:11 +00:00
|
|
|
# Tell interested persons that the rsync is done.
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
|
2016-03-03 18:04:11 +00:00
|
|
|
|
|
|
|
# Tell everyone by fedmsg about the compose
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
|
2016-03-03 18:04:11 +00:00
|
|
|
|
|
|
|
# Tell everyone by email about the compose
|
nightly: include shortname in fedmsgs, clean up version vars
The main point here is to include the compose 'shortname' in
compose fedmsgs, as #484 does for post-release compose types.
While doing this I noticed there's rather a lot of mess and
cruft in the various version-related variables here (and a few
others).
`GIT_BRANCH` variable is never used anywhere any more, so it's
removed.
`BRANCH` was never used anywhere, so it is gone. (It appears
to have been added in a25b08c7 but never used). There seemed
to be no useful distinction between `DIST` and `BRANCHED`, and
both actually seem to be used mainly to specify a release
version. The exception is that `BRANCHED` was set to
"Modular-Bikeshed" in nightly-modular.sh , but there is no
justification for this that I can find, and its only practical
use was as the value of the `branch` key in fedmsgs. So far as
I can figure out, the original purpose of the `branch` key was
for when we sent out `compose.branched.(foo)` fedmsgs - it
was e.g. 'f18' when Branched was Fedora 18. As we now don't
send out `compose.branched` messages any more, but include the
release number in the message topic for Branched messages
(e.g. `compose.27`), this purpose no longer applies. So the
key just doesn't seem to have any particular use at all any
more, and I don't think changing its value will have any real
consequences.
Thus, `BRANCH`, `BRANCHED` and `DIST` are replaced by `RELEASE`
and `RELEASE_TITLE`, which specify the release version. Their
values will be identical for numerical release versions, but
for Rawhide and Bikeshed we need to know both the lower-case
and title-case versions of the name; RELEASE_TITLE is the
title-case version.
We use `$SHORT-$RELEASE_TITLE` to replace several instances
of hardcoding in the scripts (e.g. Fedora-Modular-Bikeshed).
The `ATOMIC`, `ATOMICREPO` and `ATOMICDEST` variables that were
blindly copied from nightly.sh to nightly-modular.sh, but never
actually used in it, are also removed.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-05 01:24:43 +00:00
|
|
|
SUBJECT='Fedora '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
2016-08-12 07:50:17 +00:00
|
|
|
for tomail in $TOMAIL ; do
|
|
|
|
cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose $DESTDIR/logs/depcheck | \
|
|
|
|
mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
|
|
|
done
|
2016-02-23 22:34:37 +00:00
|
|
|
|
2016-02-29 22:22:42 +00:00
|
|
|
for koji in arm ppc s390
|
|
|
|
do
|
|
|
|
if [ "$koji" = "arm" ]; then
|
|
|
|
arches=aarch64
|
|
|
|
elif [ "$koji" = "ppc" ]; then
|
|
|
|
arches=ppc64,ppc64le
|
|
|
|
elif [ "$koji" = "s390" ]; then
|
2017-03-09 17:23:16 +00:00
|
|
|
arches=s390x
|
2016-02-29 22:22:42 +00:00
|
|
|
fi
|
2017-03-09 15:56:33 +00:00
|
|
|
./releng/scripts/srpm-excluded-arch.py -a $arches --path $DESTDIR/compose/Everything/source/tree/Packages/ >$DESTDIR/logs/excludearch-$koji.log
|
2016-02-29 22:22:42 +00:00
|
|
|
done
|
|
|
|
|
2016-05-27 19:00:17 +00:00
|
|
|
find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
|
2016-05-17 00:46:41 +00:00
|
|
|
|