From ae64deb0fc190f4f68627cf97785c85aaca8e4a4 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jan 06 2021 14:15:43 +0000
Subject: Fix arch naming


---

diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 7052bf6..78475dc 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -21,14 +21,14 @@ let Prelude =
       https://prelude.dhall-lang.org/v17.0.0/package.dhall sha256:10db3c919c25e9046833df897a8ffe2701dc390fa0893d958c3430524be5a43e
 
 let Arch =
-      let Union = < X86_64 | S390X | PPC64LE | I386 | ARMHFP | AARCH64 >
+      let Union = < X86_64 | S390X | PPC64LE | I686 | ARMV7HL | AARCH64 >
 
       let eq_def =
             { X86_64 = False
             , S390X = False
             , PPC64LE = False
-            , I386 = False
-            , ARMHFP = False
+            , I686 = False
+            , ARMV7HL = False
             , AARCH64 = False
             }
 
@@ -38,8 +38,8 @@ let Arch =
             [ Union.X86_64
             , Union.S390X
             , Union.PPC64LE
-            , Union.I386
-            , Union.ARMHFP
+            , Union.I686
+            , Union.ARMV7HL
             , Union.AARCH64
             ]
           , epel8 = [ Union.X86_64, Union.PPC64LE, Union.AARCH64 ]
@@ -49,8 +49,8 @@ let Arch =
                   { X86_64 = "x86_64"
                   , S390X = "s390x"
                   , PPC64LE = "ppc64le"
-                  , I386 = "i386"
-                  , ARMHFP = "armhfp"
+                  , I686 = "i686"
+                  , ARMV7HL = "armv7hl"
                   , AARCH64 = "aarch64"
                   }
                   arch
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 6aa4c43..6504f2c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -67,26 +67,26 @@
       target: rawhide
 
 - job:
-    name: rpm-scratch-build-i386
+    name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
       - master
     final: true
     vars:
-      arches: i386
+      arches: i686
       fetch_artifacts: false
       release: master
       scratch_build: true
       target: rawhide
 
 - job:
-    name: rpm-scratch-build-armhfp
+    name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
       - master
     final: true
     vars:
-      arches: armhfp
+      arches: armv7hl
       fetch_artifacts: false
       release: master
       scratch_build: true
@@ -145,26 +145,26 @@
       target: f33
 
 - job:
-    name: rpm-scratch-build-i386
+    name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
       - f33
     final: true
     vars:
-      arches: i386
+      arches: i686
       fetch_artifacts: false
       release: f33
       scratch_build: true
       target: f33
 
 - job:
-    name: rpm-scratch-build-armhfp
+    name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
       - f33
     final: true
     vars:
-      arches: armhfp
+      arches: armv7hl
       fetch_artifacts: false
       release: f33
       scratch_build: true
@@ -223,26 +223,26 @@
       target: f32
 
 - job:
-    name: rpm-scratch-build-i386
+    name: rpm-scratch-build-i686
     parent: common-koji-rpm-build
     branches:
       - f32
     final: true
     vars:
-      arches: i386
+      arches: i686
       fetch_artifacts: false
       release: f32
       scratch_build: true
       target: f32
 
 - job:
-    name: rpm-scratch-build-armhfp
+    name: rpm-scratch-build-armv7hl
     parent: common-koji-rpm-build
     branches:
       - f32
     final: true
     vars:
-      arches: armhfp
+      arches: armv7hl
       fetch_artifacts: false
       release: f32
       scratch_build: true
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 47e4128..0475be9 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -63,9 +63,9 @@
            voting: false
        - rpm-scratch-build-ppc64le:
            voting: false
-       - rpm-scratch-build-armhfp:
+       - rpm-scratch-build-armv7hl:
            voting: false
-       - rpm-scratch-build-i386:
+       - rpm-scratch-build-i686:
            voting: false
        - rpm-scratch-build-s390x:
            voting: false