Skip to content

Commit 1715702

Browse files
ci: fix runc version prefix and OpenSUSE package install in multi-distro matrix
Signed-off-by: imshubham22apr-gif <imshubham.22apr@gmail.com>
1 parent b9de0fc commit 1715702

1 file changed

Lines changed: 25 additions & 2 deletions

File tree

.github/workflows/vm_test.yml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,8 @@ jobs:
125125
dnf install -y --allowerasing git wget curl gcc gcc-c++ make libseccomp-devel pkgconfig bc e2fsprogs ca-certificates tar
126126
dnf install -y qemu-system-x86 || dnf install -y qemu-kvm || true
127127
elif command -v zypper >/dev/null; then
128-
zypper install -y git wget curl gcc gcc-c++ make libseccomp-devel pkg-config bc qemu-x86 e2fsprogs ca-certificates tar
128+
zypper --non-interactive install -y git wget curl gcc gcc-c++ make libseccomp-devel pkg-config bc qemu-x86 e2fsprogs ca-certificates tar || \
129+
zypper --non-interactive install -y git wget curl gcc gcc-c++ make libseccomp2-devel pkg-config bc qemu-x86 e2fsprogs ca-certificates tar
129130
else
130131
echo "Unsupported distribution"
131132
exit 1
@@ -136,7 +137,10 @@ jobs:
136137
137138
- name: Install runc
138139
run: |
139-
wget https://github.com/opencontainers/runc/releases/download/${{ inputs.runc_version }}/runc.${{ matrix.arch }}
140+
RUNC_VERSION="${{ inputs.runc_version }}"
141+
# Ensure version has 'v' prefix
142+
[[ "$RUNC_VERSION" == v* ]] || RUNC_VERSION="v${RUNC_VERSION}"
143+
wget "https://github.com/opencontainers/runc/releases/download/${RUNC_VERSION}/runc.${{ matrix.arch }}"
140144
install -m 755 runc.${{ matrix.arch }} /usr/local/sbin/runc
141145
142146
- name: Install containerd
@@ -171,6 +175,25 @@ jobs:
171175
META_DEV=$(losetup -f --show /var/lib/containerd/devmapper/metadata)
172176
dmsetup create containerd-pool --table "0 2097152 thin-pool $META_DEV $DATA_DEV 128 32768"
173177
178+
- name: Configure containerd for devmapper and urunc
179+
run: |
180+
sed -i "/\[plugins\.'io\.containerd\.snapshotter\.v1\.devmapper'\]/,/^$/d" /etc/containerd/config.toml
181+
tee -a /etc/containerd/config.toml <<'EOF'
182+
[plugins.'io.containerd.snapshotter.v1.devmapper']
183+
pool_name = "containerd-pool"
184+
root_path = "/var/lib/containerd/io.containerd.snapshotter.v1.devmapper"
185+
base_image_size = "10GB"
186+
fs_type = "ext2"
187+
EOF
188+
tee -a /etc/containerd/config.toml <<'EOF'
189+
[plugins.'io.containerd.cri.v1.runtime'.containerd.runtimes.urunc]
190+
runtime_type = "io.containerd.urunc.v2"
191+
container_annotations = ["com.urunc.unikernel.*"]
192+
pod_annotations = ["com.urunc.unikernel.*"]
193+
snapshotter = "devmapper"
194+
EOF
195+
systemctl restart containerd
196+
174197
- name: Setup block-based mountpoint
175198
run: |
176199
mkdir -p /mnt/urunc-test

0 commit comments

Comments
 (0)