The TARGET_DIR values in just these few nightly scripts have
trailing slashes. They shouldn't, it'll lead to double slashes
in all the places that use TARGET_DIR as they expect it not to
have one.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
We set $DESTDIR in all these scripts, but then use its value
several times without just...using it. Let's use it!
Signed-off-by: Adam Williamson <awilliam@redhat.com>
For fedmsg_meta we have to provide a 'link'. At present we do
this with a rather large and icky pile of conditionals which
doesn't work properly. It's much simpler to figure out the URL
in the compose script and emit it in the fedmsg, then meta can
just...use it. For older fedmsgs we'll just point to the base
kojipkgs location for the link.
For synced composes, we use the synced URL on dl (this matches
what the meta stuff tried to do before). For non-synced composes
we just use the kojipkgs location.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
The secondary arches were failing because they needed:
https://kojipkgs.fedoraproject.org/pub/fedora-secondary/updates/27/$arch/
It's easier for us to use the pungi compose location urls rather than
create separate image_build sections for the secondary architectures.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Also note the change of the url for the "release day" install tree
/yum repository. We use the pungi locations rather then the public
urls because we don't have to account for primary vs secondary
architectures in the URL.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Switch to the f27-atomic-host-installer tag. This tag takes the
place of the f27-atomic tag and is used to tag new versions of
packages that we want in the installer ISO for Atomic Host.
See https://pagure.io/releng/issue/7100
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
This applies the same changes I recently submitted for the
nightly compose scripts to nightly-modular.sh on the 27 branch,
which is used for the Fedora-Modular 27 nightly composes. So
it makes that script include the shortname in fedmsgs and
simplifies the release variables etc. just as for the other
scripts.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
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>
The various post-release composes - two-week Atomic, Cloud, and
Docker - all send out identical fedmsgs. The other commits in
this PR at least ensure the fedmsgs sent after the compose is
done will have a `compose_id` key, allowing disambiguation that
way, but fedmsgs sent *before* the compose is done cannot be
told apart.
This should solve that, without inventing new message topics:
we add a `short` key to the message content which specifies the
'shortname' of the compose (e.g. Fedora-Atomic), which is how
we distinguish these composes from each other.
We also remove a bunch of unused variables from these files,
and revise the release-related variables as explained for the
master branch in #485: `$DIST`, `$BRANCH` and `$BRANCHED` are
all replaced by `$RELEASE` and `$RELEASE_TITLE`.
This does duplicate the value from the pungi config file, but
I'm not sure it's worth figuring out a bash-y way to parse the
value out of the config file just to remove this duplication.
And we already effectively did this when discovering
`OLDCOMPOSE_ID` and `NEWCOMPOSE_ID`, as the path used there is
dependent upon the shortname; to avoid extra duplication, I've
changed those to use `$SHORT-$RELEASE_TITLE`.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
We don't actually rsync anything for these composes, so it is
wrong to send out a fedmsg saying that we're about to rsync
something.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
These changes bring the post-release compose scripts into line
with the pre-release ones in a couple of ways. Firstly, they
should now include the compose ID in fedmsgs sent after the
compose completes. Secondly, they will skip all post-compose
tasks (rsyncing and sending 'compose.complete' fedmsgs, and
sending out mail reports although that's commented out anyway)
when the compose fails. As part of this, we correct the
NEWCOMPOSE_ID discovery for these composes.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
Replaces https://pagure.io/pungi-fedora/pull-request/467
"I've revived the system-tools module (for the time being at least), to include mlocate and screen. Please add it to the modular compose."
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
This pulls all packages that were behind F27 GA up to it.
Resolves: rhbz#1510669
Resolves: rhbz#1510671
Resolves: rhbz#1512540
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
