pungi-fedora/nightly-modular.sh

106 lines
4.2 KiB
Bash
Raw Normal View History

#!/bin/sh
#set -x
export LC_ALL=C
CONFIG="fedora-modular.conf"
TARGET_DIR="/mnt/koji/compose/"
#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`
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
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)
# 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
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES"
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 "$@"
if [ "$?" != "0" ]; then
exit 1
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)
SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-Modular.*-||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")
# Set this to use later for a few items include depcheck
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
compose-changelog -p $TARGET_DIR/$NEWCOMPOSE_ID/logs/ $TARGET_DIR/$OLDCOMPOSE_ID/ $TARGET_DIR/$NEWCOMPOSE_ID/
# 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"
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"
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
# 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/modular/development/$RELEASE ]; then
mkdir /pub/fedora/linux/modular/development/$RELEASE
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --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/modular/development/$RELEASE/ \
--variant Server \
--exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch=aarch64 --arch=ppc64 --arch=ppc64le --arch=s390x --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/modular/development/$RELEASE/ \
--variant Server \
--delete-after
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
$RSYNCPREFIX rm /pub/fedora/linux/modular/development/$RELEASE/.composeinfo
$RSYNCPREFIX ./releng/scripts/build_composeinfo /pub/fedora/linux/modular/development/$RELEASE/ --name "$NEWCOMPOSE_ID"
# 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
# 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
# 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'
for tomail in $TOMAIL ; do
cat $TARGET_DIR/$NEWCOMPOSE_ID/logs/*verbose | \
mutt -e "set from=\"$FROM\"" -e 'set envelope_from=yes' -s "$SUBJECT" $tomail
done
# 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 {} \;