Compare commits

...

211 Commits

Author SHA1 Message Date
Kevin Fenzi
3ec658833a toolbox: should be blocking
I marked toolbox as failable when we were getting everthing working on
it (and so we would still have composes). Now that it's working, lets
mark it blocking again.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-08-23 14:34:41 -07:00
Patrik Polakovič
aebe40eaad Fixes releng#11358
Signed-off-by: Patrik Polakovič <patrik@alphamail.org>
2023-08-22 10:28:28 +02:00
Samyak Jain
49bc2e943e Rawhide is now f40
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
2023-08-08 22:35:50 +00:00
Tomas Hrcka
40d8c84354 Use f40-build for rawhide compose
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2023-08-08 23:39:39 +02:00
Tomas Hrcka
ff110ad456 Remove modularity
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2023-07-21 11:22:44 +00:00
amedvede
8cd1f08e24 feat: add 'dirname' to media_checksum_base_filename
Signed-off-by: amedvede <amedvede@redhat.com>
2023-07-21 11:21:50 +00:00
Timothée Ravier
ae2c12886a Silverblue/Kinoite/Sericea/Onyx: Use unified core mode
rpm-ostree is moving to unified core composes and this is now working
for Silverblue, Kinoite, Sericea and Onyx.

See: https://github.com/coreos/rpm-ostree/issues/729
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2150984

Related changes:
- https://pagure.io/workstation-ostree-config/pull-request/246
- https://pagure.io/workstation-ostree-config/pull-request/344

Changes in Pungi:
- https://pagure.io/pungi/pull-request/1626
- https://pagure.io/pungi/pull-request/1690

For previous attempts, see:
- https://pagure.io/pungi-fedora/pull-request/1115
- https://pagure.io/pungi-fedora/pull-request/1136 (revert)
- https://pagure.io/pungi-fedora/pull-request/1145
- https://pagure.io/pungi-fedora/pull-request/1185 (revert)

Signed-off-by: Timothée Ravier tim@siosm.fr
2023-07-19 20:26:25 +02:00
Timothée Ravier
10d4449535 Revert "Silverblue/Kinoite/Sericea/Onyx: Use unified core mode"
Composes are failing on:

```
error: Unable to load SELinux policy from /
```

Which comes from https://github.com/coreos/rpm-ostree/blob/main/src/libpriv/rpmostree-core.cxx#L795

Revert this change until we either add selinux-policy to the buildroot
or fix this in rpm-ostree.

This reverts commit 6d82501bca.

Signed-off-by: Timothée Ravier <tim@siosm.fr>
2023-07-14 13:23:19 +02:00
Tomas Hrcka
61b831d9fa Revert "fix: adding disc-type placeholder into the string to generate checksum file"
This reverts commit 8b88315b00.

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2023-07-13 12:39:31 +02:00
amedvede
8b88315b00 fix: adding disc-type placeholder into the string to generate checksum file
Signed-off-by: amedvede <amedvede@redhat.com>
2023-07-12 12:32:25 +00:00
Timothée Ravier
6d82501bca Silverblue/Kinoite/Sericea/Onyx: Use unified core mode
rpm-ostree is moving to unified core composes and this is now working
for Silverblue, Kinoite, Sericea and Onyx.

Requires: https://pagure.io/pungi/pull-request/1626
Requires: https://pagure.io/workstation-ostree-config/pull-request/246
See: https://github.com/coreos/rpm-ostree/issues/729
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2150984

Revert "Revert "Use unified core mode for Silverblue & Kinoite""

See: https://pagure.io/pungi-fedora/pull-request/1115
See: https://pagure.io/pungi-fedora/pull-request/1136

This reverts commit dd54ad9f33.

Signed-off-by: Timothée Ravier tim@siosm.fr
2023-07-10 21:28:01 +00:00
Timothée Ravier
7625f03466 Onyx: Fix ostree ref name
Found while looking at compose failures.

Signed-off-by: Timothée Ravier <tim@siosm.fr>
2023-06-30 17:04:56 +02:00
Kevin Fenzi
4d08b6acde mark toolbox failable for now because we really need to get a compose
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-06-28 13:14:16 -07:00
Kevin Fenzi
e828a78a26 toolbox: use normal rawhide Everything repo
This section is for released fedoras with updates/base repo,
for rawhide, we just pass pungi "Everything" and it does the magic.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-06-28 07:50:02 -07:00
Kevin Fenzi
cac39f8e43 toolbox: let s390x be failable for now
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-06-27 19:52:48 -07:00
Tomas Hrcka
ec58a86354 Add toolbox container to main fedora.conf
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2023-06-27 15:42:12 +02:00
Tomas Hrcka
ea49e37a32 Revert "Update fedora-container.conf"
This reverts commit 02527809f1.

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2023-06-27 15:31:55 +02:00
Tomáš Hrčka
02527809f1 Update fedora-container.conf
Update typo in kickstarts URL for container config
Signed-off-by: humaton <thrcka@redhat.com>
2023-06-27 07:05:50 +00:00
Samyak Jain
6223f65e37 Add fedora-container-toolbox to fedora-container configuration
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
2023-06-21 12:27:23 +05:30
Kevin Fenzi
8b2c85799c bump all the previous images another gb for now as at least workstation needs more space
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-06-09 19:40:01 -07:00
Adam Williamson
13fc722e94 Bump size of three aarch64 images for bigger EFI system partition
There's a Fedora 39 Change to increase the size of the EFI
system partition:
https://fedoraproject.org/wiki/Changes/BiggerESP
it goes from a size range of 200-600MiB to a size range of
500MiB-2GiB. The way these aarch64 disk images are built, they
get the biggest ESP possible, so they're getting a 2GiB ESP,
up from 600MiB. For these three images, that results in anaconda
calculating there isn't enough space on the root partition to
install the package set, and the image creation fails.

Per https://bugzilla.redhat.com/show_bug.cgi?id=2212121
there's at least a chance this is really how we want things, so
for now, let's increase the sizes of these images to accommodate
the bigger ESP. We can revert this if we decide that after all
the larger ESP is not needed and we want to tweak that somehow.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-06-09 10:03:33 -07:00
Dan Čermák
192d108932
i3-Live: add build for aarch64
Signed-off-by: Dan Čermák <dan.cermak@cgc-instruments.com>
2023-06-08 08:34:37 +02:00
Aleksei Bavshin
e080c0702f Sericea: build for aarch64 and ppc64le
Signed-off-by: Aleksei Bavshin <alebastr@fedoraproject.org>
2023-05-26 01:27:27 +00:00
Joshua Strobl
e2e5e8c003 Add Fedora Onyx immutable variant
See https://fedoraproject.org/wiki/Changes/Fedora_Onyx

Signed-off-by: Joshua Strobl <me@joshuastrobl.com>
2023-05-25 17:56:57 +00:00
Kevin Fenzi
b06c01d9ba azure: the pungi format is vpc to make vhd images
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-05-15 12:44:48 -07:00
Major Hayden
29fb0a1e46
cloud: Build Azure image 💙
Now that the Fedora + Azure change was approved, let's get Azure images
building in koji alongside the existing qcow, raw.xz, and vagrant
images.

Signed-off-by: Major Hayden <major@redhat.com>
2023-05-11 10:05:26 -05:00
Major Hayden
142ed5e0cc
Azure: Allow images to fail for now
We can amend this setting later once we know everything is working well.

Signed-off-by: Major Hayden <major@redhat.com>
2023-04-27 10:46:49 -05:00
Major Hayden
f6a10ed79a
Azure: Add aarch64 architecture
Azure supports aarch64 instances and we should build those images.

Signed-off-by: Major Hayden <major@redhat.com>
2023-04-27 10:34:37 -05:00
Samyak Jain
cf9f39d1e9 Update repo to remove f39/39 references
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
2023-04-24 08:49:49 +00:00
Pete Walter
fed3cea474 Add mesa-dri-drivers and mesa-va-drivers to multilib whitelist (rhbz#2173962)
Signed-off-by: Pete Walter <pwalter@fedoraproject.org>
2023-04-20 13:39:08 +01:00
Major Hayden
5e713fb8b3
azure: Generate UEFI-only images
As noted by Neal in the previous PR[0], we need UEFI-only images for
Azure. Switch to the `Fedora-30` profile to align with the existing
UEFI-only image configuration for GCP images.

[0] https://pagure.io/pungi-fedora/pull-request/1161

Signed-off-by: Major Hayden <major@redhat.com>
2023-04-19 14:32:04 -05:00
Tulio Magno Quites Machado Filho
1510e9ebc4 Add libomp to multilib_whitelist - releng #11395
Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
2023-04-19 18:08:16 +00:00
Tulio Magno Quites Machado Filho
889d2f4237 Update the URLs for bodhig multilib settings
These files have recently been updated and their contents is now
available in a new file.

Signed-off-by: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
2023-04-19 18:08:16 +00:00
Major Hayden
c4f041c029
cloud: Add Azure image build
The Cloud SIG is ready to launch Fedora on Azure and we need image built
along with rawhide composes. Although the image has a very similar
package set, it must be in VHD format.

Signed-off-by: Major Hayden <major@redhat.com>
2023-04-17 14:27:46 -05:00
Kalev Lember
3333f9ab4f Switch to F38 flatpak runtime for Silverblue
All the preinstalled apps are now rebuilt and using the F38 runtime.

Signed-off-by: Kalev Lember <klember@redhat.com>
2023-03-29 08:46:47 +02:00
Adam Williamson
a0915685df Mark aarch64 minimal disk image as non-failable
It's now release-blocking:
https://pagure.io/fesco/issue/2963
so it should not be failable.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-03-21 08:58:33 -07:00
Adam Williamson
a5a9747b14 Bump disk sizes for KDE and Xfce disk images
These are both currently failing due to lack of disk space:
https://pagure.io/releng/failed-composes/issue/4758#comment-847350

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-03-17 09:05:13 -07:00
Michal Konečný
76ff6194d6 Split general.conf to general.conf and multilib.conf
Move multilib configuration to separate file. So we can keep it in sync with
Bodhi pungi config.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
2023-03-06 18:07:06 +00:00
Michal Konečný
82cd5db7fe Fix all the warnings from pungi-config-validate
Let's fix all the warnings thrown by pungi-config-validate. Only the
general.conf is throwing errors, but because it couldn't be validated by itself alone.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
2023-03-06 18:07:06 +00:00
Michal Konečný
d44bc4c7df Create a general configuration file for shared values
To prevent the need to edit one thing in multiple pungi configurations let's use
it's ability to import other configuration files (See
https://docs.pagure.org/pungi/format.html#importing-other-files). This change
will create a new configuration file `general.conf` which is imported to
each other pungi configuration for Fedora.

Signed-off-by: Michal Konečný <mkonecny@redhat.com>
2023-03-06 18:07:06 +00:00
Tomas Hrcka
c9a09481e5 Add script to sync ostree base containers
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2023-03-01 15:24:46 +01:00
Kevin Fenzi
820ba9db3c Phosh: just move it back to 12 for now until we can remove more things
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-28 15:59:09 -08:00
Kevin Fenzi
e740bf0c8b Phosh: add a slight bit of space. 8 is just a tad too small
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-27 16:42:26 -08:00
Kevin Fenzi
1207bcf3ac phosh: reduce size to 8gb from 12gb
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-25 16:15:11 -08:00
Kevin Fenzi
3232646df6 rawhide is f39 now
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-10 13:19:54 -08:00
Kevin Fenzi
08be351953 use correct modular tag for modules
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-09 18:06:50 -08:00
Kevin Fenzi
179e60328a fix key for f39 as well
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-09 17:11:36 -08:00
Kevin Fenzi
ac06b9559d Update rawhide to point to f39 instead of f38
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-09 17:02:30 -08:00
Kalev Lember
b7fbed6ef8 Add cheese flatpak to Silverblue
Cheese flatpak had a long standing issue with camera detection, which is
now finally fixed. Now that it's working again, add it to Silverblue to
keep the list of installed apps in sync with Workstation.

Signed-off-by: Kalev Lember <klember@redhat.com>
2023-02-06 18:27:53 +01:00
Kevin Fenzi
917d9d0e2a Phosh: fix subvariant name
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-02-04 09:34:03 -08:00
Kevin Fenzi
d950d67afa phosh: add aarch64 phosh compose (needs kickstart and comps changes first)
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2023-01-31 16:47:43 -08:00
Aleksei Bavshin
38db5faf8d
Add Fedora Sericea (Sway OSTree) variant.
See https://fedoraproject.org/wiki/Changes/Fedora_Sway_Spin

Signed-off-by: Aleksei Bavshin <alebastr@fedoraproject.org>
2023-01-30 08:51:57 -08:00
Aleksei Bavshin
41794edee2
Add Fedora Sway Spin
Signed-off-by: Aleksei Bavshin <alebastr@fedoraproject.org>
2023-01-30 08:51:56 -08:00
Joe Orton
7fb802c8eb Update multilib configuration to exclude httpd-core rather than
httpd from being treated as multilib, since the conflicting
i686/x86_64 packages were moved to httpd-core.

Signed-off-by: Joe Orton <jorton@redhat.com>
2023-01-29 19:19:18 +00:00
Joshua Strobl
ebd9d9f3f1 Add Fedora Budgie Spin
Signed-off-by: Joshua Strobl <joshua@buddiesofbudgie.org>
2023-01-21 17:56:50 +02:00
Adam Williamson
042c082481 Bump Workstation disk image size to 14G
Recent Rawhide composes failed because they need 1M extra space
on the disk:
https://pagure.io/releng/failed-composes/issue/4478
let's be generous and give it a whole extra 1G!

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-01-16 09:19:42 -08:00
Timothée Ravier
dd54ad9f33 Revert "Use unified core mode for Silverblue & Kinoite"
Reverted while we investigate an installation failure.

See: https://pagure.io/pungi-fedora/pull-request/1115

This reverts commit c6e3cb1b5b.

Signed-off-by: Timothée Ravier <tim@siosm.fr>
2022-12-09 22:31:06 +01:00
Timothée Ravier
c6e3cb1b5b Use unified core mode for Silverblue & Kinoite
rpm-ostree is moving to unified core composes and this is now working
for Silverblue & Kinoite.

Requires: https://pagure.io/pungi/pull-request/1626
See: https://github.com/coreos/rpm-ostree/issues/729
See: https://fedoraproject.org/wiki/Changes/FedoraSilverblueUnifiedCore
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=2150984

Signed-off-by: Timothée Ravier <tim@siosm.fr>
2022-12-09 13:37:17 +00:00
Timothée Ravier
196f4554b6 Kinoite: Remove Fedora Flatpak Platform
There are currently no KDE applications packaged as Flatpaks in Fedora
and we are thus shipping no Fatpak by default in Fedora Kinoite.

Remove the Runtime as it is unused and will be installed on demand if
users install applications from the Fedora Flatpak remote.

This will make the installer smaller which will save download and
installation time for users that only get Flatpaks from Flathub.

This can be reverted (and fixed for aarch64) once we have KDE Flatpaks
in Fedora.

See: https://pagure.io/fedora-kde/SIG/issue/13

Signed-off-by: Timothée Ravier <tim@siosm.fr>
2022-12-09 10:06:58 +00:00
Tomas Popela
0351ce9f83 Re-enable the Fedora Flatpaks on aarch64 on Silverblue
We're building them for some time and we though these are enabled by
default, see [0]. They were initially enabled[1], but then disabled[2] as
the composes failed due to the lack of content. When we started to build
aarch64 Flatpaks, we forgot to enable them properly in [0]. I've
inspected that the aaarch64 Flatpaks with registry by running
`skopeo inspect docker://registry.fedoraproject.org/firefox:latest` so
it should be safe to enabled them now.

Thanks to Timothée Ravier who spotted it.

[0] - https://pagure.io/pungi-fedora/c/ed6e94f9f224c673db209458c6fddf42e877f64f?branch=main
[1] - https://pagure.io/pungi-fedora/c/c728ed5f0d69131210348cccecbe96962bad52ac?branch=main
[2] - https://pagure.io/pungi-fedora/c/c5d5e068686daf601ca3a7b1cb68dc071db4e047?branch=main

Signed-off-by: Tomas Popela <tpopela@redhat.com>
2022-12-08 17:28:12 +01:00
Zamir SUN
4399f7ad3e Pungi: Build disk image and live media for LXQt on aarch64
Signed-off-by: Zamir SUN <sztsian@gmail.com>
2022-11-25 12:29:29 +08:00
Kalev Lember
89e5234be5 Switch to F37 flatpak runtime for Silverblue and Kinoite
All the preinstalled apps are now rebuilt and using the F37 runtime.

Signed-off-by: Kalev Lember <klember@redhat.com>
2022-10-06 10:45:02 +02:00
Pedro Moura
147db1da37 added pam to multilib_whitelist - releng #11037
Signed-off-by: Pedro Moura <pmoura@redhat.com>
2022-09-19 16:06:32 -03:00
Kevin Fenzi
b3f027adda More space for kde and Xfce aarch disk images
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-09-15 16:05:50 -07:00
Tomas Hrcka
fba2b1583a Add image build for Fedora Server KVM
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-09-06 17:13:14 +02:00
Adam Williamson
e66305ac76 nightly.sh: update critpath.py call for recent changes
This uses the syntax after my recent PR:
https://pagure.io/releng/pull-request/11000
with those changes, this should actually work, instead of just
printing sad error messages like it does now!

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2022-08-30 18:03:06 -07:00
Kalev Lember
11fad8cdbe Add systemd-pam to multilib whitelist
Move it to here instead of having systemd-devel fake require
systemd-pam.

This should help with flatpak runtime packaging so that we can avoid
having to ship systemd-pam in the flatpak container.

Signed-off-by: Kalev Lember <klember@redhat.com>
2022-08-18 18:38:06 +02:00
Kevin Fenzi
fbed2485d3 disable gather profiler for now to avoid a race that causes composes to sometimes fail
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-08-17 09:46:41 -07:00
Kevin Fenzi
cecb9b712d set correct f38 key
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-08-11 19:05:22 -07:00
Tomas Hrcka
7cfa543013 Update fedora-cloud to f38
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-08-09 14:23:51 +02:00
Tomas Hrcka
c67c1c74fd Rawhide is now Fedora 38
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-08-09 14:21:48 +02:00
Kamil Páral
78252f90de update all scripts to send to test-reports
The first attempt was in commit 2051777399. Only main Rawhide compose goes to
devel list as well.

Related: https://pagure.io/pungi-fedora/pull-request/1109
Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-07-22 12:46:59 +02:00
Kamil Páral
2051777399 send compose reports to test-reports list instead of test list
Keep the devel list included, as requested by Kevin.

Related: https://pagure.io/fedora-qa/issue/700

Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-07-21 16:57:44 +02:00
Kamil Páral
0e0799dd7e multilib: note that people should update it in two places
Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-06-24 08:57:45 +02:00
Kamil Páral
76722dd116 multilib_whitelist: add iptables and pipewire
This is to make the config in sync with a Bodhi version. The packages were added
there to avoid upgrade issues. See:
179ce1824b
https://bugzilla.redhat.com/show_bug.cgi?id=1953178

Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-06-21 14:50:02 +02:00
Kamil Páral
0d7b87bf9e multilib_*: sort package names
And put them on individual lines, this makes them easier to compare with bodhi
config downstream.

Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-06-21 14:43:06 +02:00
Kamil Páral
5bb174ae68 multilib_whitelist: affect wine subpackages and related projects
Wine subpackages were probably covered by dependencies. But separate packages
like `wine-dxvk` were not covered, even though they need to be multilib. At the
same time, we don't want to use `wine*` because that would also cover e.g.
`wineglass`, which doesn't need to be multilib. The current approach seems to
work the best.

Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-06-21 14:39:01 +02:00
Tomas Popela
0a831a5bdf Move Flatpak Fedora runtime to F36 version
Fedora Flatpaks were updated for F36 and now require the F36 runtime
instead. This will fix the Rawhide builds of Silverblue.

https://github.com/fedora-silverblue/issue-tracker/issues/298
Signed-off-by: Tomas Popela <tpopela@redhat.com>
2022-06-20 08:16:24 +02:00
Kevin Fenzi
955d80e34e Use createiso_use_xorrisofs = True to make isos with xorrisofs
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-06-15 18:33:55 -07:00
Kamil Páral
6d606ef0de fedora.conf: add mesa-vulkan-drivers into multilib_whitelist
Vulkan drivers need to be accessible for i686 as well. Currently it's missing
for updates-testing builds, which is causing issues for our users, see:
https://bodhi.fedoraproject.org/updates/FEDORA-2022-4120f31977#comment-2466325
https://bodhi.fedoraproject.org/updates/FEDORA-2022-db6aea82e4

Signed-off-by: Kamil Páral <kparal@redhat.com>
2022-06-08 11:57:48 +02:00
Miro Hrončok
8f9859888c Increase size of Fedora-Python-Classroom
(Hopefully) fixes https://bugzilla.redhat.com/show_bug.cgi?id=2064263

Signed-off-by: Miro Hrončok <miro@hroncok.cz>
2022-03-20 22:28:47 +01:00
Mohan Boddu
5780510c10 Fix release-candidate.sh script
This adds --notification-script=pungi-wait-for-signed-ostree-handler
to release-candidate.sh script

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2022-03-11 08:50:24 -05:00
Tomáš Hrčka
88e48938a6 Update nightly.sh
Remove productimg from skip-phases param

Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-02-23 17:48:02 +00:00
Tomas Popela
fd5cf4cb4a Drop GNOME Screenshot Flatpak from Silverblue
GNOME Shell has now a built in replacement.

See https://pagure.io/fedora-workstation/issue/277

Signed-off-by: Tomas Popela <tpopela@redhat.com>
2022-02-15 08:19:16 +01:00
Adam Williamson
9d4368b7b0 Replace gedit with gnome-text-editor for Silverblue
This has been done in Workstation, but not yet in Silverblue.
This commit is a great example of why putting lots of items in
a single line of text is a bad idea!

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2022-02-14 05:29:39 +00:00
Peter Robinson
cac6ad0839 Retire ARMv7/armhfp from the compose
As per the approved change to retire ARMv7/armhfp
https://fedoraproject.org/w/index.php?title=Changes/RetireARMv7

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
2022-02-09 11:32:49 +00:00
Kevin Fenzi
d08f09f405 Adjust for fedora-37 key and update fedora-cloud to f37
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2022-02-08 15:24:48 -08:00
Tomas Hrcka
b6ce674030 F37 is now rawhide
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2022-02-08 13:00:31 +01:00
Tomas Popela
f5931283a5 Flatpaks: Fix the Flatpak references on aarch64
Signed-off-by: Tomas Popela <tpopela@redhat.com>
2022-02-04 10:49:51 +00:00
Tomas Popela
846e781106 Flatpaks: Add GNOME Extensions and remove File Roller on Silverblue
Align with Fedora Workstation. The File Roller functionality is already
part of Nautilus.

Signed-off-by: Tomas Popela <tpopela@redhat.com>
2022-02-04 10:49:51 +00:00
Filip Valder
7a4f49cd17 Add configuration for module obsoletes
Signed-off-by: Filip Valder <fvalder@redhat.com>
2022-01-28 12:35:04 +01:00
Josh Stone
7455188864 Exclude all rust-std-static-wasm* from s390x
The packages depends on lld, which is not shipped there. This is a
followup to #1036 now that we have `wasm32-wasi`, and we might want
`wasm64` variants in the future.

Signed-off-by: Josh Stone <jistone@redhat.com>
2021-12-07 16:09:06 -08:00
Kevin Fenzi
0f3d7649ab workstation disk image: increase size.
This is where the workstation image is running out of space.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-12-02 20:54:21 -08:00
Kalev Lember
ed6e94f9f2 Add aarch64 flatpaks to Silverblue and Kinoite images
We now have the flatpak runtime available for aarch64, which was the
last missing piece to be able to install Fedora flatpaks on aarch64.

Signed-off-by: Kalev Lember <klember@redhat.com>
2021-11-10 18:00:53 +00:00
Lubomír Sedlář
d9988da721 Remove extra commas from rsync messages
The compose ID and some paths have an extra bogus comma at the end. That
makes it difficult to consume the message.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2021-11-04 16:01:21 +01:00
Mohan Boddu
72c29d9af8 Fixing fedora-container.conf
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-11-03 12:36:27 -04:00
Kevin Fenzi
b98d43e759 fedora-disk-kde: increase size slightly to allow disk kde for arm to build
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-10-21 19:40:02 -07:00
Kalev Lember
d2e477b483 Switch to F35 flatpak runtime for Silverblue
All preinstalled flatpak apps are rebuilt and based on the F35 flatpak
runtime now.

Signed-off-by: Kalev Lember <klember@redhat.com>
2021-10-05 17:01:38 +02:00
Tomas Popela
a25f455e51 Preinstall GNOME Connections as Flatpak on Silverblue
See https://pagure.io/workstation-ostree-config/pull-request/243

Signed-off-by: Tomas Popela <tpopela@redhat.com>
2021-10-05 08:51:52 +02:00
Ben
c57bda04d9 Fix recurring typo
Fix three instances of "fomat" typo

Signed-off-by: Ben Capper <bcapper@redhat.com>
2021-09-20 17:24:51 +00:00
Ben
5f0ea623ad Drop armfhp image from Python Classroom Lab
armhfp is becoming less popular and keeps failing randomly

Issue: https://pagure.io/releng/issue/10112
Signed-off-by: Ben Capper <bcapper@redhat.com>
2021-09-20 17:24:51 +00:00
Ibiam Chihurumnaya
864454d847
Increase SoaS disk image size
Signed-off-by: Ibiam Chihurumnaya <ibiamchihurumnaya@gmail.com>
2021-09-20 16:37:40 +01:00
Mohan Boddu
8cf0a66f44 Rawhide is now F36
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-08-11 14:31:07 -04:00
Tomas Hrcka
f72c118eb0 rawhide is f36
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2021-08-10 13:43:26 +02:00
Lubomír Sedlář
3c5576f240 Exlude rust-std-static-wasm32-unknown-unknown from s390x
The package depends on lld, which is not shipped there.

Relates: https://pagure.io/pungi/issue/1518
Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2021-07-15 08:42:25 +02:00
Paul Whalen
f7171c7fc3 Increase KDE, SoaS and Python Classroom disk image size
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2021-05-31 10:54:30 -04:00
Timothée Ravier
8d5f7f4079 Add support for building Fedora Kinoite
See https://fedoraproject.org/wiki/Changes/Fedora_Kinoite

Signed-off-by: Timothée Ravier <travier@redhat.com>
2021-05-18 20:59:26 +00:00
Timothée Ravier
babdb6d06f Remove unused 'armhfp' arch for Silverblue
Signed-off-by: Timothée Ravier <travier@redhat.com>
2021-05-18 20:59:26 +00:00
Mohan Boddu
653fd0a094 Adding aarch64 to Labs for Python Classroom image
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-05-18 11:43:42 -04:00
Kevin Fenzi
2d2d9b21b8 adjust container/cloud updates to use main branch of comps
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-05-04 08:44:55 -07:00
Kevin Fenzi
9f4edbea83 rawhide: fix container.conf also
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-05-02 10:39:50 -07:00
Kevin Fenzi
2cb59bab0a rawhide: fix bogus f29 config for f35
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-05-02 10:14:21 -07:00
Paul Whalen
07ec618db7 Make the armhfp disk image release blocking.
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2021-04-20 15:45:44 +00:00
Kalev Lember
265ae6e210 Pre-install mediawriter flatpak on Silverblue
https://pagure.io/fedora-workstation/issue/214

Signed-off-by: Kalev Lember <klember@redhat.com>
2021-04-14 13:13:57 +02:00
Kalev Lember
bc44e10d58 Switch to F34 flatpak runtime for Silverblue
All preinstalled flatpak apps are rebuilt and based on the F34 flatpak
runtime now.

Signed-off-by: Kalev Lember <klember@redhat.com>
2021-03-30 11:43:57 +02:00
Kevin Fenzi
c60af61bec arm workstation: increase size by 1GiB
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-03-25 17:13:18 -07:00
Kevin Fenzi
dc03926bbf Increase the size of the python-classroom disk images
Currently this are failing by running out of space.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-03-11 13:21:39 -08:00
Kevin Fenzi
0d2b85bc1b Fix all variants to delete-after so we dont keep accumulating things.
In 57985b08 nightly was updated, but not all the variants were updated
in the second sync. The first sync runs with --exclude repodata, then
the second one includes that and also does a --delete-after, but we only
updated the first one. This should clean up old artifacts.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-03-03 19:40:51 -08:00
Kevin Fenzi
5b2d9dcbd8 nightly.sh: fix secondary hardlink
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-03-01 19:10:25 -08:00
Mohan Boddu
86cd5a304c Adding i3 spin
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-02-23 14:26:20 -05:00
Peter Robinson
57985b087e Update the pungi config for the UEFI on ARMv7 changes
This update adds the various pieces for the UEFI side of things
and removes the old appliance build process including a few cleanups.

It also updates the sync process and cleans up a few bits here
while at it.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
2021-02-23 19:09:07 +00:00
Mohan Boddu
39ed9bcc5c Use the F35 key as all the builds are now signed with f35 key
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-02-23 13:34:07 -05:00
Kevin Fenzi
92c8817161 Widen the perl module filter to exclude all the perl bootstrap modules.
See https://pagure.io/releng/issue/8616 for more info

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-02-15 14:04:02 -08:00
Mohan Boddu
be86049af8 Adding F35 key
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-02-09 18:28:17 -05:00
Tomas Hrcka
b00e860556 Setup for rawhide being F34
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2021-02-09 14:16:51 +01:00
Mohan Boddu
5f412bc205 Blocking perl-bootstrap:*, rust:*, rpm:* modules
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-02-02 01:36:28 +00:00
Kevin Fenzi
8242fb1d09 Currently we aren't hardlinking a lot of content:
aarch64 isn't hardlinked with the rest of primary
rawhide and branched aren't hardlinked together
* other bits more than likely aren't hardlinked.

So, lets try and hardlink content after we sync it here.
This may be too i/o intensive or slow to keep, but we can
try it for a few days and see how bad it is.

Signed-off-by: Kevin Fenzi kevin@scrye.com

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-02-02 01:33:34 +00:00
Kevin Fenzi
1c53ebd0fc Add glx-utils to multilib whitelist
See https://pagure.io/pungi-fedora/issue/849

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-01-28 12:41:12 -08:00
Kevin Fenzi
872880945c Add python3.9-debuginfo (and any later python) to additional packages.
See https://pagure.io/pungi/issue/1460 for why this is needed.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2021-01-11 15:19:58 -08:00
Mohan Boddu
21b66131c4 Moving git default branches to main
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-01-06 12:18:58 -05:00
Mohan Boddu
aaceab80a3 Fix KDE armhfp image subvariant
This is to fix the composes sync to PDC as both the live_media and
live_images have same metadata and that is causing the sync issues

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2021-01-04 10:38:40 -05:00
Kevin Fenzi
92457e7e72 Xfce aarch64 image is running out of space. For now, just increase it.
We will investigate lowering size requirements when able.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2020-12-26 14:47:42 -08:00
Artem Polishchuk
02c6497a42 Making mangohud and vkBasalt multilib whitelist
fix: #811

Signed-off-by: Artem Polishchuk <ego.cordatus@gmail.com>
2020-12-21 15:43:59 +00:00
Neal Gompa
b334f82fa3 Add Fedora KDE ARM builds
This adds disk and ISO builds for AArch64 based on the configuration
used for Fedora Workstation.

Reference: https://fedoraproject.org/wiki/Changes/AArch64_KDE_Plasma_Desktop_image

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
2020-12-09 08:24:07 -05:00
Paul Whalen
0a2a083ac9 Bump arm minimal disk image to fix failure.
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2020-12-01 13:50:36 -05:00
Kevin Fenzi
6938adccf0 bump cloud_base disk size to 5gb from 4gb
We really need to figure out whats grown here, but in the mean time we
just need to get a compose out, so increase the size here.

The aarch64 one went past 4gb.
see: https://koji.fedoraproject.org/koji/taskinfo?taskID=56316220

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2020-11-27 09:48:19 -08:00
Adam Williamson
19eafa1737 Make Server non-failable again
It was made failable in #382, back in 2017, as part of the
Modular Server effort that was eventually abandoned, with the
idea being that Modular Server would be blocking instead. But
when Modular Server was abandoned, we never reverted this change
to make Server non-failable again...

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2020-11-06 10:12:50 -08:00
Mohan Boddu
231355945e Fix Xfce armhfp image subvariant
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-10-27 15:36:08 -04:00
Mohan Boddu
73664a12d7 Fix Server armhfp image subvariant
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-10-27 14:15:59 -04:00
Lubomír Sedlář
5374885f24 Make subvariant of armhfp appliances unique
When not specified, subvariant defaults to the variant. This leads to
both armhfp appliance and image_build based raw.xz image to have
identical metadata. A file with such issue can not be loaded by
productmd parser.

Due to another issue (that should be fixed in next Pungi release), the
paths to image directories are not listed in composeinfo.json file. The
compose-partial-copy script therefore has to find out if images should
be copied from the image metadata. And since there's an error in it, it
doesn't see the images and doesn't copy them.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
2020-10-26 15:28:46 +01:00
Bohdan Khomutskyi
3636f5f03d Specify squashfs-only in lorax_options
Setting this option will reduce both BOOT.iso and DVD image size
This patch is related to the following change proposal:
https://fedoraproject.org/wiki/Changes/OptimizeSquashFSOnDVDByRemovingEXT4FilesystemImageLayer

Bugzilla ticket:
https://bugzilla.redhat.com/show_bug.cgi?id=1889898

Resolves: rhbz#1889898
Signed-off-by: Bohdan Khomutskyi <bkhomuts@redhat.com>
2020-10-23 15:16:04 +02:00
Kalev Lember
761826e395 Switch to F33 flatpak runtime for Silverblue
All preinstalled flatpak apps are rebuilt and based on the F33 flatpak
runtime now.

Signed-off-by: Kalev Lember <klember@redhat.com>
2020-10-05 18:09:23 +02:00
Mohan Boddu
459cdb4ec5 Revert "Specify the squashfs-only in the lorax_options"
This reverts commit 4c5ce9fb5d.

This is a one time thing to test it out. We will add it back once the
change is approved

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-09-25 11:23:43 -04:00
Bohdan Khomutskyi
4c5ce9fb5d Specify the squashfs-only in the lorax_options
This will reduce both the BOOT.iso and the DVD medium size
This modification relates to the following change proposal:
https://fedoraproject.org/wiki/Category:Changes/OptimizeSquashFS

The new option should work for Pungi version 4.24 and above

Jira: RHELCMP-693
Signed-off-by: Bohdan Khomutskyi <bkhomuts@redhat.com>
2020-09-24 13:09:11 +00:00
Dusty Mabe
4a664ab4f9
cloud: switch imagebuild for GCP image to tar-gz format
It turns out koji doesn't know about `gce` even though ImageFactory
does. Really all we need is the output disk image to be a tar.gz so
let's try with the `tar-gz` format in koji, which looks like it was
intended for use with GCP.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2020-09-21 14:19:46 -04:00
Dusty Mabe
b4b0781b78
cloud: drop VMDK output image for cloud
We added this so we could eventually use the VMDK to optimize our
uploads to AWS but it turns out the VMDK created by imagefactory
isn't in the right format anyway.

```
SNAPSHOTTASKDETAIL      0.0     VMDK    deleted ClientError: Disk validation failed [Unsupported VMDK File Format]
```

Let's drop them for now.

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2020-09-17 10:24:31 -04:00
Dusty Mabe
783f489ad7
cloud: add image build for GCP
Depends on the kickstart for GCP getting merged:
https://pagure.io/fedora-kickstarts/pull-request/690#

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2020-09-17 00:00:31 -04:00
Mohan Boddu
1205e45fd4 Revert "Specify the squashfs-only in the lorax_options"
Extension to https://pagure.io/pungi-fedora/c/823feae10e1d391412565fb81cd82002af69bf17?branch=master

This reverts commit 41e3e364ab.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-09-09 16:44:40 -04:00
Mohan Boddu
823feae10e Revert "Specify the configuration_file in lorax_options"
This is one off thing we wanted to try, now reverting the change

This reverts commit 20100fa544.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-09-08 21:34:24 -04:00
Bohdan Khomutskyi
20100fa544 Specify the configuration_file in lorax_options
Usage of this option should reduce both the BOOT.iso and the DVD medium size.
This is because the LiveOS/squashfs.img will be compressed better by using
a bigger dictionary size. 1MiB is the maximum allowed for SquashFS currently.

This modification relates to the following change proposal:
https://fedoraproject.org/wiki/Category:Changes/OptimizeSquashFS

The result of it should be similar as in the following example DVD:
https://khomutsky.com/fedora-dvd/Fedora-Workstation-x86_64-31-1.9.bkhomuts-squashfs-ext4-xz-1M.iso

I have tested the above mentioned DVD myself to confirm that the installation
succeeds. You can see other test results in the change proposal.

Note, that this is only one part of the change proposal.
A second part is documented at this URI: https://pagure.io/pungi-fedora/pull-request/871

The new option requires Pungi 4.2.4 that will be released soon.

Jira: RHELCMP-693
Signed-off-by: Bohdan Khomutskyi <bkhomuts@redhat.com>
2020-09-08 16:37:09 +02:00
Bohdan Khomutskyi
41e3e364ab Specify the squashfs-only in the lorax_options
This will reduce both the BOOT.iso and the DVD medium size
This modification relates to the following change proposal:
https://fedoraproject.org/wiki/Category:Changes/OptimizeSquashFS

The new option should work for Pungi version 4.24 and above

Jira: RHELCMP-693
Signed-off-by: Bohdan Khomutskyi <bkhomuts@redhat.com>
2020-09-08 16:30:32 +02:00
Stephen Gallagher
034c7fffe0
Drop libreoffice from Server DVD
Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-09-04 09:23:52 -04:00
Stephen Gallagher
83de2466a3
Include all langpacks on Server DVD
Resolves: rhbz#1872511

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2020-09-04 09:23:16 -04:00
Mohan Boddu
d1906c27b9 Revert "Specify the squashfs-only in the lorax_options"
This is causing rawhide failures and @bkhomuts is working on it

https://pagure.io/pungi-fedora/pull-request/871#comment-129206

This reverts commit 98aa497267.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-08-28 10:02:40 -04:00
Bohdan Khomutskyi
98aa497267 Specify the squashfs-only in the lorax_options
This will reduce both the BOOT.iso and the DVD medium size
This modification relates to the following change proposal:
https://fedoraproject.org/wiki/Category:Changes/OptimizeSquashFS

The new option should work for Pungi version 4.24 and above

Jira: RHELCMP-693
Signed-off-by: Bohdan Khomutskyi <bkhomuts@redhat.com>
2020-08-25 18:18:27 +02:00
Paul Whalen
d998f2ec5a Move aarch64 workstation rsync to primary, remove from alt.
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2020-08-17 16:50:31 -04:00
Mohan Boddu
b80e675dd6 Just use F34 (current rawhide) key
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-08-12 19:16:39 -04:00
Tomas Hrcka
c7739bf877 Setup for rawhide being F34
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2020-08-11 14:07:15 +02:00
Owen W. Taylor
e2669c2b95 ostree installer: Add dbus-daemon to extra_runroot_packages
The flatpak embedding process needs to run a local DBus session so that
flatpak can talk to flatpak-oci-authenticator to authenticate (no-op)
to registry.fedoraproject.org.

https://pagure.io/fedora-lorax-templates/pull-request/47
Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2020-07-15 11:29:15 -04:00
Paul Whalen
2b5eae9771 Add aarch64 workstation live
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2020-06-30 11:25:42 -04:00
Mohan Boddu
f30d917d18 Porting the nightly.sh script to fedora messaging
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-06-15 12:19:24 -04:00
Tomas Popela
599e543773 Preinstall Sushi Flatpak on Silverblue
It's preinstalled on Workstation as well.

Signed-off-by: Tomas Popela <tpopela@redhat.com>
2020-05-25 12:29:48 +00:00
Mohan Boddu
f1c410c4f0 Making dssi-vst-wine multilib whitelist and other changes
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-05-14 17:59:52 -04:00
Mohan Boddu
3038e402fc Making mp multilib blacklist
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-05-12 14:19:48 -04:00
Mohan Boddu
cd3f7647ec Adding back ppc64le and s390x for vmdk cloud images
Since they had to be seperated, koji tried to generate two images of
same name and it failed. We decided to revert it and check with pungi
folks for a better solution.

https://pagure.io/releng/failed-composes/issue/1372

Revert "Removing ppc64le and s390x vmdk cloud images"

This reverts commit 46b1711d1d.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-04-30 14:37:29 -04:00
Mohan Boddu
46b1711d1d Removing ppc64le and s390x vmdk cloud images
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-04-28 11:39:46 -04:00
Kalev Lember
ee09267fef Add file-roller flatpak to Silverblue
This matches Workstation where file-roller rpm is installed by default.

https://bugzilla.redhat.com/show_bug.cgi?id=1824075

Signed-off-by: Kalev Lember <klember@redhat.com>
2020-04-15 10:57:10 +02:00
Mohan Boddu
95fb8fd49c Set umask to 0002 for ostree operations
See https://github.com/ostreedev/ostree/pull/1984 where OSTree was
changed to try to set group write on directories. We need to set a more
permissive umask to take advantage of it.

This is all done to support writing to the OSTree repo from OpenShift
projects that run as a random UID, but have ftpsync (gid:263) in their
supplemental groups. For more context see: https://pagure.io/releng/issue/8811#comment-629051

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-04-08 17:22:57 -04:00
Kalev Lember
aeef32b50d Switch to pre-installing F32 flatpak runtime for Silverblue
Signed-off-by: Kalev Lember <klember@redhat.com>
2020-04-02 22:57:14 +02:00
Dan Horák
9fc07170ae workstation disk image - omit ppc64le, the image's kickstart has requires arm/aarch64 specific package
fixes: https://pagure.io/releng/issue/9279

Signed-off-by: Dan Horák <dan@danny.cz>
2020-03-17 16:43:06 +01:00
Dan Horák
c5d5e06868 silverblue - don't require flatpak infra on aarch64 and ppc64le as it doesn't exist (yet)
fixes: https://pagure.io/releng/issue/9320

Signed-off-by: Dan Horák <dan@danny.cz>
2020-03-17 16:42:42 +01:00
Kevin Fenzi
ac35b688e1 https://fedoraproject.org/wiki/Changes/ARM_Release_Criteria_Changes
Make armv7 Xfce failable and mark aarch64 Workstation non failable.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2020-03-09 15:57:32 +00:00
Mohan Boddu
b78189424d Revert "Disable rawhide syncing to test https://pagure.io/releng/issue/9246"
openh264 repo is enabled and is not installed in any images.

This reverts commit b18d9104bd.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-03-04 15:23:00 -05:00
Mohan Boddu
b18d9104bd Disable rawhide syncing to test https://pagure.io/releng/issue/9246
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-03-03 15:23:53 -05:00
Kevin Fenzi
9f755903c4 just use the f33 key for rawhide, everything is now signed
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2020-02-15 20:45:59 -08:00
Mohan Boddu
ee58c06879 Setup for rawhide being F33
This needs changes to add f33 key.
It will be added later once everything is signed with f33 key.

Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2020-02-11 10:25:38 -05:00
Kevin Fenzi
d35e18e8a5 Drop some config options that are no longer used.
WARNING: Config option release_is_layered was removed and has no effect;
remove it. It's layered if there's configuration for base product.
WARNING: Config option runroot was removed and has no effect; remove it.
Please specify 'runroot_method' if you want to enable runroot, otherwise run
things locally.
WARNING: Config option bootable was removed and has no effect; remove it.
Setting buildinstall_method option if you want a bootable installer.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-12-02 07:43:40 -08:00
Kevin Fenzi
9f2c5c7209 Revert "Temporarily mark aarch64 Cloud-Base to be failable in order to get some composes out."
This reverts commit c5d4dfdcc4.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-11-06 09:15:21 -08:00
Kalev Lember
97141b2cce Update the flatpak runtime used for flatpak apps
Switch from F30 runtime to F31 as all the apps that are preinstalled
have now been rebuilt against the new runtime.

Signed-off-by: Kalev Lember <klember@redhat.com>
2019-11-05 13:00:46 +01:00
Mohan Boddu
29e5b9e852 Fixing missing comma
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-11-04 13:23:37 -05:00
Kevin Fenzi
73dd43f723 Increase default boot.iso (uncompressed) fs size to 3gb.
We are now seeing aarch64 and x86_64 failures with the default 2gb.
Ideally one of the minimzation efforts could help us here.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-11-04 09:16:30 -08:00
Kevin Fenzi
c12199cab4 Up createrepo_num_workers to 10 from default 3 to see if it improves compose times.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-11-02 13:49:10 -07:00
Kevin Fenzi
c5d4dfdcc4 Temporarily mark aarch64 Cloud-Base to be failable in order to get some composes out.
aarch64 cloud is blocking, but it's hitting:
https://bugzilla.redhat.com/show_bug.cgi?id=1722181
and failing the composes. Due to other issues we haven't had composes
for a while before that either, so it's getting to be a long time.
Hopefully some workaround will at least appear in a few days.
If not, we can revert this and start failing again for a while.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-10-21 10:03:12 -07:00
Owen W. Taylor
40172700d4 Fix case for some Flatpak names
org.gnome.Clocks => org.gnome.clocks
 org.gnome.evince => org.gnome.Evince

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2019-10-18 10:18:35 -04:00
Owen W. Taylor
c8d5de1798 ostree-installer: download Flatpaks from registry-no-cdn.fedoraproject.org
The koji runroot used for to create the OSTree installer has no access
to external networks, so use a special hostname for registry.fedoraproject.org
that suppresses the redirects to the CDN that would normally happen for
blob downloads.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2019-10-16 15:09:47 -04:00
Nicolas Chauvet
b7d193c942 Drop bash-devel.i686 from x86_64 repo - rhbz#1761777
Signed-off-by: Nicolas Chauvet <kwizart@gmail.com>
2019-10-16 08:42:57 +02:00
Ankur Sinha (Ankur Sinha Gmail)
9af87efd16
Add volume id subst for Comp Neuro Lab
Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
2019-10-15 20:25:53 +01:00
Ankur Sinha (Ankur Sinha Gmail)
0e0d836779
Add Comp Neuro lab
Signed-off-by: Ankur Sinha (Ankur Sinha Gmail) <sanjay.ankur@gmail.com>
2019-10-15 20:25:31 +01:00
Owen W. Taylor
434ef6231a Add 'flatpak' to the set of packages for the ostree-installer runroot
Use a newly added Pungi option (https://pagure.io/pungi/pull-request/1278),
so that flatpak is in the Silverblue ostree-installer runroot, which is
needed for embedding Flatpaks in the Silverblue image.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2019-10-15 10:43:09 -04:00
Owen W. Taylor
c728ed5f0d Include the template necessary to embed Flatpaks
The last change set the template variables for embedding Flatpaks,
but didn't actually include the necessary template.

Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2019-10-09 11:10:28 -04:00
Owen W. Taylor
560acd5784 Embed applications into the Silverblue installer image (Rawhide)
A long-term goal of Silverblue has been moving applications that
were previously part of the Workstation image into Flatpaks.
At this point, we many of the applications that were removed from
Silverblue available as Fedora Flatpaks, and we have the necessary
Anaconda support, so we should update the Silverblue images to include
the runtime and applications.

This is currently x86_64 only, since we don't have a working OSBS
cluster to build containers for aarch64 or ppc64le.

Note that Fedora Flatpaks are single-stream, so this embeds the
F30 runtime and applications into the Rawhide installer image. When
the applications are released for F31, the embedded runtime will
need to be updated.

Requires: https://pagure.io/fedora-lorax-templates/pull-request/40
Signed-off-by: Owen W. Taylor <otaylor@fishsoup.net>
2019-10-02 11:23:12 -04:00
Kevin Fenzi
77929ac87d Only pull in dracut package not all it's subpackages.
Partly revert commit e25f2baaa1
instead of pulling in dracut* (dracut and all it's subpackages), just
pull in the main one. This should hopefully fix
https://bugzilla.redhat.com/show_bug.cgi?id=1734179

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-09-10 12:06:18 -07:00
Kevin Fenzi
af34003f97 livemedia / ppc64le: make ppc64le live media failable for now.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-08-30 18:53:55 -07:00
Mohan Boddu
07042cf0d7 Merge #755 Build Workstation ISO and Live medias for ppc64le
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-08-30 17:34:30 +00:00
Kevin Fenzi
6c05c18c02 drop publishing i686 trees ( https://fedoraproject.org/wiki/Releases/31/ChangeSet#No_i686_Repositories )
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-08-26 09:55:40 -07:00
Paul Whalen
2fe5d47c5c Readd arm-tools group to server variant
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2019-08-22 13:11:43 -04:00
Peter Robinson
f89ba2ebd8 Xfce aarch64: inc to 8Gb
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
2019-08-21 17:14:00 +01:00
Peter Robinson
29af841fb3 Merge #753 Add AArch Xfce spin disk image
Signed-off-by: Peter Robinson <pbrobinson@fedoraproject.org>
2019-08-19 11:54:42 +00:00
John Doe
597cc0d365 Build Workstation ISO and Live medias for ppc64le
Signed-off-by: John Doe <dftxbs3e@free.fr>
2019-08-16 20:59:59 +02:00
Paul Whalen
142a6a5967 Add AArch Xfce spin disk image
Signed-off-by: Paul Whalen <pwhalen@fedoraproject.org>
2019-08-14 13:17:53 -04:00
Dusty Mabe
e86a05a198
Make fedora arm Workstation build use Everything repo
See https://pagure.io/releng/issue/7403#comment-589408

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2019-08-14 09:40:41 -04:00
Mohan Boddu
a81b1e477c Adding F32 key for rawhide composes
Signed-off-by: Mohan Boddu <mboddu@bhujji.com>
2019-08-13 18:27:15 -04:00
Tomas Hrcka
95ddef99fa Use f32 to sync containers
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2019-08-13 18:52:05 +02:00
Tomas Hrcka
547c2b66ab f32 becomes rawhide
Signed-off-by: Tomas Hrcka <thrcka@redhat.com>
2019-08-13 09:37:39 +02:00
Dusty Mabe
1e32ca83c2
Use Everything install tree for Workstation live media
I think this should fix the failure in:
https://pagure.io/dusty/failed-composes/issue/2243

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2019-08-09 13:01:10 -04:00
Dusty Mabe
ab2c136507
stop building Workstation repo
Similar to what we did for Cloud (6eecb53) we need to stop building
Workstation repos so we can speed up our compose times (see [1]).
We already switched to sourcing from the Everything repo (39683dd).
Now we just need to stop building the repo. This commit makes it so
that we will no longer build the yum repo for Workstation.

[1] https://pagure.io/releng/issue/7403

Signed-off-by: Dusty Mabe <dusty@dustymabe.com>
2019-08-06 12:23:59 -04:00
Stephen Gallagher
5a45d5338a
Server: match the contents of the DVD
For some reason, the DVD is being produced with all of the content
from this compose, rather than the smaller subset listed in
fedora-disk-server-kickstart.ks, so we should reduce this compose
to match the intended contents of the DVD. Network-enabled
installations will still use the Everything repo.

Signed-off-by: Stephen Gallagher <sgallagh@redhat.com>
2019-07-24 13:29:38 -04:00
Kevin Fenzi
68ce74f597 fedora.conf: Disable i386 buildinstall creation.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-07-22 11:34:02 -07:00
Kevin Fenzi
8632fcba13 remove old pdc entries in fedora.conf. They are no longer used
Should fix:

WARNING: Config option pdc_url was removed and has no effect; Koji is
queried instead.
WARNING: Config option pdc_develop was removed and has no effect; Koji
is queried instead.
WARNING: Config option pdc_insecure was removed and has no effect; Koji
is queried instead.

in rawhide composes.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-07-13 09:32:53 -07:00
Kevin Fenzi
8ba80a5e10 Drop i386 images and things that need a kernel, leave modular and Everything trees.
Signed-off-by: Kevin Fenzi <kevin@scrye.com>
2019-07-12 09:24:15 -07:00
Clement Verna
740dae96b0 Set the container environment variable to oci.
Certain applications are using the container env variable to
know if they are running in a container or not. This is making sure
we have this define in the fedora base image..

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1399507

Signed-off-by: Clement Verna <cverna@tutanota.com>
2019-07-10 20:53:23 +02:00
10 changed files with 900 additions and 607 deletions

View File

@ -13,11 +13,11 @@ DEST=$(pwd)
DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-Cloud"
RELEASE="29"
RELEASE_TITLE="29"
COMPSFILE="comps-f29.xml"
RELEASE="40"
RELEASE_TITLE="40"
COMPSFILE="comps-f40.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
TOMAIL="test-reports@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

View File

@ -12,11 +12,11 @@ DEST=$(pwd)
DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-Docker"
RELEASE="29"
RELEASE_TITLE="29"
COMPSFILE="comps-f29.xml"
RELEASE="40"
RELEASE_TITLE="40"
COMPSFILE="comps-f40.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
TOMAIL="test-reports@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-$SHORT-$RELEASE_TITLE/COMPOSE_ID)

View File

@ -1,43 +1,33 @@
# Import general configuration from general.conf
from general import *
# Import multilib configuration from multilib.conf
from multilib import *
# PRODUCT INFO
release_name = 'Fedora-Cloud'
release_short = 'Fedora-Cloud'
release_version = '29'
release_is_layered = False
release_version = '40'
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS
bootable = False
comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-f29.xml',
'command': 'make comps-f29.xml'
'branch': 'main',
'file': 'comps-f40.xml',
'command': 'make comps-f40.xml'
}
variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
sigkeys = ['a15B79cc'] # None = unsigned
# limit tree variants
# if undefined, all variants from variants.xml will be included
tree_variants = ['Cloud']
hashed_directories = True
# RUNROOT settings
runroot = True
#runroot_channel = 'fedora_compose'
runroot_channel = 'compose'
runroot_tag = 'f29-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f29-updates'
pkgset_koji_tag = 'f40-updates'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
gather_source = 'comps'
gather_method = 'deps'
gather_profiler = True
check_deps = False
greedy_method = 'build'
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
# gather_lookaside_repos = []
# GATHER - JSON
@ -47,11 +37,7 @@ greedy_method = 'build'
createrepo_c = True
createrepo_checksum = 'sha256'
# CHECKSUMS
media_checksums = ['sha256']
media_checksum_one_file = True
media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
#jigdo
create_jigdo = False
#extra_packages = [
# '/mnt/packages/foo*',
#]
@ -91,11 +77,6 @@ additional_packages = [
}),
]
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
})
]
filter_packages = [
('(Workstation|Server)$', {
'*': [
@ -114,26 +95,6 @@ filter_packages = [
]
}),
]
# format: {arch|*: [packages]}
multilib_blacklist = {
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
'php-devel', 'java-*',
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
],
}
# format: {arch|*: [packages]}
multilib_whitelist = {
'*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
'mariadb-connector-odbc', 'compiler-rt'
],
}
createiso_skip = [
('^Workstation$', {
@ -174,58 +135,25 @@ image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(dat
image_volid_formats = [
'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
]
# No special handling for layered products, use same format as for regular images
image_volid_layered_product_formats = []
# Replace 'Cloud' with 'C' in volume id etc.
volume_id_substitutions = {
'Beta': 'B',
'Rawhide': 'rawh',
'Astronomy_KDE': 'AstK',
'Silverblue': 'SB',
'Cinnamon': 'Cinn',
'Cloud': 'C',
'Design_suite': 'Dsgn',
'Electronic_Lab': 'Elec',
'Everything': 'E',
'Games': 'Game',
'Images': 'img',
'Jam_KDE': 'Jam',
'MATE_Compiz': 'MATE',
# Note https://pagure.io/pungi-fedora/issue/533
'Python-Classroom': 'Clss',
'Python_Classroom': 'Clss',
'Robotics': 'Robo',
'Scientific_KDE': 'SciK',
'Security': 'Sec',
'Server': 'S',
'-Workstation-': '-WS-',
}
disc_types = {
'boot': 'netinst',
'live': 'Live',
}
translate_paths = [
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
]
image_build = {
'^Cloud$': [
{
'image-build': {
'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],
'name': 'Fedora-Cloud-Base',
'target': 'f29',
'version': '29',
'target': 'f40',
'version': '40',
'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
'kickstart': 'fedora-cloud-base.ks',
'distro': 'Fedora-22',
'disk_size': 4,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base'
}
},
@ -233,22 +161,42 @@ image_build = {
'image-build': {
'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]
'name': 'Fedora-Cloud-Base-Vagrant',
'target': 'f29',
'version': '29',
'target': 'f40',
'version': '40',
'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29',
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
'kickstart': 'fedora-cloud-base-vagrant.ks',
'distro': 'Fedora-22',
'disk_size': 40,
'arches': ['x86_64'],
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base',
}
},
{
'image-build': {
'format': [('vpc','vpc')],
'name': 'Fedora-Cloud-Base-Azure',
'target': 'f40',
'version': '40',
'release': None,
'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40',
'kickstart': 'fedora-cloud-base-azure.ks',
'distro': 'Fedora-30',
'disk_size': 10,
'arches': ['aarch64', 'x86_64'],
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'subvariant': 'Cloud_Base'
}
},
],
}
koji_profile = 'compose_koji'

View File

@ -1,43 +1,31 @@
# Import general configuration from general.conf
from general import *
# Import multilib configuration from multilib.conf
from multilib import *
# PRODUCT INFO
release_name = 'Fedora-Container'
release_short = 'Fedora-Container'
release_version = '29'
release_is_layered = False
release_version = '40'
skip_phases = ["buildinstall", "productimg", "pkgset", "gather", "extra_files", "createrepo"]
# GENERAL SETTINGS
bootable = False
comps_file = {
'scm': 'git',
'repo': 'https://pagure.io/fedora-comps.git',
'branch': 'master',
'file': 'comps-f29.xml',
'command': 'make comps-f29.xml'
'branch': 'main',
'file': 'comps-f40.xml',
'command': 'make comps-f40.xml'
}
variants_file='variants-fedora.xml'
sigkeys = ['429476B4'] # None = unsigned
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
tree_arches = ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64']
sigkeys = ['a15B79cc'] # None = unsigned
# limit tree variants
# if undefined, all variants from variants.xml will be included
tree_variants = ['Container']
hashed_directories = True
# RUNROOT settings
runroot = True
#runroot_channel = 'fedora_compose'
runroot_channel = 'compose'
runroot_tag = 'f29-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
pkgset_koji_tag = 'f29-updates'
pkgset_koji_tag = 'f40-updates'
pkgset_koji_inherit = True
filter_system_release_packages = False
# GATHER
gather_source = 'comps'
gather_method = 'deps'
gather_profiler = True
check_deps = False
greedy_method = 'build'
# fomat: [(variant_uid_regex, {arch|*: [repos]})]
# gather_lookaside_repos = []
# GATHER - JSON
@ -47,11 +35,7 @@ greedy_method = 'build'
createrepo_c = True
createrepo_checksum = 'sha256'
# CHECKSUMS
media_checksums = ['sha256']
media_checksum_one_file = True
media_checksum_base_filename = 'Fedora-%(variant)s-%(version)s-%(date)s.%(respin)s-%(arch)s'
#jigdo
create_jigdo = False
#extra_packages = [
# '/mnt/packages/foo*',
#]
@ -91,11 +75,6 @@ additional_packages = [
}),
]
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
})
]
filter_packages = [
('(Workstation|Server)$', {
'*': [
@ -114,26 +93,6 @@ filter_packages = [
]
}),
]
# format: {arch|*: [packages]}
multilib_blacklist = {
'*': ['kernel', 'kernel-PAE*', 'kernel*debug*',
'dmraid-devel', 'kdeutils-devel', 'mkinitrd-devel',
'php-devel', 'java-*',
'httpd-devel', 'tomcat-native', 'php*', 'httpd',
'krb5-server', 'krb5-server-ldap', 'mod_*', 'ghc-*'
],
}
# format: {arch|*: [packages]}
multilib_whitelist = {
'*': ['libgnat', 'wine', 'lmms-vst', 'nspluginwrapper',
'libflashsupport', 'valgrind', 'perl-libs', 'redhat-lsb',
'yaboot', 'syslinux-extlinux-nonlinux', 'syslinux-nonlinux',
'syslinux-tftpboot', 'nosync', '*-static', 'apitrace-libs',
'fakeroot-libs', 'postgresql-odbc', 'mysql-connector-odbc',
'fakechroot-libs','mesa-vdpau-drivers', 'p11-kit-trust',
'mariadb-connector-odbc', 'compiler-rt'
],
}
createiso_skip = [
('^Workstation$', {
@ -174,45 +133,12 @@ image_name_format = 'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s-%(dat
image_volid_formats = [
'Fedora-%(variant)s-%(disc_type)s-%(arch)s-%(version)s'
]
# No special handling for layered products, use same format as for regular images
image_volid_layered_product_formats = []
# Replace 'Cloud' with 'C' in volume id etc.
volume_id_substitutions = {
'Beta': 'B',
'Rawhide': 'rawh',
'Astronomy_KDE': 'AstK',
'Silverblue': 'SB',
'Cinnamon': 'Cinn',
'Cloud': 'C',
'Design_suite': 'Dsgn',
'Electronic_Lab': 'Elec',
'Everything': 'E',
'Games': 'Game',
'Images': 'img',
'Jam_KDE': 'Jam',
'MATE_Compiz': 'MATE',
# Note https://pagure.io/pungi-fedora/issue/533
'Python-Classroom': 'Clss',
'Python_Classroom': 'Clss',
'Robotics': 'Robo',
'Scientific_KDE': 'SciK',
'Security': 'Sec',
'Server': 'S',
'-Workstation-': '-WS-',
}
disc_types = {
'boot': 'netinst',
'live': 'Live',
}
translate_paths = [
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
]
# These will be inherited by live_media, live_images and image_build
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f29'
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f40'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '29'
global_target = 'f29'
global_version = '40'
global_target = 'f40'
image_build = {
'^Container$': [
@ -223,19 +149,19 @@ image_build = {
'kickstart': 'fedora-container-base.ks',
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
],
'subvariant': 'Container_Base'
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
},
},
{
@ -245,19 +171,41 @@ image_build = {
'kickstart': 'fedora-container-base-minimal.ks',
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/',
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f29-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/29/latest-Fedora-29/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
],
'subvariant': 'Container_Minimal_Base',
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f29container", "FGC=f29" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "29"}',
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
},
},
{
'image-build': {
'format': [('docker', 'tar.xz')],
'name': 'Fedora-Container-Toolbox',
'kickstart': 'fedora-container-toolbox.ks',
'distro': 'Fedora-22',
'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/',
'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f40-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/40/latest-Fedora-40/compose/Everything/$arch/os/'
],
'subvariant': 'Container_Toolbox',
},
'factory-parameters': {
'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f40container", "FGC=f40", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "40"}',
},
}
],

File diff suppressed because it is too large Load Diff

83
general.conf Normal file
View File

@ -0,0 +1,83 @@
# GENERAL SETTINGS
variants_file='variants-fedora.xml'
# limit tree architectures
# if undefined, all architectures from variants.xml will be included
tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']
hashed_directories = True
# RUNROOT settings
runroot_channel = 'compose'
runroot_tag = 'f40-build'
# PKGSET
pkgset_source = 'koji' # koji, repos
filter_system_release_packages = False
# GATHER
check_deps = False
greedy_method = 'build'
# CHECKSUMS
media_checksums = ['sha256']
media_checksum_one_file = True
#jigdo
create_jigdo = False
# MULTILIB
multilib = [
('^Everything$', {
'x86_64': ['devel', 'runtime'],
})
]
# ISO IMAGE
image_volid_layered_product_formats = []
# Used by Pungi to replace 'Cloud' with 'C' (etc.) in ISO volume IDs.
# There is a hard 32-character limit on ISO volume IDs, so we use
# these to try and produce short enough but legible IDs. Note this is
# duplicated in Koji for live images, as livemedia-creator does not
# allow Pungi to tell it what volume ID to use. Note:
# https://fedoraproject.org/wiki/User:Adamwill/Draft_fedora_image_naming_policy
# '-Workstation-' is a temporary workaround. See
# https://pagure.io/pungi-fedora/pull-request/525
# Replace 'Cloud' with 'C' in volume id etc.
volume_id_substitutions = {
'Beta': 'B',
'Rawhide': 'rawh',
'Astronomy_KDE': 'AstK',
'Silverblue': 'SB',
'Kinoite': 'Knt',
'Cinnamon': 'Cinn',
'Cloud': 'C',
'Comp_Neuro': 'CNr',
'Design_suite': 'Dsgn',
'Electronic_Lab': 'Elec',
'Everything': 'E',
'Games': 'Game',
'Images': 'img',
'Jam_KDE': 'Jam',
'MATE_Compiz': 'MATE',
'Onyx': 'Onyx',
# Note https://pagure.io/pungi-fedora/issue/533
'Python-Classroom': 'Clss',
'Python_Classroom': 'Clss',
'Robotics': 'Robo',
'Scientific_KDE': 'SciK',
'Security': 'Sec',
'Sericea': 'Src',
'Server': 'S',
'-Workstation-': '-WS-',
}
disc_types = {
'boot': 'netinst',
'live': 'Live',
}
translate_paths = [
('/mnt/koji/compose/', 'https://kojipkgs.fedoraproject.org/compose/'),
]

84
multilib.conf Normal file
View File

@ -0,0 +1,84 @@
# MULTILIB
# Note: If you change something here (affects Rawhide/Branched composes), also
# submit the same change to the Bodhi config (affects updates for stable releases),
# we want to keep them in sync:
# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
#
# format: {arch|*: [packages]}
# Sorted alphabetically
multilib_blacklist = {
'*': [
'bash-devel',
'dmraid-devel',
'ghc-*',
'httpd-core',
'httpd-devel',
'java-*',
'kdeutils-devel',
'kernel',
'kernel*debug*',
'kernel-PAE*',
'krb5-server',
'krb5-server-ldap',
'mkinitrd-devel',
'mod_*',
'mp'
'php*',
'php-devel',
'tomcat-native',
],
}
# Note: If you change something here (affects Rawhide/Branched composes), also
# submit the same change to the Bodhi config (affects updates for stable releases),
# we want to keep them in sync:
# https://pagure.io/fedora-infra/ansible/blob/main/f/roles/bodhi2/backend/templates/pungi.rpm.conf.j2
#
# format: {arch|*: [packages]}
# Sorted alphabetically
multilib_whitelist = {
'*': [
'*-static',
'apitrace-libs',
'compiler-rt',
'dssi-vst-wine',
'fakechroot-libs',
'fakeroot-libs',
'glib-networking',
'glx-utils',
'ibus-gtk2',
'ibus-gtk3',
'ibus-libs',
'iptables',
'libflashsupport',
'libgnat',
'libomp',
'lmms-vst',
'mangohud',
'mariadb-connector-odbc',
'mesa-dri-drivers',
'mesa-va-drivers',
'mesa-vdpau-drivers',
'mesa-vulkan-drivers',
'mysql-connector-odbc',
'nosync',
'nspluginwrapper',
'nvidia-query-resource-opengl-lib',
'p11-kit-trust',
'pam',
'perl-libs',
'pipewire',
'postgresql-odbc',
'redhat-lsb',
'syslinux-extlinux-nonlinux',
'syslinux-nonlinux',
'syslinux-tftpboot',
'systemd-pam',
'valgrind',
'vkBasalt',
'wine',
'wine-*',
'yaboot',
],
}

View File

@ -7,7 +7,7 @@ CONFIG="fedora.conf"
TARGET_DIR="/mnt/koji/compose/rawhide"
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
NIGHTLY="--nightly"
SKIP_PHASES="--skip-phase=productimg"
SKIP_PHASES=""
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
SHORT="Fedora"
@ -15,7 +15,7 @@ RELEASE="rawhide"
RELEASE_TITLE="Rawhide"
COMPSFILE="comps-rawhide.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"
TOMAIL="devel@lists.fedoraproject.org test-reports@lists.fedoraproject.org"
FROM="Fedora Rawhide Report <rawhide@fedoraproject.org>"
RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/fedora/linux/development/$RELEASE"
@ -37,14 +37,14 @@ else
git clone https://pagure.io/releng.git
fi
# Set up our fedmsg function, using the releng repo definition
# Set up our fedora messaging function, using the releng repo definition
FEDMSG_MODNAME="compose"
FEDMSG_CERTPREFIX="releng"
. ./releng/scripts/fedmsg-functions.sh
. ./releng/scripts/fedora-messaging.sh
# Announce that we are starting, even though we don't know the compose_id yet..
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
send_fedmsg "${fedmsg_json_start}" ${RELEASE} start
fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
send_fedora_message "${fedora_message_json_start}" ${RELEASE} start
#pushd $TMPDIR
#git clone https://pagure.io/fedora-comps.git && {
@ -76,13 +76,13 @@ SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')
# Set this to use later for a few items include depcheck
DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID
# Public URLs the synced compose will wind up at, we put them in fedmsgs
# Public URLs the synced compose will wind up at, we put them in fedora-messaging
LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
ALT_LOCATION="https://dl.fedoraproject.org$RSYNCALTTARGET"
SECONDARY_LOCATION="https://dl.fedoraproject.org$RSYNCSECTARGET"
# Update fedmsg template
fedmsg_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION")
fedmsg_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION")
# Update fedora_message template
fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID", "$LOCATION", "$ALT_LOCATION", "$SECONDARY_LOCATION")
fedora_message_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location": "%s", "alt_location": "%s", "secondary_location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$NEWCOMPOSE_ID" "$LOCATION" "$ALT_LOCATION" "$SECONDARY_LOCATION")
# Fix permissions on the grub efi files and fonts (they're 0600)
chmod -R go+r $DESTDIR/compose/*/*/os/EFI/
@ -108,105 +108,125 @@ else
TREENAME="F-$RELEASE"
fi
# disable sending email for now until we are sure we wont generating mass emails
./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches i386 ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
./releng/scripts/spam-o-matic --nomail --treename="$TREENAME" "$DESTDIR/compose/Everything/" --only-arches ppc64le s390x x86_64> "$DESTDIR/logs/depcheck"
[ -z "$ARCH" ] && {
./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
./releng/scripts/critpath.py --composeurl file://$DESTDIR/compose -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log
}
# Tell interested persons that the rsync is starting (zomg!)
send_fedmsg "${fedmsg_json_start}" ${RELEASE} rsync.start
send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
# Sync the content to /pub/fedora
if [ ! -d "$RSYNCTARGET" ]; then
mkdir "$RSYNCTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
# aarch64/x86_64 for Everything Cloud Container Server Workstation is primary
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Cloud --variant Container \
--variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
--variant Everything \
--variant Cloud \
--variant Container \
--variant Server \
--variant Spins \
--variant Silverblue \
--variant Kinoite \
--variant Sericea \
--variant Onyx \
--variant Workstation \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 --arch src \
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 --arch src \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Cloud --variant Container \
--variant Server --variant Spins --variant Workstation --variant Silverblue --variant Modular \
--link-dest="$RSYNCTARGET/Everything" --delete-after
# aarch64 for Everything Server Cloud Container is primary
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server --variant Cloud --variant Container \
--variant Modular \
--link-dest="$RSYNCTARGET/Everything" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCTARGET/" \
--variant Everything --variant Server --variant Cloud --variant Container \
--variant Modular \
--variant Everything \
--variant Cloud \
--variant Container \
--variant Server \
--variant Spins \
--variant Silverblue \
--variant Kinoite \
--variant Sericea \
--variant Onyx \
--variant Workstation \
--link-dest="$RSYNCTARGET/Everything" --delete-after
$RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"
# hardlink content (this will hardlink aarch64 with the other arches)
time hardlink -v "$RSYNCTARGET/.."
# Sync the content to /pub/alt
if [ ! -d "$RSYNCALTTARGET" ]; then
mkdir "$RSYNCALTTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
# labs artefacts are alternative
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 \
"$DESTDIR" "$RSYNCALTTARGET/" \
--variant Labs \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=armhfp --arch=x86_64 \
$RSYNCPREFIX compose-partial-copy --arch=aarch64 --arch=x86_64 \
"$DESTDIR" "$RSYNCALTTARGET/" \
--variant Labs \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"
# hardlink content (this will hardlink aarch64 with the other arches)
time hardlink -v "$RSYNCTARGET/.."
# Sync the content to /pub/fedora-secondary
if [ ! -d "$RSYNCSECTARGET" ]; then
mkdir "$RSYNCSECTARGET"
fi
$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \
# all ppc64le/s390x artefacts are secondary
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Everything --variant Cloud --variant Container \
--variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
--variant Labs --variant Server --variant Spins --variant Workstation \
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=i386 --arch=ppc64le --arch=s390x \
$RSYNCPREFIX compose-partial-copy --arch=ppc64le --arch=s390x \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Everything --variant Cloud --variant Container \
--variant Labs --variant Server --variant Spins --variant Workstation --variant Modular \
--variant Labs --variant Server --variant Spins --variant Workstation \
--link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after
# aarch64 is alternative for Labs Spins Workstation
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Labs --variant Spins --variant Workstation \
--link-dest="$RSYNCTARGET/Everything/" --exclude=repodata
$RSYNCPREFIX compose-partial-copy --arch=aarch64 \
"$DESTDIR" "$RSYNCSECTARGET/" \
--variant Labs --variant Spins --variant Workstation \
--link-dest="$RSYNCTARGET/Everything/" --delete-after
$RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"
$RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"
# sync Silverblue to the unified ostree repo
for arch in x86_64 ppc64le aarch64; do
ref="fedora/rawhide/${arch}/silverblue"
if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
# hardlink content (this will hardlink ppc64le/s390x)
time hardlink -v "$RSYNCSECTARGET/.."
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
ostree summary -u --repo=$OSTREEDESTREPO # update summary file
# sync Silverblue, Kinoite, Sericea, and Onyx to the unified ostree repo
# Set the umask to so directories can get group write
# https://pagure.io/releng/issue/8811
old_umask=$(umask)
umask 0002
for variant in 'silverblue' 'kinoite' 'sericea' 'onyx'; do
for arch in x86_64 ppc64le aarch64; do
ref="fedora/rawhide/${arch}/${variant}"
if ! ostree --repo=$OSTREESRCREPO rev-parse "${ref}"; then continue; fi
ostree pull-local --repo=$OSTREEDESTREPO $OSTREESRCREPO --depth=-1 "${ref}"
ostree summary -u --repo=$OSTREEDESTREPO # update summary file
done
done
# Set to old umask
umask $old_umask
# Push rawhide base container image to fedora registry
# Push rawhide ostree base container image to fedora registry
pushd ./releng
pushd ./scripts
./sync-latest-container-base-image.sh 31
./sync-latest-container-base-image.sh 40
./sync-ostree-base-containers.sh 40
popd
popd
# Tell interested persons that the rsync is done.
send_fedmsg "${fedmsg_json_done}" ${RELEASE} rsync.complete
send_fedora_message "${fedora_message_json_done}" ${RELEASE} rsync.complete
# Tell everyone by fedmsg about the compose
send_fedmsg "${fedmsg_json_done}" ${RELEASE} complete
# Tell everyone by fedora_message about the compose
send_fedora_message "${fedora_message_json_done}" ${RELEASE} complete
# Tell everyone by email about the compose
# "$DESTDIR/logs/depcheck" lets not cat out depcheck for now as it does
@ -219,4 +239,4 @@ done
# Removed all the older than 14 days composes
find $TARGET_DIR -xdev -depth -maxdepth 2 -mtime +14 -exec rm -rf {} \;
send_fedmsg "${fedmsg_json_done}" ${RELEASE} cleanup.complete
send_fedora_message "${fedora_message_json_done}" ${RELEASE} cleanup.complete

View File

@ -1,32 +1,76 @@
#!/bin/sh
export LC_ALL=C
LABEL=$1
# Remove the label from arguments. It gets special treatment. Other arguments
# to the script are passed to pungi-koji directly.
LABEL=$1
shift
CONFIG="fedora-final.conf"
TARGET_DIR="/mnt/koji/compose/26"
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=$TARGET_DIR"
FEDORA_VERSION="${LABEL%%_*}"
TARGET_DIR="/mnt/koji/compose/${FEDORA_VERSION}"
#OLD_COMPOSES_DIR="--old-composes=/mnt/fedora_koji/compose/f23 --old-composes=${TARGET_DIR}"
NIGHTLY=""
SKIP_PHASES="--skip-phase=productimg"
DEST=$(pwd)
DATE=$(date "+%Y%m%d")
COMPSFILE="comps-f26.xml"
TMPDIR=`mktemp -d /tmp/fedoraRC.$DATE.XXXX`
# uncomment and edit for resuming a failed compose
#COMPOSE_ID="Fedora-23-20150530.n.0"
pushd $TMPDIR
COMPSFILE="comps-f39.xml"
TMPDIR=$(mktemp -d /tmp/fedoraRC."${DATE}".XXXX)
RELEASE="f39"
SHORT="Fedora"
RSYNCPREFIX="sudo -u ftpsync"
RSYNCTARGET="/pub/alt/stage/${LABEL}"
# Uncomment and edit for resuming a failed compose, e.g. "COMPOSE_ID="Fedora-23-20150530.n.0"
# COMPOSE_ID="Fedora-23-20150530.n.0"
# Set up our fedora messaging function, using the releng repo definition
FEDMSG_MODNAME="compose"
FEDMSG_CERTPREFIX="releng"
. ./releng/scripts/fedora-messaging.sh
# Announce that we are starting, even though we don't know the compose_id yet..
fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s"}' "$RELEASE" "$ARCH" "$SHORT")
send_fedora_message "${fedora_message_json_start}" ${RELEASE} start
# Public URL the synced compose will wind up at, we put them in fedora-messaging
LOCATION="https://dl.fedoraproject.org$RSYNCTARGET"
# Update fedora_message template
fedora_message_json_start=$(printf '{"log": "start", "branch": "%s", "arch": "%s", "short": "%s", "compose_id": "%s", "location"}' "$RELEASE" "$ARCH" "$SHORT" "$LOCATION")
fedora_message_json_done=$(printf '{"log": "done", "branch": "%s", "arch": "%s", "short": "%s", "location": "%s"}' "$RELEASE" "$ARCH" "$SHORT" "$LOCATION")
pushd "${TMPDIR}"
git clone https://pagure.io/fedora-comps.git && {
pushd fedora-comps
make "${COMPSFILE}"
cp "${COMPSFILE}" $DEST/
cp "${COMPSFILE}" "${DEST}"/
popd
}
popd
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification --config=$CONFIG --old-composes=$TARGET_DIR $OLD_COMPOSES_DIR $NIGHTLY $SKIP_PHASES --label=$LABEL"
if [ -z "$COMPOSE_ID" ]; then
CMD="$CMD --target-dir=$TARGET_DIR"
CMD="pungi-koji --notification-script=/usr/bin/pungi-fedmsg-notification \
--notification-script=pungi-wait-for-signed-ostree-handler \
--config=${CONFIG} --old-composes=${TARGET_DIR} ${OLD_COMPOSES_DIR} ${NIGHTLY} ${SKIP_PHASES} \
--label=${LABEL}"
if [ -z "${COMPOSE_ID}" ]; then
CMD="${CMD} --target-dir=${TARGET_DIR}"
else
CMD="$CMD --debug-mode --compose-dir=$TARGET_DIR/$COMPOSE_ID"
CMD="${CMD} --debug-mode --compose-dir=${TARGET_DIR}/${COMPOSE_ID}"
fi
time $CMD "$@"
time "$CMD" "$@"
# Tell interested persons that the rsync is starting
send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start
if [ ! -d "${RSYNCTARGET}" ]; then
$(RSYNCPREFIX) mkdir -m 750 -p "${RSYNCTARGET}"
fi
# Note from documentation:
# If multiple composes are run like 1.2, 1.3, add multiple --link-dest arguments above with multiple composes
${RSYNCPREFIX} sh -c 'for dir in Everything Cloud Container Kinoite Labs Modular Server Silverblue Spins Workstation Onyx Sericea metadata; do rsync -avhH ${TARGET_DIR}/${COMPOSE_ID}/compose/$dir/ ${RSYNCTARGET}/$dir/ --link-dest=/pub/fedora/linux/development/${FEDORA_VERSION}/Everything/ --link-dest=${RSYNCTARGET}/Everything/; done'
${RSYNCPREFIX} chmod 755 "${RSYNCTARGET}"
# Let interested persons know the rsync is complete
send_fedora_message "${fedora_message_json_done}" ${RELEASE} rsync.complete

View File

@ -22,7 +22,6 @@
<arches>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
@ -30,8 +29,8 @@
</variant>
<variant id="Labs" name="Labs" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch>
</arches>
</variant>
@ -39,7 +38,6 @@
<arches>
<arch>armhfp</arch>
<arch>aarch64</arch>
<arch>i386</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
@ -56,14 +54,6 @@
<group default="true">container-management</group>
<group default="true">domain-client</group>
<group default="true">server-hardware-support</group>
<group default="true">sql-server</group>
<group default="true">web-server</group>
<group default="true">freeipa-server</group>
<group default="true">mail-server</group>
<group default="true">smb-server</group>
<group default="true">virtualization-headless</group>
<group default="true">ansible-node</group>
<group default="true">editors</group>
<group default="true">arm-tools</group>
<!-- Things needed for installation -->
<group default="true">anaconda-tools</group>
@ -78,62 +68,41 @@
<arches>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch>
</arches>
</variant>
<variant id="Workstation" name="Workstation" type="variant">
<variant id="Workstation" name="Workstation" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
</arches>
<groups>
<group default="true">base-x</group>
<group default="true">container-management</group>
<group default="true">core</group>
<group default="true">firefox</group>
<group default="true">fonts</group>
<group default="true">gnome-desktop</group>
<group default="true">guest-desktop-agents</group>
<group default="true">hardware-support</group>
<group default="true">libreoffice</group>
<group default="true">multimedia</group>
<group default="true">networkmanager-submodules</group>
<group default="true">printing</group>
<group default="true">workstation-ostree-support</group>
<group default="true">workstation-product</group>
<group default="true">virtualization</group>
<group default="true">arm-tools</group>
<!-- Things needed for installation -->
<group default="true">anaconda-tools</group>
<group default="true">platform-vmware</group>
</groups>
<environments>
<environment display_order="10">workstation-product-environment</environment>
</environments>
</variant>
<variant id="Silverblue" name="Silverblue" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>armhfp</arch>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
</arches>
</variant>
<variant id="Modular" name="Modular" type="variant">
<variant id="Kinoite" name="Kinoite" type="variant" is_empty="true">
<arches>
<arch>armhfp</arch>
<arch>aarch64</arch>
<arch>i386</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
</arches>
</variant>
<variant id="Sericea" name="Sericea" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
<arch>ppc64le</arch>
</arches>
</variant>
<variant id="Onyx" name="Onyx" type="variant" is_empty="true">
<arches>
<arch>x86_64</arch>
</arches>
<modules>
<kojitag>f31-modular</kojitag>
</modules>
</variant>
</variants>