From 8beac88116e6e8a7789c970a73a9e5c0f3a4c3ca Mon Sep 17 00:00:00 2001 From: Alfredo Moralejo Date: Thu, 14 Jan 2021 15:11:58 +0100 Subject: [PATCH] Rename config repos file config for CentOS Stream Currently, config file is CentOS-8-stream.yaml but the value of ansible_distribution_major_version fact in CentOS stream is 8, not 8-stream [1], so jobs running in centos-8-stream images are actually using centos-8 repositories. This patch is modyfing the list of config files to use ansible_lsb.id fact wich is CentOSStream and renaming the file name. [1] https://storage.bhs.cloud.ovh.net/v1/AUTH_dcaab5e32b234d56b626f72581e3644c/zuul_opendev_logs_792/770771/2/check/packstack-centos8s-integration-scenario002/792342c/zuul-info/host-info.centos8s.yaml Change-Id: I7199acdd45151d2553ef17588909615b5a7c5b61 --- roles/configure-mirrors/tasks/mirror.yaml | 1 + .../tasks/mirror/{CentOS-8-stream.yaml => CentOSStream-8.yaml} | 0 2 files changed, 1 insertion(+) rename roles/configure-mirrors/tasks/mirror/{CentOS-8-stream.yaml => CentOSStream-8.yaml} (100%) diff --git a/roles/configure-mirrors/tasks/mirror.yaml b/roles/configure-mirrors/tasks/mirror.yaml index 24914792f..980c85816 100644 --- a/roles/configure-mirrors/tasks/mirror.yaml +++ b/roles/configure-mirrors/tasks/mirror.yaml @@ -26,6 +26,7 @@ - name: Setup distribution specific packaging mirrors include_tasks: "{{ zj_distro_os }}" with_first_found: + - "mirror/{{ ansible_lsb.id }}-{{ ansible_lsb.major_release }}.yaml" - "mirror/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml" - "mirror/{{ ansible_distribution }}.yaml" - "mirror/{{ ansible_os_family }}.yaml" diff --git a/roles/configure-mirrors/tasks/mirror/CentOS-8-stream.yaml b/roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml similarity index 100% rename from roles/configure-mirrors/tasks/mirror/CentOS-8-stream.yaml rename to roles/configure-mirrors/tasks/mirror/CentOSStream-8.yaml