From 2e00bf516ab45102e6bdef40cd78247953f63597 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 18 Jun 2024 08:47:03 -0400 Subject: [PATCH 1/6] tests/storage-buckets: Mangle arch name for amd64 download link Signed-off-by: Simon Deziel --- tests/storage-buckets | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/storage-buckets b/tests/storage-buckets index 0edb9f07e..feb8c605f 100755 --- a/tests/storage-buckets +++ b/tests/storage-buckets @@ -13,7 +13,9 @@ fi # Grab the architecture so we can install the correct pre-built minio. arch="$(uname -m)" -if [ "${arch}" = "aarch64" ]; then +if [ "${arch}" = "x86_64" ]; then + arch="amd64" +elif [ "${arch}" = "aarch64" ]; then arch="arm64" elif [ "${arch}" = "ppc64el" ]; then arch="ppc64le" From d921b347d4599f7083841903653c35fe5efaf175 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 18 Jun 2024 10:30:17 -0400 Subject: [PATCH 2/6] tests/storage-buckets: use install_deps helper to pull ceph-common Signed-off-by: Simon Deziel --- tests/storage-buckets | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/storage-buckets b/tests/storage-buckets index feb8c605f..727d429e4 100755 --- a/tests/storage-buckets +++ b/tests/storage-buckets @@ -34,8 +34,7 @@ if echo "${poolDriverList}" | grep -qwF "ceph"; then lxd waitready --timeout=300 # Install dependencies - apt-get update - apt-get install --no-install-recommends --yes ceph-common + install_deps ceph-common fi # Clean up the build dir in case it hung around from a failed test. From 793a468c81c5603b6314ec89468151ab53f1d6e3 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 18 Jun 2024 11:20:38 -0400 Subject: [PATCH 3/6] tests/storage-buckets: fix path to minio binaries Signed-off-by: Simon Deziel --- tests/storage-buckets | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/storage-buckets b/tests/storage-buckets index 727d429e4..6dfcde93f 100755 --- a/tests/storage-buckets +++ b/tests/storage-buckets @@ -43,11 +43,11 @@ mkdir -p /opt/minio # Download the minio server. curl -sSfL "https://dl.min.io/server/minio/release/linux-${arch}/minio" --output "/opt/minio/minio" -chmod +x "opt/minio/minio" +chmod +x "/opt/minio/minio" # Also grab the latest minio client to maintain compatibility with the server. curl -sSfL "https://dl.min.io/client/mc/release/linux-${arch}/mc" --output "/opt/minio/mc" -chmod +x "opt/minio/mc" +chmod +x "/opt/minio/mc" # Set the snap config key for minio and reload LXD to have it take effect. snap set lxd minio.path=/opt/minio From 967112a6ea76bdb7c2adced2b6cd010f11924946 Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 18 Jun 2024 11:21:32 -0400 Subject: [PATCH 4/6] tests/storage-buckets: remove unneeded `lxd waitready` Signed-off-by: Simon Deziel --- tests/storage-buckets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/storage-buckets b/tests/storage-buckets index 6dfcde93f..400caba2d 100755 --- a/tests/storage-buckets +++ b/tests/storage-buckets @@ -30,8 +30,8 @@ fi poolDriverList="${1:-dir btrfs lvm lvm-thin zfs ceph}" if echo "${poolDriverList}" | grep -qwF "ceph"; then + # XXX: LXD will be reloaded further down snap set lxd ceph.external=true - lxd waitready --timeout=300 # Install dependencies install_deps ceph-common From dcc552ea885ecb26340c2bef0de4126f78fb2d8a Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 18 Jun 2024 11:33:10 -0400 Subject: [PATCH 5/6] tests/storage-buckets: temporarily disable tests on ceph Signed-off-by: Simon Deziel --- tests/storage-buckets | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/storage-buckets b/tests/storage-buckets index 400caba2d..dbfc00632 100755 --- a/tests/storage-buckets +++ b/tests/storage-buckets @@ -29,6 +29,11 @@ fi poolDriverList="${1:-dir btrfs lvm lvm-thin zfs ceph}" +if echo "${poolDriverList}" | grep -qwF "ceph"; then + echo "::warning::Skipping test on ceph until we can integrate with microceph" + poolDriverList="$(echo "${poolDriverList}" | sed 's/ \?\bceph\b//')" +fi + if echo "${poolDriverList}" | grep -qwF "ceph"; then # XXX: LXD will be reloaded further down snap set lxd ceph.external=true From 44568feceb5749d76cf53cffcb606e334d31c53b Mon Sep 17 00:00:00 2001 From: Simon Deziel Date: Tue, 18 Jun 2024 11:33:31 -0400 Subject: [PATCH 6/6] github: stop excluding storage-buckets test Signed-off-by: Simon Deziel --- .github/workflows/tests.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index e0b027c52..16693e4cf 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -112,7 +112,6 @@ jobs: os: "24.04" - test: efi-vars-editor-vm # not compatible with 5.0/* track: "5.0/edge" - - test: storage-buckets # waiting for integration with microceph - test: "storage-vm ceph" # waiting for integration with microceph - track: "5.0/edge" os: "24.04"