This will ensure that the OSTrees get generated on each compose
so that the media created will match the version numbers of the
OSTree inside.
The caveat is that there can be empty commits that do happen.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
We need to stop building repos and install media for the *Cloud* variant
because the only consumers of those repos/install media is the cloud
base images that could easily be built with the Everything repo/install
media. This commit removes the cloud variant (as it was previously
known) and then renames the CloudImages variant to 'Cloud'.
Summary:
- Cloud now becomes an empty variant (no repos, no install media)
- CloudImages variant goes away
- Cloud image builds use Everything repo/install media
- Atomic image builds use Everything install tree
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
In the output we will now put the AtomicHost cloud images under
the AtomicHost/ directory instead of in CloudImages.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Move Atomic to AtomicHost and WorkstationOstree to
AtomicWorkstation. This is mostly to make things align
more with the names of the things we actually put out.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Pulling these packages into Modular content is probably not the right
thing to do. The config should only list variants that get traditional
content.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
Since we now include modular content, we need to tell Pungi where to get
information about them from.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
Some newer subvariants / loadouts were missing from the
substitution list. This updates it, alphabetizes it, corrects
the indentation, and adds a better comment about what it's for.
Note https://pagure.io/koji/pull-request/817 , corresponding
pull request for Koji.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
With Fedora 27, s390x composes (Server and Everything) are
part of primary compose. It will be nice to have atomic, cloud
and docker composes available for s390x too.
Signed-off-by: Sinny Kumari <sinny@redhat.com>
By FESCo decision all Java packages are exempt from multilib.
See: https://pagure.io/fesco/issue/961
Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>
This should cause the compose to contain all the previous content plus a
separate Modular variant with packages specified by list of modules in
variants file.
The final layout of the compose should be like this:
compose/Everything/$arch/os/
compose/Modular/$arch/os/
Relates: https://pagure.io/releng/issue/7227
Signed-off-by: Lubomír Sedlář <lsedlar@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>
This will enable the optimizations landed in
https://github.com/rhinstaller/anaconda/pull/1119
to avoid lots of HTTP requests when installing the cloud images.
Signed-off-by: Colin Walters <walters@verbum.org>
Creating the image requires running lorax. There is however already one
lorax instance being run in the buildinstall phase. When the second one
runs, it overwrites the outputs from first one and people expecting to
boot netinst over PXE are instead getting ostree workstation.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1477916
Relates: https://pagure.io/pungi/issue/695
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
See https://pagure.io/pungi/pull-request/727
Once that is merged, released, and deployed, this change will let us see
New and Fascinating Details about the compose process.
Signed-off-by: Ralph Bean <rbean@redhat.com>
Since not all builds are signed with f28 key yet, we will use f27 key
also and once everything is signed with f28 then we will remove f27 key
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
It's failing on ppc64le, we're at 87% on x86_64. There's really no reason not to
bump this to give ourselves some room at least on 64 bit architectures.
Signed-off-by: Colin Walters <walters@verbum.org>
To match up with the Addition of Container Minimal and the renaming
of dist-git namespace to Container, rename the Docker Variant to
Container
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
Currently the l10n support is moved to a single calligra-l10n package
(which is a subpackage of calligra itself) as opposed to previously
separate calligra-l10n package with a separate subpackage for each
language (which is now retired).
Due `greedy_method = "build"` the l10n subpackage will be pulled into
the compose if some package from the same build gets in (i.e. the main
calligra package required by comps).
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
Since we pull from ostree repos it doesn't really make
sense to provide a yum "repo" to the image build in pungi.
Removing it since it could be confusing to have it there.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Add new ostree_install_repo and ostree_update_repo vars so that we
can tell lorax where to pull from during the pungi compose and also
where to configure an installed system to pull from. i.e. where a
user is going to pull from over time.
This is related to https://pagure.io/fedora-lorax-templates/pull-request/19
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
These options used to be required in pungi < 4.1.14, but now they have
default values that happen to be the same as what Fedora uses. No need
to specify them anymore.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
Koji added the ability to set livemedia and image builds to
fail on some arches, the compose configs should be updated to use
that feature and able to identify the blocking artifacts and on what
arches.
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
We have decided [1] that we want to have more meaningful versions
for ostree commits and the resulting images. One way to do this
is to have the ostree version match the version from the compose ID.
Pungi recently [2] gained support for embedding the label from the
compose into the ostree commit version. This change takes advantage
of that work to embed a more meaninful version.
[1] https://pagure.io/atomic-wg/issue/229
[2] https://pagure.io/pungi/pull-request/592
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
For the cloud base image there is no need to override the default
vagrant sync location. /vagrant/ works just fine and is what people
expect.
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
In koji there are ova-options and also factory-parameters.
We can pass ova-options to koji and also factory-parameters
but we can't pass ova-options as a factory-parameter. We just
need to pass in the vagrant_sync_directory as a factory
parameter.
Fixes https://pagure.io/atomic-wg/issue/181
Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
Fix: #168
We didn't explicitly set the branches as master for rawhide which
created issues during branching by missing setting up the branch names.
This makes it easier to identify those branch names.
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
Fixes: #6765
The default size of filesystem provided by lorax is 2GB and the
installtree size is gone up to 2.7GB which is failing to copy files
from installtree to created root filesystem.
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
Fixes: #6765
The default size of filesystem provided by lorax is 2GB and the
installtree size is gone up to 2.7GB which is failing to copy files
from installtree to created root filesystem.
NOTE: Just increased for x86_64 and ppc64le since aarch64 is fine.
Signed-off-by: Mohan Boddu <mboddu@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>
As there is a hard limit for volume id's on isos to be <32 characters,
we have a list of subsitutions that we maintain to make sure that
isos all have volume id's under that size. with the addition of
ppc64le and aarch64 for Atomic host installer the 7 character arch
length pushed us over the limit using AH for Atomic seems the most
logical change to make.
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
For depsolving with YUM this has no effect, but will add the package to
DNF based compose.
YUM is matching the packages against NVR, so the `-*` at the end of the
pattern matches version. DNF-based Pungi is only looking at package
names.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
The previous formatting for docker image metadata was getting
escaped incorrectly when passed to imagefactory. This resolves that.
Fix the license label to be MIT instead of GPLv2.
Fix the bash path
Remove atomic RUN command, it causes build failures and isn't
necessary in the base image.
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Currently, imagefactory's docker plugin will default an older
version of the metadata imager format that is not compatible with
the latest versions of docker. This change tells the plugin to use
the docker version "1.10.1" metadata format which is compatible with
all currently available docker releases.
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
Currently we don't produce a docker base image that can be used with
OSBS or via the 'atomic run' command without modification. This
fixes that and will allow for an automated import of the base images
into the Fedora Container Registry
Also, fix various missing commas in dict declarations
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
This is a rework of <https://pagure.io/pungi-fedora/pull-request/108>,
and re-applied from <https://pagure.io/pungi-fedora/pull-request/167>
since I found out that in fact `fedora-atomic.conf` isn't used in
this branch.
Note that I left a few things like git branches pointed at f26, but
I think these should be master most likely.
Signed-off-by: Colin Walters <walters@verbum.org>
The Cloud tree does not contain python-classroom comps group.
And the Lab is not part of the Cloud Variant. So, we need to
use Everything install tree for Labs.
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
minimal container image says it needs more disk space so bump
size to 5G
use the Everything repo for the container images, microdnf
is not part of the cloud variant and it really does not make
ense to add it nor to make a container Variant with its own
install tree
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
There was a missing },{ between the two container images. The end result
is that pungi validates the config but only finds the last section so
only makes one of the two images
Signed-off-by: Dennis Gilmore <dennis@ausil.us>
This enables the creation of the aarch64 cloud and docker images as part of the nightly compose
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Currently, rawhide is still non-gated for autosigning, so some unsigned packages
may get through.
For now, let's accept that, until it is gating.
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This is the initial enablement for aarch64 on rawhide. It adds:
* repos/net install for Everything/Cloud/Server/Workstation
* Server DVD installs
It also cleans up the config a little, remove s390(x) multilib, orders
architectures alphabetically so they're consistent and a litte easier to
read thoughout variants-fedora.xml.
What is still outstanding:
* Add configs for slicing up the compose output and sync out to mirror locations
* Cloud and Docker images
* Disk images
The first item will be a new PR, the later two are being worked upon.
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
With new pungi, the configuration is changed. The new config works
nicely for image-build and live-media. For ostree and live images it
does not look that well.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
It's not perfect as vagrant_sync_directory gets set for all Cloud images
but it should not have any material effect on the non vagrant build process.
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
except that non x86 needs at least version 22. We've been using this
version without issue for some time on non x86 composees. Bring rawhide
up to this so we're the same.
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
Vagrant is an imagetype, it's not properly a component of the
subvariant; both the raw disk and vagrant cloud_base images
should have the same subvariant.
The Docker image's subvariant should be Docker_Base to stay in
line with the Cloud images, I think.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
All other variants will get filtered comps the same way they do now, but
for Everything we will copy the original file without any modifications.
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
