Commit Graph

528 Commits

Author SHA1 Message Date
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
Jan Kaluza
50a531563b Change the sigkey to match the one we really use. Remove unused 'base-runtime' variant.
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
2017-05-19 13:46:43 +02:00
Dusty Mabe
b69707bdd7
fedora-atomic: add in override for vagrant sync location
Go ahead and update the fedora-atomic.conf so that when it gets
branched it will have the override already in there.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2017-05-18 18:02:21 -04: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
Dennis Gilmore
44d13a78f8 Merge #203 Bring back i386 for modules. 2017-04-14 14:58:14 +00:00
Ralph Bean
41d8a7b0d1 The name of this script has a typo.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-13 16:13:31 -04:00
Dennis Gilmore
13d08feef1 Merge #204 add initial support for aarch64 disk images for Minimal/Workstation/Server 2017-04-13 14:04:58 +00:00
Peter Robinson
fc1064b1dc add aarch64 to Spins variant
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2017-04-13 14:55:12 +01: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
Ralph Bean
94c5f4ce0e Revert "Drop i386 until we sort out a bug in the gather phase."
This reverts commit b0fbe564f6.

Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 15:03:34 -04:00
Ralph Bean
3c9a594c4c Apparently this is still only sha256.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 13:47:26 -04:00
Ralph Bean
4956b40ca9 Remove unused multilib stuff.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 13:44:53 -04:00
Ralph Bean
bf8f6e0ddb Remove some unused stuff.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 13:43:27 -04:00
Ralph Bean
b0fbe564f6 Drop i386 until we sort out a bug in the gather phase.
See the traceback here:  https://kojipkgs.fedoraproject.org/compose/Fedora-Modular-Rawhide-20170412.n.1/logs/global/traceback.global.log

Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 13:41:51 -04:00
Ralph Bean
9cb37d4107 Use Modular-Rawhide for BRANCHED name, based on feedback.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 11:33:33 -04:00
Ralph Bean
76c895cc35 This should be i386, based on feedback.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 11:02:09 -04:00
Ralph Bean
7e50c64a0f Fix strings based on PR feedback.
Signed-off-by: Ralph Bean <rbean@redhat.com>
2017-04-12 09:24:37 -04:00
Jan Kaluza
62b8edc969 Add FedoraModular Rawhide compose
Signed-off-by: Jan Kaluza <jkaluza@redhat.com>
2017-04-12 09:24:37 -04: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
Bill Peck
c5bb3f0ed1 Fix bad copy/paste path.
This fixes the missing .composeinfo for secondary arches.

Signed-off-by: Bill Peck <bpeck@redhat.com>
2017-04-03 13:57:29 -04:00
Mohan Boddu
75200de99c Adding armhfp arch to Labs variant
Fix for #6737
python-classroom is the first armhfp image under Labs variant.
And, the compose has been failing since its missing from
variants.xml file. This will fix it.

Signed-off-by: Mohan Boddu <mboddu@redhat.com>
2017-03-31 15:58:30 -04: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
Dennis Gilmore
efddd81a8f Merge #178 Add a config and script for Rawhide done with DNF 2017-03-30 17:28:01 +00: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
Lubomír Sedlář
12e0b161bf Add a config and script for Rawhide done with DNF
This is a temporary measure for testing. It will shadow real rawhide
composes and redo them with depsolving based on DNF.

The composes will land in /mnt/koji/compose/rawhide-dnf and there will
be logs with information about changes in package set.

Nothing will be sent to fedmsg, no mails will be sent.

Only the package set is created, no extra images or even repos are
created.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2017-03-27 14:53:00 +02:00
Adam Miller
a5a8e39c73 Call block_retired.py with --namespace=docker
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>
2017-03-24 16:45:28 -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
Dennis Gilmore
647422bd5d Merge #167 atomic/host: Update to use new ISO model 2017-03-14 22:16:32 +00: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
Colin Walters
f4f815979f atomic/host: Update to use new ISO model
This is a rework of <https://pagure.io/pungi-fedora/pull-request/108>.
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-13 12:58:48 -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