From 21698f02768f11075ddc4faa0f1fb371f48e5348 Mon Sep 17 00:00:00 2001 From: Olivier Desenfans Date: Thu, 13 Jul 2023 16:23:23 +0200 Subject: [PATCH 1/6] Fix: avoid apt locks for tests on Ubuntu Increase the sizing of the droplet. Better performances should help. --- .github/workflows/test-on-droplet-ubuntu-22.04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-on-droplet-ubuntu-22.04.yml b/.github/workflows/test-on-droplet-ubuntu-22.04.yml index 1a2da380e..c87910b13 100644 --- a/.github/workflows/test-on-droplet-ubuntu-22.04.yml +++ b/.github/workflows/test-on-droplet-ubuntu-22.04.yml @@ -33,7 +33,7 @@ jobs: run: | doctl compute droplet create \ --image ubuntu-22-04-x64 \ - --size c-2 \ + --size c-4 \ --region fra1 \ --vpc-uuid 992896c8-c089-4da3-9288-f81e28c095a4 \ --enable-ipv6 \ From 81ef53f0640f12ad7b21b857cd2898219fb44377 Mon Sep 17 00:00:00 2001 From: Olivier Desenfans Date: Thu, 13 Jul 2023 17:49:31 +0200 Subject: [PATCH 2/6] fix lock file --- .github/workflows/test-on-droplet-ubuntu-22.04.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/test-on-droplet-ubuntu-22.04.yml b/.github/workflows/test-on-droplet-ubuntu-22.04.yml index c87910b13..ad7cfa64b 100644 --- a/.github/workflows/test-on-droplet-ubuntu-22.04.yml +++ b/.github/workflows/test-on-droplet-ubuntu-22.04.yml @@ -55,9 +55,8 @@ jobs: export DROPLET_IPV4="$(doctl compute droplet get aleph-vm-ci-ubuntu-22-04 --output json | ./.github/scripts/extract_droplet_ipv4.py)" ssh-keyscan -H ${DROPLET_IPV4} > ~/.ssh/known_hosts - # Ubuntu droplets run upgrades at boot - sleep 30 - until ! ssh root@${DROPLET_IPV4} "lslocks --json | grep /var/lib/dpkg/lock" > /dev/null; do sleep 1; echo "Waiting for dpkg lock..."; done + # Ubuntu droplets run upgrades at boot, which locks apt-get + until ! ssh root@${DROPLET_IPV4} "lslocks --json | grep /var/lib/apt/lists/lock\|/var/lib/dpkg/lock" > /dev/null; do sleep 1; echo "Waiting for apt/dpkg lock..."; done ssh root@${DROPLET_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get update" ssh root@${DROPLET_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get upgrade -y" From 71edd37ebd9a4b3e13dd7d8595204eaf0ca01aa0 Mon Sep 17 00:00:00 2001 From: Olivier Desenfans Date: Thu, 13 Jul 2023 17:50:06 +0200 Subject: [PATCH 3/6] sleep --- .github/workflows/test-on-droplet-ubuntu-22.04.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/test-on-droplet-ubuntu-22.04.yml b/.github/workflows/test-on-droplet-ubuntu-22.04.yml index ad7cfa64b..89cc5433f 100644 --- a/.github/workflows/test-on-droplet-ubuntu-22.04.yml +++ b/.github/workflows/test-on-droplet-ubuntu-22.04.yml @@ -56,6 +56,7 @@ jobs: ssh-keyscan -H ${DROPLET_IPV4} > ~/.ssh/known_hosts # Ubuntu droplets run upgrades at boot, which locks apt-get + sleep 30 until ! ssh root@${DROPLET_IPV4} "lslocks --json | grep /var/lib/apt/lists/lock\|/var/lib/dpkg/lock" > /dev/null; do sleep 1; echo "Waiting for apt/dpkg lock..."; done ssh root@${DROPLET_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get update" From a337137e08ec42681406f5510c8ab10c42848471 Mon Sep 17 00:00:00 2001 From: Olivier Desenfans Date: Thu, 13 Jul 2023 18:09:25 +0200 Subject: [PATCH 4/6] fix --- .github/workflows/test-on-droplet-ubuntu-22.04.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/test-on-droplet-ubuntu-22.04.yml b/.github/workflows/test-on-droplet-ubuntu-22.04.yml index 89cc5433f..35e80fe81 100644 --- a/.github/workflows/test-on-droplet-ubuntu-22.04.yml +++ b/.github/workflows/test-on-droplet-ubuntu-22.04.yml @@ -57,9 +57,7 @@ jobs: # Ubuntu droplets run upgrades at boot, which locks apt-get sleep 30 - until ! ssh root@${DROPLET_IPV4} "lslocks --json | grep /var/lib/apt/lists/lock\|/var/lib/dpkg/lock" > /dev/null; do sleep 1; echo "Waiting for apt/dpkg lock..."; done - - ssh root@${DROPLET_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get update" + until ! ssh root@${DROPLET_IPV4} "apt-get update" > /dev/null; do sleep 1; echo "Waiting for apt/dpkg lock..."; done ssh root@${DROPLET_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get upgrade -y" ssh root@${DROPLET_IPV4} DEBIAN_FRONTEND=noninteractive "apt-get install -y docker.io apparmor-profiles" ssh root@${DROPLET_IPV4} "docker run -d -p 127.0.0.1:4021:4021/tcp --restart=always --name vm-connector alephim/vm-connector:alpha" From aa1942d4938bbc9db08a8bca891c2c2d67fecb4f Mon Sep 17 00:00:00 2001 From: Olivier Desenfans Date: Thu, 13 Jul 2023 18:41:58 +0200 Subject: [PATCH 5/6] fix --- .github/workflows/test-on-droplet-ubuntu-22.04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-on-droplet-ubuntu-22.04.yml b/.github/workflows/test-on-droplet-ubuntu-22.04.yml index 35e80fe81..459c15823 100644 --- a/.github/workflows/test-on-droplet-ubuntu-22.04.yml +++ b/.github/workflows/test-on-droplet-ubuntu-22.04.yml @@ -33,7 +33,7 @@ jobs: run: | doctl compute droplet create \ --image ubuntu-22-04-x64 \ - --size c-4 \ + --size c-2 \ --region fra1 \ --vpc-uuid 992896c8-c089-4da3-9288-f81e28c095a4 \ --enable-ipv6 \ From 1778dc09741412c10e6bef2b3d0420656a1e49dd Mon Sep 17 00:00:00 2001 From: Olivier Desenfans Date: Thu, 13 Jul 2023 23:09:46 +0200 Subject: [PATCH 6/6] when in doubt, use c4 --- .github/workflows/test-on-droplet-ubuntu-22.04.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test-on-droplet-ubuntu-22.04.yml b/.github/workflows/test-on-droplet-ubuntu-22.04.yml index 459c15823..35e80fe81 100644 --- a/.github/workflows/test-on-droplet-ubuntu-22.04.yml +++ b/.github/workflows/test-on-droplet-ubuntu-22.04.yml @@ -33,7 +33,7 @@ jobs: run: | doctl compute droplet create \ --image ubuntu-22-04-x64 \ - --size c-2 \ + --size c-4 \ --region fra1 \ --vpc-uuid 992896c8-c089-4da3-9288-f81e28c095a4 \ --enable-ipv6 \