Skip to content

Commit 8dd5ad2

Browse files
Remove sudo from various commaci: remove all sudo calls as container runs as root and sudo is missingnds in vm_test.yml
1 parent d1c3dff commit 8dd5ad2

1 file changed

Lines changed: 46 additions & 46 deletions

File tree

.github/workflows/vm_test.yml

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
- name: Pre-checkout dependencies
102102
run: |
103103
if command -v zypper >/dev/null; then
104-
sudo zypper install -y tar gzip
104+
zypper install -y tar gzip
105105
fi
106106
107107
- uses: actions/checkout@v4
@@ -119,91 +119,91 @@ jobs:
119119
- name: Install base dependencies
120120
run: |
121121
if command -v apt-get >/dev/null; then
122-
sudo apt-get update
123-
sudo apt-get install -y git wget curl build-essential libseccomp-dev pkg-config bc make qemu-system sudo e2fsprogs ca-certificates tar
122+
apt-get update
123+
apt-get install -y git wget curl build-essential libseccomp-dev pkg-config bc make qemu-system e2fsprogs ca-certificates tar
124124
elif command -v dnf >/dev/null; then
125-
sudo dnf install -y --allowerasing git wget curl gcc gcc-c++ make libseccomp-devel pkgconfig bc sudo e2fsprogs ca-certificates tar
125+
dnf install -y --allowerasing git wget curl gcc gcc-c++ make libseccomp-devel pkgconfig bc e2fsprogs ca-certificates tar
126126
elif command -v zypper >/dev/null; then
127-
sudo zypper install -y git wget curl gcc gcc-c++ make libseccomp-devel pkg-config bc qemu-x86 sudo e2fsprogs ca-certificates tar
127+
zypper install -y git wget curl gcc gcc-c++ make libseccomp-devel pkg-config bc qemu-x86 e2fsprogs ca-certificates tar
128128
else
129129
echo "Unsupported distribution"
130130
exit 1
131131
fi
132132
wget https://s3.nbfc.io/nbfc-assets/github/urunc/bin/virtiofsd
133-
sudo chmod +x virtiofsd
134-
sudo mv virtiofsd /usr/libexec/virtiofsd
133+
chmod +x virtiofsd
134+
mv virtiofsd /usr/libexec/virtiofsd
135135
136136
- name: Install runc
137137
run: |
138138
wget https://github.com/opencontainers/runc/releases/download/${{ inputs.runc_version }}/runc.${{ matrix.arch }}
139-
sudo install -m 755 runc.${{ matrix.arch }} /usr/local/sbin/runc
139+
install -m 755 runc.${{ matrix.arch }} /usr/local/sbin/runc
140140
141141
- name: Install containerd
142142
run: |
143143
wget https://github.com/containerd/containerd/releases/download/v${{ inputs.containerd_version }}/containerd-${{ inputs.containerd_version }}-linux-${{ matrix.arch }}.tar.gz
144-
sudo tar Cxzvf /usr/local containerd-${{ inputs.containerd_version }}-linux-${{ matrix.arch }}.tar.gz
144+
tar Cxzvf /usr/local containerd-${{ inputs.containerd_version }}-linux-${{ matrix.arch }}.tar.gz
145145
146146
- name: Set up containerd service
147147
run: |
148-
sudo mkdir -p /usr/local/lib/systemd/system
149-
sudo wget https://raw.githubusercontent.com/containerd/containerd/main/containerd.service -O /usr/local/lib/systemd/system/containerd.service
150-
sudo systemctl daemon-reload
151-
sudo systemctl enable --now containerd
148+
mkdir -p /usr/local/lib/systemd/system
149+
wget https://raw.githubusercontent.com/containerd/containerd/main/containerd.service -O /usr/local/lib/systemd/system/containerd.service
150+
systemctl daemon-reload
151+
systemctl enable --now containerd
152152
153153
- name: Configure containerd
154154
run: |
155-
sudo mkdir -p /etc/containerd
156-
containerd config default | sudo tee /etc/containerd/config.toml
155+
mkdir -p /etc/containerd
156+
containerd config default | tee /etc/containerd/config.toml
157157
158158
- name: Restart containerd
159159
run: |
160-
sudo systemctl restart containerd
160+
systemctl restart containerd
161161
162162
- name: Setup devmapper
163163
run: |
164-
sudo modprobe dm_thin_pool
165-
sudo mkdir -p /var/lib/containerd/devmapper
164+
modprobe dm_thin_pool
165+
mkdir -p /var/lib/containerd/devmapper
166166
# Use a loop device for devmapper in CI
167-
sudo dd if=/dev/zero of=/var/lib/containerd/devmapper/data bs=1M count=1024
168-
sudo dd if=/dev/zero of=/var/lib/containerd/devmapper/metadata bs=1M count=128
169-
DATA_DEV=$(sudo losetup -f --show /var/lib/containerd/devmapper/data)
170-
META_DEV=$(sudo losetup -f --show /var/lib/containerd/devmapper/metadata)
171-
sudo dmsetup create containerd-pool --table "0 2097152 thin-pool $META_DEV $DATA_DEV 128 32768"
167+
dd if=/dev/zero of=/var/lib/containerd/devmapper/data bs=1M count=1024
168+
dd if=/dev/zero of=/var/lib/containerd/devmapper/metadata bs=1M count=128
169+
DATA_DEV=$(losetup -f --show /var/lib/containerd/devmapper/data)
170+
META_DEV=$(losetup -f --show /var/lib/containerd/devmapper/metadata)
171+
dmsetup create containerd-pool --table "0 2097152 thin-pool $META_DEV $DATA_DEV 128 32768"
172172
173173
- name: Setup block-based mountpoint
174174
run: |
175-
sudo mkdir -p /mnt/urunc-test
176-
sudo dd if=/dev/zero of=/tmp/urunc-test.img bs=1M count=512
177-
sudo mkfs.ext4 /tmp/urunc-test.img
178-
sudo mount /tmp/urunc-test.img /mnt/urunc-test
175+
mkdir -p /mnt/urunc-test
176+
dd if=/dev/zero of=/tmp/urunc-test.img bs=1M count=512
177+
mkfs.ext4 /tmp/urunc-test.img
178+
mount /tmp/urunc-test.img /mnt/urunc-test
179179
180180
- name: Install CNI plugins
181181
run: |
182-
sudo mkdir -p /opt/cni/bin
182+
mkdir -p /opt/cni/bin
183183
wget https://github.com/containernetworking/plugins/releases/download/v${{ inputs.cni_version }}/cni-plugins-linux-${{ matrix.arch }}-v${{ inputs.cni_version }}.tgz
184-
sudo tar Cxzvf /opt/cni/bin cni-plugins-linux-${{ matrix.arch }}-v${{ inputs.cni_version }}.tgz
184+
tar Cxzvf /opt/cni/bin cni-plugins-linux-${{ matrix.arch }}-v${{ inputs.cni_version }}.tgz
185185
186186
- name: Install nerdctl
187187
run: |
188188
wget https://github.com/containerd/nerdctl/releases/download/v1.7.5/nerdctl-1.7.5-linux-${{ matrix.arch }}.tar.gz
189-
sudo tar Cxzvf /usr/local/bin nerdctl-1.7.5-linux-${{ matrix.arch }}.tar.gz
189+
tar Cxzvf /usr/local/bin nerdctl-1.7.5-linux-${{ matrix.arch }}.tar.gz
190190
191191
- name: Install crictl
192192
run: |
193193
wget https://github.com/kubernetes-sigs/cri-tools/releases/download/v1.29.0/crictl-v1.29.0-linux-${{ matrix.arch }}.tar.gz
194-
sudo tar Cxzvf /usr/local/bin crictl-v1.29.0-linux-${{ matrix.arch }}.tar.gz
194+
tar Cxzvf /usr/local/bin crictl-v1.29.0-linux-${{ matrix.arch }}.tar.gz
195195
196196
- name: Install Firecracker
197197
run: |
198198
FC_URL="https://github.com/firecracker-microvm/firecracker/releases/download/v1.7.0/firecracker-v1.7.0-$(uname -m)"
199199
wget $FC_URL -O firecracker
200-
sudo install -m 755 firecracker /usr/local/bin/firecracker
200+
install -m 755 firecracker /usr/local/bin/firecracker
201201
202202
- name: Install Cloud Hypervisor
203203
run: |
204204
CH_URL="https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v39.0/cloud-hypervisor"
205205
wget $CH_URL
206-
sudo install -m 755 cloud-hypervisor /usr/local/bin/cloud-hypervisor
206+
install -m 755 cloud-hypervisor /usr/local/bin/cloud-hypervisor
207207
208208
- name: Install solo5
209209
run: |
@@ -213,7 +213,7 @@ jobs:
213213
cd solo5-v${{ inputs.solo5_version }}
214214
./configure.sh
215215
make
216-
sudo make install
216+
make install
217217
218218
- name: Download urunc artifact
219219
uses: actions/download-artifact@v4 # v4.1.8
@@ -227,34 +227,34 @@ jobs:
227227

228228
- name: Install urunc
229229
run: |
230-
sudo install -m 755 urunc /usr/local/sbin/urunc
231-
sudo install -m 755 containerd-shim-urunc-v2 /usr/local/sbin/containerd-shim-urunc-v2
230+
install -m 755 urunc /usr/local/sbin/urunc
231+
install -m 755 containerd-shim-urunc-v2 /usr/local/sbin/containerd-shim-urunc-v2
232232
233233
- name: Configure urunc with debug logging
234234
run: |
235-
sudo mkdir -p /etc/urunc
236-
echo '{"log_level": "debug"}' | sudo tee /etc/urunc/config.json
235+
mkdir -p /etc/urunc
236+
echo '{"log_level": "debug"}' | tee /etc/urunc/config.json
237237
238238
- name: Add runner user to KVM group
239239
run: |
240-
sudo usermod -aG kvm $(whoami)
240+
usermod -aG kvm $(whoami)
241241
242242
- name: Prepare urunc folder
243243
run: |
244-
sudo mkdir -p /var/lib/urunc
244+
mkdir -p /var/lib/urunc
245245
246246
- name: Run ${{ matrix.test }}
247247
run: |
248248
case "${{ matrix.test }}" in
249-
test_ctr) sudo ./tests/e2e/test_ctr.sh ;;
250-
test_nerdctl) sudo ./tests/e2e/test_nerdctl.sh ;;
251-
test_crictl) sudo ./tests/e2e/test_crictl.sh ;;
252-
test_docker) sudo ./tests/e2e/test_docker.sh ;;
249+
test_ctr) ./tests/e2e/test_ctr.sh ;;
250+
test_nerdctl) ./tests/e2e/test_nerdctl.sh ;;
251+
test_crictl) ./tests/e2e/test_crictl.sh ;;
252+
test_docker) ./tests/e2e/test_docker.sh ;;
253253
esac
254254
255255
- name: Dump urunc logs on failure
256256
if: failure()
257257
run: |
258-
sudo journalctl -u containerd --no-pager
259-
sudo cat /tmp/containerd.log || true
258+
journalctl -u containerd --no-pager
259+
cat /tmp/containerd.log || true
260260

0 commit comments

Comments
 (0)