As an earlier commit did for the primary rsync target location,
define variables for the alt and secondary target locations for
nightly composes.
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 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>
We have a release now, so we can revert this commit and start
blocking retired packages
This reverts commit 35bc52d14b.
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
- change comps_file setting in the fedora.conf to use the new scm_dict
type from the latest pungi release
- remove the make step from the nightly shell script
Signed-off-by: Robert Marshall <rmarshall@redhat.com>
Images should include signed bits, so we need to block the compose until
the commit is signed.
Related: https://pagure.io/pungi/issue/650
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This adds pruning for atomic workstation. We don't yet rsync atomic
workstation out like we do for atomic host. I'm not sure why but didn't
want to add that as part of this commit.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Instead of having to add the `--treename` argument after each branching,
let the script compute it automatically.
Relates: https://pagure.io/pungi-fedora/issue/350
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
The nightly scripts try to send an announcement about compose starting.
As this happens before Pungi even started, the compose ID is not known
and can not be included in the message. The message about starting rsync
sent later will contain the ID correctly.
Without the json defined there is a traceback in the cron output, but
the errors are not logged anywhere else (but don't actually block
anything in the compose process).
Relates: https://pagure.io/pungi/issue/698
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
Fedora Atomic WG has decided to move from the "docker" namespace to
the "container" namespace for the sake of making it more generic in
order to target all OCI Compliant container runtimes instead of
a specific implementation. This update changes what is necessary for
to the base image metadata as well as add a transitional second call
to handle both the docker and container namespace for block_retired.
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Need to have an extra call to the block_retired.py releng script in
order to also handle the docker namespace of "packages" from pkgdb
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
This will copy source packages as well when splitting the compose. All
stuff going to /pub/fedora will have sources.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
aarch64 and i386 to fedora-secondary
armhfp and x86_64 to alt for Cloud and Labs
everything else to /pub/fedora
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This requires compose-utils >= 0.1.7.
Currently only primary architectures are composed based on this config.
Once other arches are added, they can be filtered with `--arch` option.
To debug what will happen when the command is run, add `--dry-run`. It
will print the exact rsync commands that would be used. Appending `--
--dry-run` at the end of the command will pass the option to rsync and
give different debugging information.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
the rm -rf is needed to clean up the directories -delete gives us
find: cannot delete '/mnt/koji/compose/rawhide/Fedora-Rawhide-20160512.n.0/compose': Directory not empty
find: cannot delete '/mnt/koji/compose/rawhide/Fedora-Rawhide-20160512.n.0/logs': Directory not empty
Revert "Use -delete instead of -exec rm it's quicker because it doesn't fork for every file"
This reverts commit 1b80cae931.
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
