From 847fb883281f5a2d75fd71c44f9bea51093c7fb3 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Wed, 3 Jul 2024 19:15:57 -0400 Subject: [PATCH] Drop armv7hl and i686 ARMv7 was never a RHEL architecture, and i686 multilibs have been dropped completely in RHEL 10 and ELN. --- config_specs/repository_v2.yaml | 2 -- eln_repo_split_prototype.py | 3 +-- feedback_pipeline.py | 2 +- test_config_files.py | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/config_specs/repository_v2.yaml b/config_specs/repository_v2.yaml index 343946e..1b1d18e 100644 --- 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 index 647ff04..1fec77b 100755 --- 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() \ No newline at end of file + main() diff --git a/feedback_pipeline.py b/feedback_pipeline.py index 25bd9b3..0c2ff1f 100755 --- 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 index f9aebf6..57e8270 100755 --- 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