Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

bodhi: adjust arches for updates pushes

Browse source 
Right now we are pushing a pointless armhfp variant in f37/f38 updates.
(It only has noarch packages in it).

So, lets clean up the logic here for both rpm updates pushes and modular
pushes. We can drop atomic as we don't do that anymore.

After we push this out and confirm it's working for a day or two, we
should go in and remove the bogus armhfp dirs from the master mirrors.

Signed-off-by: Kevin Fenzi <kevin@scrye.com>
This commit is contained in:
Kevin Fenzi 2023-04-18 12:15:38 -07:00 • committed by kevin
parent 1b2cb092ee
commit 67a5c016f6
2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

7
roles/bodhi2/backend/templates/variants.module.xml.j2
View file

@ -7,11 +7,8 @@
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>x86_64</arch>
[% if release.version_int > 8 %]
<arch>i386</arch>
[% endif %]
[% if release.version_int < 37 %]
<arch>armhfp</arch>
[% if release.version_int < 37 %]
<arch>armhfp</arch>
[% endif %]
</arches>
<modules>

26
roles/bodhi2/backend/templates/variants.rpm.xml.j2
View file

@ -4,26 +4,14 @@
<variant id="Everything" name="Everything" type="variant">
<arches>
<arch>x86_64</arch>
[% if release.version_int == 30 or release.version_int == 6 %]
<arch>i386</arch>
[% endif %]
[% if release.id_prefix == "FEDORA" %]
<arch>armhfp</arch>
[% endif %]
[% if release.version_int >= 26 or release.version_int >= 8 %]
<arch>aarch64</arch>
[% endif %]
[% if release.version_int >= 26 or release.version_int >= 7 %]
<arch>ppc64le</arch>
[% endif %]
<arch>s390x</arch>
</arches>
</variant>
<variant id="AtomicHost" name="AtomicHost" type="variant" is_empty="true">
<arches>
<arch>aarch64</arch>
<arch>x86_64</arch>
<arch>s390x</arch>
<arch>ppc64le</arch>
[% if release.version_int == 36 %]
<arch>armhfp</arch>
[% endif %]
[% if release.version_int != 7 %]
<arch>aarch64</arch>
[% endif %]
</arches>
</variant>
</variants>