2017-04-06 10:48:35 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
#set -x
|
|
|
|
|
|
|
|
export LC_ALL=C
|
|
|
|
|
|
|
|
CONFIG="fedora-modular.conf"
|
2018-01-26 13:23:31 +00:00
|
|
|
TARGET_DIR="/mnt/koji/compose"
|
2017-04-06 10:48:35 +00:00
|
|
|
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
|
|
|
|
NIGHTLY="--nightly"
|
|
|
|
SKIP_PHASES="--skip-phase=productimg"
|
|
|
|
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-Modular"
|
|
|
|
RELEASE="bikeshed"
|
|
|
|
RELEASE_TITLE="Bikeshed"
|
|
|
|
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
|
2017-04-06 10:48:35 +00:00
|
|
|
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
|
|
|
|
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
|
|
|
|
RSYNCPREFIX="sudo -u ftpsync"
|
2018-01-25 10:00:52 +00:00
|
|
|
RSYNCTARGET="/pub/fedora/linux/modular/development/$RELEASE"
|
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
|
|
|
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
|
2017-04-06 10:48:35 +00:00
|
|
|
|
|
|
|
# assume a releng dir is a git checkout of the releng repo
|
|
|
|
# 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
|
|
|
|
|
|
|
|
# Set up our fedmsg function, using the releng repo definition
|
|
|
|
FEDMSG_MODNAME="compose"
|
|
|
|
FEDMSG_CERTPREFIX="releng"
|
|
|
|
. ./releng/scripts/fedmsg-functions.sh
|
|
|
|
|
|
|
|
# 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
|
2017-04-06 10:48:35 +00:00
|
|
|
|
2017-08-09 16:04:54 +00:00
|
|
|
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
|
2017-04-06 10:48:35 +00:00
|
|
|
|
|
|
|
if [ -z "$COMPOSE_ID" ]; then
|
|
|
|
CMD="$CMD --target-dir=$TARGET_DIR"
|
|
|
|
else
|
|
|
|
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
|
|
|
|
fi
|
|
|
|
|
|
|
|
time $CMD "$@"
|
Bail after failed compose in nightly-modular.sh
When nightly-modular.sh was added, it wasn't set to check the
exit code from pungi-koji, as nightly.sh does. This was I guess
because it didn't do much after the compose finished at that
time, and the author thought it was OK for the few things it
*did* do to happen on both successful and failed composes.
However, it now does more stuff after compose completion, like
nightly.sh, including trying to generate changelog files and
send out a compose report email. But because the pungi-koji
exit code check is missing, it tries to do these things even
for failed composes. Changelog generation will fail when the
compose failed, and the email that gets sent out will have a
missing compose ID (because NEWCOMPOSE_ID and SHORTCOMPOSE_ID
can't be set properly and will be blank), and will be empty
because the changelog file that's supposed to be read in as the
content of the email isn't there. This is why we are getting
an empty mail with subject "Fedora Modular bikeshed compose
report: changes" every time a compose fails.
So, let's put that check in just like nightly.sh does.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
2017-12-04 22:08:15 +00:00
|
|
|
if [ "$?" != "0" ]; then
|
|
|
|
exit 1
|
|
|
|
fi
|
2017-04-06 10:48:35 +00:00
|
|
|
|
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)
|
2017-04-06 10:48:35 +00:00
|
|
|
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||g')
|
|
|
|
|
2017-10-04 17:01:22 +00:00
|
|
|
# Set this to use later for a few items include depcheck
|
|
|
|
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
|
2018-01-25 10:00:52 +00:00
|
|
|
# Public URL the synced compose will wind up at, we put it in fedmsgs
|
2018-01-25 11:28:54 +00:00
|
|
|
LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
|
2018-01-25 10:00:52 +00:00
|
|
|
# Update fedmsg template
|
|
|
|
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION")
|
|
|
|
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION")
|
2017-10-04 17:01:22 +00:00
|
|
|
|
2018-01-25 11:12:21 +00:00
|
|
|
compose-changelog -p $DESTDIR/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $DESTDIR/
|
2017-10-04 17:01:22 +00:00
|
|
|
# Figure out a version for broken deps e-mail that goes to package maintainers.
|
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
|
|
|
# For Bikeshed it's just bikeshed, for branched versions we prepend F- to the number.
|
|
|
|
if [ "$RELEASE" = "bikeshed" ]; then
|
|
|
|
TREENAME="$RELEASE"
|
2017-10-04 17:01:22 +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-10-04 17:01:22 +00:00
|
|
|
fi
|
|
|
|
/usr/share/mash/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Server/" >"$DESTDIR/logs/depcheck"
|
|
|
|
|
|
|
|
# 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
|
2017-10-04 17:01:22 +00:00
|
|
|
|
|
|
|
# Sync the content to /pub/fedora
|
2018-01-25 10:00:52 +00:00
|
|
|
if [ ! -d "$RSYNCTARGET" ]; then
|
|
|
|
mkdir "$RSYNCTARGET"
|
2017-10-04 17:01:22 +00:00
|
|
|
fi
|
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
|
2018-01-25 11:12:21 +00:00
|
|
|
"$DESTDIR" "$RSYNCTARGET/" \
|
2017-10-04 17:01:22 +00:00
|
|
|
--variant Server \
|
|
|
|
--exclude=repodata
|
|
|
|
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --arch src \
|
2018-01-25 11:12:21 +00:00
|
|
|
"$DESTDIR" "$RSYNCTARGET/" \
|
2017-10-04 17:01:22 +00:00
|
|
|
--variant Server \
|
|
|
|
--delete-after
|
2018-01-25 10:00:52 +00:00
|
|
|
$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
|
|
|
|
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
|
2017-10-04 17:01:22 +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
|
2017-10-04 17:01:22 +00:00
|
|
|
|
2017-04-06 10:48:35 +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
|
2017-04-06 10:48:35 +00:00
|
|
|
|
2017-10-11 16:53:20 +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 Modular '$RELEASE' compose report: '$SHORTCOMPOSE_ID' changes'
|
2017-10-11 16:53:20 +00:00
|
|
|
for tomail in $TOMAIL ; do
|
2018-01-25 11:12:21 +00:00
|
|
|
cat $DESTDIR/logs/*verbose | \
|
2017-10-11 16:53:20 +00:00
|
|
|
mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
|
|
|
|
done
|
|
|
|
|
2017-04-06 10:48:35 +00:00
|
|
|
# Remove old composes older than 14 days
|
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
|
|
|
find $TARGET_DIR/$SHORT-$RELEASE_TITLE* -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
|