Drop armv7hl and i686

ARMv7 was never a RHEL architecture, and i686 multilibs have been dropped completely in RHEL 10 and ELN.
minimization · Jul 3, 2024 · 847fb88 · 847fb88
1 parent 5565d36
commit 847fb88
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 6 deletions.
diff --git a/config_specs/repository_v2.yaml b/config_specs/repository_v2.yaml
@@ -66,9 +66,7 @@ data:
     # 
     # (mandatory field)
     architectures:
-    - armv7hl
     - aarch64
-    - i686
     - ppc64le
     - s390x
     - x86_64

diff --git a/eln_repo_split_prototype.py b/eln_repo_split_prototype.py
@@ -87,7 +87,6 @@ def load_settings():
 #               "aarch64"
 #           ],
 #           "x86_64": [
-#               "i686",
 #               "x86_64"
 #           ]
 #       },
@@ -1092,4 +1091,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()
diff --git a/feedback_pipeline.py b/feedback_pipeline.py
@@ -171,7 +171,7 @@ def load_settings():
 
     settings["max_subprocesses"] = 10
 
-    settings["allowed_arches"] = ["armv7hl", "aarch64", "ppc64le", "s390x", "x86_64"]
+    settings["allowed_arches"] = ["aarch64", "ppc64le", "s390x", "x86_64"]
 
     settings["weird_packages_that_can_not_be_installed"] = ["glibc32"]
 

diff --git a/test_config_files.py b/test_config_files.py
@@ -6,7 +6,7 @@ def create_mock_settings():
     settings = {}
     settings["configs"] = "input/configs"
     settings["strict"] = True
-    settings["allowed_arches"] = ["armv7hl","aarch64","ppc64le","s390x","x86_64"]
+    settings["allowed_arches"] = ["aarch64","ppc64le","s390x","x86_64"]
 
     return settings
-Original file line number
+Diff line change
@@ Expand Up / @@ -66,9 +66,7 @@ data: @@
         #
         # (mandatory field)
         architectures:
-        - armv7hl
         - aarch64
-        - i686
         - ppc64le
         - s390x
         - x86_64
@@ Expand Down @@