Skip to content

Commit 9c85f8d

Browse files
authored
Use loop device for microceph (#826)
See also actions/runner-images#13587. Fixes #825
1 parent 112952f commit 9c85f8d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

.github/workflows/integration-test.yml

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,14 @@ jobs:
3636
sudo microceph.ceph osd set $flag
3737
done
3838
39-
# Repurpose the ephemeral disk for ceph OSD.
40-
sudo swapoff /mnt/swapfile
41-
ephemeral_disk="$(findmnt --noheadings --output SOURCE --target /mnt | sed 's/[0-9]\+$//')"
42-
sudo microceph disk add --wipe "${ephemeral_disk}"
39+
# Create a loop device for Ceph OSD
40+
CEPH_OSD_IMG=~/ceph-osd.img
41+
CEPH_OSD_SIZE_GIB=10
42+
43+
dd if=/dev/zero of="$CEPH_OSD_IMG" bs=1M count=$((CEPH_OSD_SIZE_GIB*1024)) status=progress
44+
sync
45+
LOOP=$(sudo losetup --find --show "$CEPH_OSD_IMG")
46+
sudo microceph disk add --wipe "${LOOP}"
4347
sudo rm -rf /etc/ceph
4448
sudo ln -s /var/snap/microceph/current/conf/ /etc/ceph
4549
sudo microceph enable rgw
@@ -64,7 +68,7 @@ jobs:
6468
echo "CEPH_USERNAME=admin" >> $GITHUB_ENV
6569
echo "CEPH_POOLNAME=devpool" >> $GITHUB_ENV
6670
echo "CEPH_CLIENTNAME=client.admin" >> $GITHUB_ENV
67-
echo "CEPH_DISK_SIZE=$(df --output=size -B 1 /mnt | sed -n '2p' | sed 's/[[:blank:]]//g')" >> $GITHUB_ENV
71+
echo "CEPH_DISK_SIZE=$((10*1024*1024*1024))" >> $GITHUB_ENV
6872
echo "CEPH_KEYRING_FILENAME=/etc/ceph/ceph.client.admin.keyring" >> $GITHUB_ENV
6973
echo "CEPH_MONITORS=$(hostname):6789" >> $GITHUB_ENV
7074
echo "CEPH_CONFIG_FILE=/etc/ceph/ceph.conf" >> $GITHUB_ENV

0 commit comments

Comments
 (0)