Commit Graph

198 Commits

Author SHA1 Message Date
Mohan Boddu
c12c9b55a5 Adding f27 key
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>
2017-08-16 11:45:24 -04:00
Adam Miller
2a565c78bc rebase and fix unicode issue
Signed-off-by: Adam Miller <maxamillion@fedoraproject.org>
2017-08-15 13:32:25 -05:00
Mohan Boddu
512238927e Rawhide mass branching changes
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-08-15 09:36:22 -04:00
Mohan Boddu
bccea93e18 Using dnf for dependency solving
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-08-14 14:50:08 -04:00
Mohan Boddu
7112dc07f8 Adding s390x for Everything and Server compose
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-08-14 10:13:47 -04:00
Colin Walters
c9126a611a ws-ostree: Use compose version for ostree
Same as we do for FAH, for the same reason.

Signed-off-by: Colin Walters <walters@verbum.org>
2017-07-26 09:01:23 -04:00
Colin Walters
92faef2394 atomichost: Bump ISO internal size to 4GB
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>
2017-07-25 13:54:40 -04:00
Dusty Mabe
22fc96e0b0
atomic: use new json file name
We removed docker from the filename.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-07-12 11:50:03 -04:00
Mohan Boddu
ea9a7ad4c9 Merge #261 rawhide: updates/cleanup for atomic pungi configs 2017-07-01 17:51:01 +00:00
Lubomír Sedlář
aab3d5db0e Remove calligra-l10n-* from additional packages
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>
2017-06-30 09:44:14 +02:00
Dusty Mabe
dd006c0e8b
atomic: no need to provide repo for image builds
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>
2017-06-29 08:51:36 -04:00
Mohan Boddu
add20b40bd White listing p11-kit-trust multilib
Fixes #6855 for F27

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-06-23 10:41:53 -04:00
Colin Walters
d310ecc939 FAH/WS-ostree: Use unified lorax templates
This makes ws-ostree match AH more, which should reduce maintenance pain.

See: https://pagure.io/fedora-lorax-templates/pull-request/21

Signed-off-by: Colin Walters <walters@verbum.org>
2017-06-19 14:23:59 -04:00
Mohan Boddu
4b26f029b0 Merge #243 Remove createrepo options with default values 2017-05-30 17:20:30 +00:00
Dusty Mabe
46ce53c208
atomic: update lorax passed vars
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>
2017-05-30 09:10:20 -04:00
Sinny Kumari
54df8e9f19 Add aarch64 and ppc64le arches to atomic, cloudImage creation
Signed-off-by: Sinny Kumari <sinny@redhat.com>
2017-05-30 12:05:14 +05:30
Lubomír Sedlář
fe744d5e6a Remove createrepo options with default values
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>
2017-05-26 09:17:19 +02:00
Mohan Boddu
68ebf8ca6d Set release blocking deliverables
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>
2017-05-23 21:30:30 -04:00
Dusty Mabe
f5769f7643
atomic: move to new versioning scheme for ostree
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>
2017-05-23 09:32:47 -04:00
Dusty Mabe
7163cc2572
atomic: update lorax passed vars
Similar to what we did in b28af80 on the f25 branch. Let's update
the lorax passed vars. This is to match what is expected for [1].

[1] https://pagure.io/fedora-lorax-templates/pull-request/18

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-05-22 22:22:20 -04:00
Dennis Gilmore
7f362a8216 Merge #228 ws/ostree: Adapt to new ISO model 2017-05-19 12:25:20 +00:00
Dusty Mabe
5f0774eeda
cloud: don't try to override default sync location
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>
2017-05-18 18:02:16 -04:00
Dusty Mabe
df1baf55c3
cloud/atomic: give appropriate factory-parameters to koji
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>
2017-05-18 18:02:05 -04:00
Colin Walters
23a24f70cc ws/ostree: Adapt to new ISO model
This is like addec6bdb2 but for
Workstation/ostree.

Signed-off-by: Colin Walters <walters@verbum.org>
2017-05-18 15:45:34 -04:00
Peter Robinson
e97c0d4d61 cloud/docker: add Power64 arches to image creation
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2017-05-15 18:34:41 +01:00
Lubomír Sedlář
d46b6745fa Explicitly generate release value for images
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-05-10 08:54:51 +02:00
Lubomír Sedlář
a813f127f9 Remove deprecated options
The old options still work, but generate a warning during validation.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-05-10 08:54:09 +02:00
Mohan Boddu
81a3daa489 Adding "master" as branch name for Rawhide
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>
2017-04-27 14:42:34 -04:00
Mohan Boddu
ee066a0e8e Increase root filesystem size to 3GB for Atomic variant for aarch64
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>
2017-04-27 11:50:29 -04:00
Mohan Boddu
af3d355bbc Increase root filesystem size to 3GB for Atomic variant
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>
2017-04-27 11:14:14 -04:00
Adam Miller
ae2f611637 Switch from docker to container namespace
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>
2017-04-26 17:16:16 -05:00
Peter Robinson
86eae3279e aarch64: workstation: increase disk to 8Gb as it doesn't fit
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2017-04-18 18:42:24 +01:00
Dennis Gilmore
61bf74d401 subsitute Atomic in the iso volume id
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>
2017-04-18 10:07:51 -05:00
Peter Robinson
994e4a7b49 add initial support for aarch64 disk images for Minimal/Workstation/Server
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2017-04-12 22:55:23 +01:00
Mohan Boddu
ee6fa368fb Adding ppc64le ostree and ppc64le, aarch64 ostree installer
Fix for #6688

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-04-11 11:36:06 -04:00
Lubomír Sedlář
f1cdd68405 Add eclipse-nls to additional packages
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>
2017-04-07 15:51:41 +02:00
Adam Miller
a522a05f95 Fix docker metadata formatting and license
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>
2017-03-31 13:58:16 -05:00
Adam Miller
8c67ff4042 Add dockerversion to factory-parameters
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>
2017-03-30 12:11:07 -05:00
Adam Miller
eaedf7da3b Add docker base image metadata
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>
2017-03-28 17:11:19 -05:00
Dennis Gilmore
93be29408e Merge #174 atomic/host: Update to use new ISO model (in fedora.conf) 2017-03-21 15:47:49 +00:00
Colin Walters
addec6bdb2 atomic/host: Update to use new ISO model (in fedora.conf)
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>
2017-03-15 21:47:26 -04:00
Mohan Boddu
1bb1c52191 Switch python-classroom vagrant to Everything repo.
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>
2017-03-14 10:01:05 -04:00
Dennis Gilmore
30e68961a9 use Everything for docker and make disk size bigger
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>
2017-03-10 17:40:34 -06:00
Dennis Gilmore
78497bf06e add missing },{ so we get docker base back
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>
2017-03-09 15:43:43 -06:00
Peter Robinson
4125025f36 Enable aarch64 cloud and docker images
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>
2017-03-03 18:23:05 +00:00
Mohan Boddu
3364900413 Fixing armhfp python classroom lab duplicates
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-03-01 14:35:54 -05:00
Dennis Gilmore
e74a5ff8a4 Merge #146 Rawhide changes for branching 2017-03-01 18:13:14 +00:00
Mohan Boddu
2ab7088ebe Fix the armhfp lab list
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-03-01 10:36:41 -05:00
Mohan Boddu
2fc1572059 Rawhide mass branching changes
Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-03-01 09:55:01 -05:00
Mohan Boddu
dda5247bb1 Adding Python Classroom Lab
Fix for #6665

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-02-27 16:54:31 -05:00