From 1f81a8997854387bf9f2e2c8377c06aefae62ca9 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Mon, 8 Aug 2022 17:25:59 -0400 Subject: [PATCH] build: Request appropriate arch for nfs-ganesha repo If an arm64 nfs-ganesha build passes but the x86 one fails, shaman will return the arm64 repo for an x86 ceph-container build. This results in errors like: ``` No match for argument: nfs-ganesha No match for argument: nfs-ganesha-ceph No match for argument: nfs-ganesha-rgw No match for argument: nfs-ganesha-rados-grace No match for argument: nfs-ganesha-rados-urls Error: Unable to find a match: nfs-ganesha nfs-ganesha-ceph nfs-ganesha-rgw nfs-ganesha-rados-grace nfs-ganesha-rados-urls ``` Signed-off-by: David Galloway --- ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ index 7a01b13cf..92931d0bd 100644 --- a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ +++ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ @@ -3,7 +3,7 @@ yum install -y jq && \ bash -c ' \ if [ -n "__GANESHA_PACKAGES__" ]; then \ if [[ "${CEPH_VERSION}" == master || "${CEPH_VERSION}" == main ]]; then \ - curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo" -o /etc/yum.repos.d/ganesha.repo ; \ + curl -s -L "https://shaman.ceph.com/api/repos/nfs-ganesha/next/latest/centos/__ENV_[DISTRO_VERSION]__/flavors/ceph_main/repo?arch=$(arch)" -o /etc/yum.repos.d/ganesha.repo ; \ elif [[ "${CEPH_VERSION}" == quincy ]]; then \ echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \ echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \