From 9fd8c2add09c37530e5aa83c80fdc210767f3713 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 17 Jul 2023 08:57:57 +0000 Subject: [PATCH] quincy/ubi9: fix quincy/ubi9 override rename the folder `ceph-releases/quincy/ubi9` to `ceph-releases/quincy/ubi9-redhat`. Otherwise, the override at `ceph-releases/ALL` is taken. Signed-off-by: Guillaume Abrioux --- .../quincy/{ubi9 => ubi9-redhat}/__DOCKERFILE_CLEAN_COMMON__ | 0 .../quincy/{ubi9 => ubi9-redhat}/__DOCKERFILE_MAINTAINER__ | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/__CRIMSON_PACKAGES__ | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/__CSI_PACKAGES__ | 0 .../{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_INSTALL__ | 0 .../{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_LABELS__ | 0 .../daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ | 0 .../{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_PREINSTALL__ | 0 .../daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ | 0 .../daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/__RADOSGW_PACKAGES__ | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/__SCIKIT_LEARN__ | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/container.yaml | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/content_sets.yml | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon-base/gating.yaml | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon/__DOCKERFILE_INSTALL__ | 0 .../quincy/{ubi9 => ubi9-redhat}/daemon/__DOCKERFILE_PREINSTALL__ | 0 .../{ubi9 => ubi9-redhat}/daemon/__DOCKERFILE_VERIFY_PACKAGES__ | 0 18 files changed, 0 insertions(+), 0 deletions(-) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/__DOCKERFILE_CLEAN_COMMON__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/__DOCKERFILE_MAINTAINER__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__CRIMSON_PACKAGES__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__CSI_PACKAGES__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_INSTALL__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_LABELS__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_PREINSTALL__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__RADOSGW_PACKAGES__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/__SCIKIT_LEARN__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/container.yaml (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/content_sets.yml (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon-base/gating.yaml (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon/__DOCKERFILE_INSTALL__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon/__DOCKERFILE_PREINSTALL__ (100%) rename ceph-releases/quincy/{ubi9 => ubi9-redhat}/daemon/__DOCKERFILE_VERIFY_PACKAGES__ (100%) diff --git a/ceph-releases/quincy/ubi9/__DOCKERFILE_CLEAN_COMMON__ b/ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_CLEAN_COMMON__ similarity index 100% rename from ceph-releases/quincy/ubi9/__DOCKERFILE_CLEAN_COMMON__ rename to ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_CLEAN_COMMON__ diff --git a/ceph-releases/quincy/ubi9/__DOCKERFILE_MAINTAINER__ b/ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_MAINTAINER__ similarity index 100% rename from ceph-releases/quincy/ubi9/__DOCKERFILE_MAINTAINER__ rename to ceph-releases/quincy/ubi9-redhat/__DOCKERFILE_MAINTAINER__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__CRIMSON_PACKAGES__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__CRIMSON_PACKAGES__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__CRIMSON_PACKAGES__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__CRIMSON_PACKAGES__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__CSI_PACKAGES__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__CSI_PACKAGES__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__CSI_PACKAGES__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__CSI_PACKAGES__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_INSTALL__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_INSTALL__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_INSTALL__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_LABELS__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_LABELS__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_LABELS__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_LABELS__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_POSTINSTALL_CLEANUP__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_PREINSTALL__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_PREINSTALL__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_PREINSTALL__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_PREINSTALL__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__DOCKERFILE_VERIFY_PACKAGES__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__ETC_REDHAT_STORAGE_RELEASE__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__RADOSGW_PACKAGES__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__RADOSGW_PACKAGES__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__RADOSGW_PACKAGES__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__RADOSGW_PACKAGES__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/__SCIKIT_LEARN__ b/ceph-releases/quincy/ubi9-redhat/daemon-base/__SCIKIT_LEARN__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/__SCIKIT_LEARN__ rename to ceph-releases/quincy/ubi9-redhat/daemon-base/__SCIKIT_LEARN__ diff --git a/ceph-releases/quincy/ubi9/daemon-base/container.yaml b/ceph-releases/quincy/ubi9-redhat/daemon-base/container.yaml similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/container.yaml rename to ceph-releases/quincy/ubi9-redhat/daemon-base/container.yaml diff --git a/ceph-releases/quincy/ubi9/daemon-base/content_sets.yml b/ceph-releases/quincy/ubi9-redhat/daemon-base/content_sets.yml similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/content_sets.yml rename to ceph-releases/quincy/ubi9-redhat/daemon-base/content_sets.yml diff --git a/ceph-releases/quincy/ubi9/daemon-base/gating.yaml b/ceph-releases/quincy/ubi9-redhat/daemon-base/gating.yaml similarity index 100% rename from ceph-releases/quincy/ubi9/daemon-base/gating.yaml rename to ceph-releases/quincy/ubi9-redhat/daemon-base/gating.yaml diff --git a/ceph-releases/quincy/ubi9/daemon/__DOCKERFILE_INSTALL__ b/ceph-releases/quincy/ubi9-redhat/daemon/__DOCKERFILE_INSTALL__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon/__DOCKERFILE_INSTALL__ rename to ceph-releases/quincy/ubi9-redhat/daemon/__DOCKERFILE_INSTALL__ diff --git a/ceph-releases/quincy/ubi9/daemon/__DOCKERFILE_PREINSTALL__ b/ceph-releases/quincy/ubi9-redhat/daemon/__DOCKERFILE_PREINSTALL__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon/__DOCKERFILE_PREINSTALL__ rename to ceph-releases/quincy/ubi9-redhat/daemon/__DOCKERFILE_PREINSTALL__ diff --git a/ceph-releases/quincy/ubi9/daemon/__DOCKERFILE_VERIFY_PACKAGES__ b/ceph-releases/quincy/ubi9-redhat/daemon/__DOCKERFILE_VERIFY_PACKAGES__ similarity index 100% rename from ceph-releases/quincy/ubi9/daemon/__DOCKERFILE_VERIFY_PACKAGES__ rename to ceph-releases/quincy/ubi9-redhat/daemon/__DOCKERFILE_VERIFY_PACKAGES__