Skip to content

Commit e70fd15

Browse files
committed
manifests/fedora-coreos: allow python in F43+ for now
nfs-utils-coreos grew a dependency for nfs-utils, which requires python. Let's allow it in rawhide and hopefully the dependency will get cleaned up before it reaches production FCOS streams. xref: coreos/fedora-coreos-tracker#1942 (comment)
1 parent af3d48f commit e70fd15

File tree

3 files changed

+28
-3
lines changed

3 files changed

+28
-3
lines changed

manifests/fedora-coreos.yaml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ conditional-include:
4646
include:
4747
ostree-layers:
4848
- overlay/35oci-migration
49+
# Allow python in F43 for now until nfs package gets fixed.
50+
# https://github.com/coreos/fedora-coreos-tracker/issues/1942#issuecomment-2881075898
51+
- if: releasever < 43
52+
include:
53+
exclude-packages:
54+
- python
55+
- python3
56+
- python3-libs
4957

5058
ostree-layers:
5159
- overlay/15fcos
@@ -158,9 +166,6 @@ remove-files:
158166
# have recommends: false so these could only come in via
159167
# hard requirement, in which case the build will fail.
160168
exclude-packages:
161-
- python
162-
- python3
163-
- python3-libs
164169
- perl
165170
- perl-interpreter
166171
- nodejs

tests/kola/python/data/commonlib.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../data/commonlib.sh

tests/kola/python/test.sh

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
#!/bin/bash
2+
## kola:
3+
## exclusive: false
4+
## description: Make sure python is only pulled in by nfs-utils
5+
## distros: fcos
6+
7+
set -xeuo pipefail
8+
9+
# shellcheck disable=SC1091
10+
. "$KOLA_EXT_DATA/commonlib.sh"
11+
12+
if verlt "$(get_fedora_ver)" 43; then
13+
ok "Skipping python3 dependencies test"
14+
exit 0
15+
fi
16+
17+
sudo rpm-ostree usroverlay
18+
sudo rpm -e nfs-utils nfs-utils-coreos python3 python3-libs python-pip-wheel
19+
ok "no extra pytyhon3 dependencies"

0 commit comments

Comments
 (0)