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 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>
The script gets a label as a command line argument, and this is manually
handled by adding it as `--label=$1` to the pungi-koji command. We
should not add this argument to another time.
This avoid problem with Pungi 4.1.17 which reports an error when seeing
unknown arguments (which were silently ignored before).
Fixes: https://pagure.io/pungi/issue/682
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
