This is the last bit of the https://fedoraproject.org/wiki/Changes/Noi686Repositories approved f31 change (aside from some documentation).
Signed-off-by: Kevin Fenzi kevin@scrye.com --- roles/bodhi2/backend/templates/variants.rpm.xml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 b/roles/bodhi2/backend/templates/variants.rpm.xml.j2 index 569a2ef..062a63e 100644 --- a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 +++ b/roles/bodhi2/backend/templates/variants.rpm.xml.j2 @@ -4,7 +4,7 @@ <variant id="Everything" name="Everything" type="variant"> <arches> <arch>x86_64</arch> - [% if release.version_int >= 25 or release.version_int == 6 %] + [% if release.version_int == 29 or release.version_int == 30 or release.version_int == 6 %] <arch>i386</arch> [% endif %] [% if release.id_prefix == "FEDORA" %]
+1
On Mon, 9 Sep 2019 at 19:56, Kevin Fenzi kevin@scrye.com wrote:
This is the last bit of the https://fedoraproject.org/wiki/Changes/Noi686Repositories approved f31 change (aside from some documentation).
Signed-off-by: Kevin Fenzi kevin@scrye.com
roles/bodhi2/backend/templates/variants.rpm.xml.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 b/roles/bodhi2/backend/templates/variants.rpm.xml.j2 index 569a2ef..062a63e 100644 --- a/roles/bodhi2/backend/templates/variants.rpm.xml.j2 +++ b/roles/bodhi2/backend/templates/variants.rpm.xml.j2 @@ -4,7 +4,7 @@ <variant id="Everything" name="Everything" type="variant"> <arches> <arch>x86_64</arch>
[% if release.version_int >= 25 or release.version_int == 6 %]
[% if release.version_int == 29 or release.version_int == 30or release.version_int == 6 %] <arch>i386</arch> [% endif %] [% if release.id_prefix == "FEDORA" %] -- 1.8.3.1 _______________________________________________ infrastructure mailing list -- infrastructure@lists.fedoraproject.org To unsubscribe send an email to infrastructure-leave@lists.fedoraproject.org Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/ List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@lists.fedorapro...
On 9/9/19 11:31 AM, Randy Barlow wrote:
+1
Oops. I forgot a part of this fix:
diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 975d462..fde72e3 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -29,7 +29,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'dest': OSTREEDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], 'dest': os.path.join(FEDORADEST, '31', 'Everything')}, - {'arches': ['i386', 'ppc64le', 's390x'], + {'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST, '31', 'Everything')} ]}, 'updates-testing': { @@ -38,7 +38,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'dest': OSTREEDEST}], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Everything')}, - {'arches': ['i386', 'ppc64le', 's390x'], + {'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Everything')} ]}} }, @@ -50,7 +50,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'ostrees': [], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '31', 'Modular')}, - {'arches': ['i386', 'ppc64le', 's390x'], + {'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST, '31', 'Modular')} ]}, 'updates-testing': { @@ -58,7 +58,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'ostrees': [], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Modular')}, - {'arches': ['i386', 'ppc64le', 's390x'], + {'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST, 'testing', '31', 'Modular')} ]}} },
On Mon, Sep 09, 2019 at 12:04:24PM -0700, Kevin Fenzi wrote:
On 9/9/19 11:31 AM, Randy Barlow wrote:
+1
Oops. I forgot a part of this fix:
diff --git a/roles/bodhi2/backend/files/new-updates-sync b/roles/bodhi2/backend/files/new-updates-sync index 975d462..fde72e3 100755 --- a/roles/bodhi2/backend/files/new-updates-sync +++ b/roles/bodhi2/backend/files/new-updates-sync @@ -29,7 +29,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'dest': OSTREEDEST}], 'to': [{'arches': ['x86_64', 'armhfp', 'aarch64', 'source'], 'dest': os.path.join(FEDORADEST, '31', 'Everything')},
{'arches': ['i386', 'ppc64le', 's390x'],
{'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST,'31', 'Everything')} ]}, 'updates-testing': { @@ -38,7 +38,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'dest': OSTREEDEST}], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Everything')},
{'arches': ['i386', 'ppc64le', 's390x'],
{'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST,'testing', '31', 'Everything')} ]}} }, @@ -50,7 +50,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'ostrees': [], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, '31', 'Modular')},
{'arches': ['i386', 'ppc64le', 's390x'],
{'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST,'31', 'Modular')} ]}, 'updates-testing': { @@ -58,7 +58,7 @@ RELEASES = {'f31': {'topic': 'fedora', 'ostrees': [], 'to': [{'arches': ['x86_64', 'aarch64', 'armhfp', 'source'], 'dest': os.path.join(FEDORADEST, 'testing', '31', 'Modular')},
{'arches': ['i386', 'ppc64le', 's390x'],
{'arches': ['ppc64le', 's390x'], 'dest': os.path.join(FEDORAALTDEST,'testing', '31', 'Modular')} ]}} },
+1 for me
Pierre
infrastructure@lists.fedoraproject.org
-
Clement Verna -
Kevin Fenzi -
Pierre-Yves Chibon -
Randy Barlow