From e3e62c2d33569469fce12363f07e26ace33ea350 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Fri, 12 Jul 2024 16:53:44 -0300 Subject: [PATCH 1/7] ci: use OpenStack for spread tests --- spread.yaml | 31 +++++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/spread.yaml b/spread.yaml index 74860b627..cec84ed5c 100644 --- a/spread.yaml +++ b/spread.yaml @@ -15,21 +15,40 @@ include: - Makefile - rockcraft/ +#backends: +# google: +# key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' +# location: snapd-spread/us-east1-b +# halt-timeout: 2h +# systems: +# - ubuntu-20.04-64: +# workers: 1 +# storage: 40G +# - ubuntu-22.04-64: +# workers: 4 +# storage: 40G +# - fedora-39-64: +# workers: 1 +# storage: 40G + backends: - google: - key: '$(HOST: echo "$SPREAD_GOOGLE_KEY")' - location: snapd-spread/us-east1-b + openstack: + key: '$(HOST: echo "$SPREAD_OPENSTACK_ENV")' + plan: staging-cpu2-ram4-disk20 halt-timeout: 2h + groups: [default] systems: - ubuntu-20.04-64: + image: ubuntu-focal-20.04-amd64 workers: 1 storage: 40G - ubuntu-22.04-64: + image: ubuntu-jammy-22.04-amd64 workers: 4 storage: 40G - - fedora-39-64: - workers: 1 - storage: 40G +# - ubuntu-22.04-arm-64: +# image: ubuntu-jammy-22.04-arm64 +# workers: 1 prepare: | # if the 'tools' directory inside the submodule does not exist, then assume the submodule is empty From 2c0fe357ecdbe3f9fbbfb583046f5c97ae364fb8 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Fri, 9 Aug 2024 17:38:22 -0300 Subject: [PATCH 2/7] update image names --- spread.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spread.yaml b/spread.yaml index cec84ed5c..87380922a 100644 --- a/spread.yaml +++ b/spread.yaml @@ -39,11 +39,11 @@ backends: groups: [default] systems: - ubuntu-20.04-64: - image: ubuntu-focal-20.04-amd64 + image: snapd-spread/ubuntu-20.04-64 workers: 1 storage: 40G - ubuntu-22.04-64: - image: ubuntu-jammy-22.04-amd64 + image: snapd-spread/ubuntu-22.04-64 workers: 4 storage: 40G # - ubuntu-22.04-arm-64: From af3a3c0f2adb8486f97e4777e3013ddd98027c09 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Fri, 9 Aug 2024 17:56:16 -0300 Subject: [PATCH 3/7] update spread 'plan' --- spread.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spread.yaml b/spread.yaml index 87380922a..99686201c 100644 --- a/spread.yaml +++ b/spread.yaml @@ -34,7 +34,7 @@ include: backends: openstack: key: '$(HOST: echo "$SPREAD_OPENSTACK_ENV")' - plan: staging-cpu2-ram4-disk20 + plan: staging-cpu2-ram4-disk50 halt-timeout: 2h groups: [default] systems: From c408fb6380af9fb249aa7cba4f19c89f65a79bd7 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Tue, 13 Aug 2024 10:18:37 -0300 Subject: [PATCH 4/7] delete storage line --- spread.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/spread.yaml b/spread.yaml index 99686201c..ebe341e53 100644 --- a/spread.yaml +++ b/spread.yaml @@ -41,11 +41,9 @@ backends: - ubuntu-20.04-64: image: snapd-spread/ubuntu-20.04-64 workers: 1 - storage: 40G - ubuntu-22.04-64: image: snapd-spread/ubuntu-22.04-64 workers: 4 - storage: 40G # - ubuntu-22.04-arm-64: # image: ubuntu-jammy-22.04-arm64 # workers: 1 From 7ff07904cd248cbcceb8212a3ea9171b1e132a7c Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Tue, 13 Aug 2024 15:50:13 -0300 Subject: [PATCH 5/7] add environment and fedora --- spread.yaml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/spread.yaml b/spread.yaml index ebe341e53..95d109736 100644 --- a/spread.yaml +++ b/spread.yaml @@ -37,10 +37,20 @@ backends: plan: staging-cpu2-ram4-disk50 halt-timeout: 2h groups: [default] + environment: + HTTP_PROXY: 'http://squid.internal:3128' + HTTPS_PROXY: 'http://squid.internal:3128' + http_proxy: 'http://squid.internal:3128' + https_proxy: 'http://squid.internal:3128' + no_proxy: '127.0.0.1,ubuntu.com' + NO_PROXY: '127.0.0.1,ubuntu.com' systems: - ubuntu-20.04-64: image: snapd-spread/ubuntu-20.04-64 workers: 1 + - fedora-40-64: + image: snapd-spread/fedora-40-64 + workers: 1 - ubuntu-22.04-64: image: snapd-spread/ubuntu-22.04-64 workers: 4 From 60ef7ce0a17adff38211a91e8edea4fbd650e295 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Tue, 13 Aug 2024 16:57:36 -0300 Subject: [PATCH 6/7] configure proxy on dockerd (snap) --- spread.yaml | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/spread.yaml b/spread.yaml index 95d109736..36fa42127 100644 --- a/spread.yaml +++ b/spread.yaml @@ -110,7 +110,18 @@ prepare: | snap install docker --channel=core18/stable else snap install docker - fi + fi + + mkdir -p /etc/systemd/system/snap.docker.dockerd.service.d/ + cat << EOF > /etc/systemd/system/snap.docker.dockerd.service.d/override.conf + [Service] + Environment=HTTP_PROXY=$HTTP_PROXY + Environment=HTTPS_PROXY=$HTTPS_PROXY + Environment=NO_PROXY=$NO_PROXY + EOF + + snap stop docker.dockerd + snap start docker.dockerd # make sure docker is working retry -n 10 --wait 2 sh -c 'docker run --rm hello-world' From ef23cc2842672b519878141948c937cbd632c539 Mon Sep 17 00:00:00 2001 From: Tiago Nobrega Date: Wed, 14 Aug 2024 09:07:44 -0300 Subject: [PATCH 7/7] disable docker hello-world temporarily --- spread.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spread.yaml b/spread.yaml index 36fa42127..cf0e167b8 100644 --- a/spread.yaml +++ b/spread.yaml @@ -124,7 +124,7 @@ prepare: | snap start docker.dockerd # make sure docker is working - retry -n 10 --wait 2 sh -c 'docker run --rm hello-world' + #retry -n 10 --wait 2 sh -c 'docker run --rm hello-world' install_rockcraft