[RFC PATCH] tests/docker: move alpine from edge to tagged release

Alex Bennée posted 1 patch 1 year, 6 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220929105548.542555-1-alex.bennee@linaro.org
Maintainers: "Alex Bennée" <alex.bennee@linaro.org>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, Thomas Huth <thuth@redhat.com>, Wainer dos Santos Moschetta <wainersm@redhat.com>, Beraldo Leal <bleal@redhat.com>
tests/docker/dockerfiles/alpine.docker | 4 ++--
tests/lcitool/refresh                  | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
[RFC PATCH] tests/docker: move alpine from edge to tagged release
Posted by Alex Bennée 1 year, 6 months ago
Tracking alpine-edge like debian-sid is a moving target. Usually such
rolling releases are marked as "allow_failure: true" in our CI.
However as alpine presents a musl based and provides useful extra
coverage lets track a release branch instead to avoid random
breakages.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
 tests/docker/dockerfiles/alpine.docker | 4 ++--
 tests/lcitool/refresh                  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
index 7d6e95275a..9b7541261a 100644
--- a/tests/docker/dockerfiles/alpine.docker
+++ b/tests/docker/dockerfiles/alpine.docker
@@ -1,10 +1,10 @@
 # THIS FILE WAS AUTO-GENERATED
 #
-#  $ lcitool dockerfile --layers all alpine-edge qemu
+#  $ lcitool dockerfile --layers all alpine-316 qemu
 #
 # https://gitlab.com/libvirt/libvirt-ci
 
-FROM docker.io/library/alpine:edge
+FROM docker.io/library/alpine:3.16
 
 RUN apk update && \
     apk upgrade && \
diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
index 783497a989..ce0b24c0b1 100755
--- a/tests/lcitool/refresh
+++ b/tests/lcitool/refresh
@@ -107,7 +107,7 @@ try:
     #
     # Standard native builds
     #
-    generate_dockerfile("alpine", "alpine-edge")
+    generate_dockerfile("alpine", "alpine-316")
     generate_dockerfile("centos8", "centos-stream-8")
     generate_dockerfile("debian-amd64", "debian-11",
                         trailer="".join(debian11_extras))
-- 
2.34.1


Re: [RFC PATCH] tests/docker: move alpine from edge to tagged release
Posted by Thomas Huth 1 year, 6 months ago
On 29/09/2022 12.55, Alex Bennée wrote:
> Tracking alpine-edge like debian-sid is a moving target. Usually such
> rolling releases are marked as "allow_failure: true" in our CI.
> However as alpine presents a musl based and provides useful extra

"a musl based distro" ?

> coverage lets track a release branch instead to avoid random
> breakages.
> 
> Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
> ---
>   tests/docker/dockerfiles/alpine.docker | 4 ++--
>   tests/lcitool/refresh                  | 2 +-
>   2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/tests/docker/dockerfiles/alpine.docker b/tests/docker/dockerfiles/alpine.docker
> index 7d6e95275a..9b7541261a 100644
> --- a/tests/docker/dockerfiles/alpine.docker
> +++ b/tests/docker/dockerfiles/alpine.docker
> @@ -1,10 +1,10 @@
>   # THIS FILE WAS AUTO-GENERATED
>   #
> -#  $ lcitool dockerfile --layers all alpine-edge qemu
> +#  $ lcitool dockerfile --layers all alpine-316 qemu
>   #
>   # https://gitlab.com/libvirt/libvirt-ci
>   
> -FROM docker.io/library/alpine:edge
> +FROM docker.io/library/alpine:3.16
>   
>   RUN apk update && \
>       apk upgrade && \
> diff --git a/tests/lcitool/refresh b/tests/lcitool/refresh
> index 783497a989..ce0b24c0b1 100755
> --- a/tests/lcitool/refresh
> +++ b/tests/lcitool/refresh
> @@ -107,7 +107,7 @@ try:
>       #
>       # Standard native builds
>       #
> -    generate_dockerfile("alpine", "alpine-edge")
> +    generate_dockerfile("alpine", "alpine-316")
>       generate_dockerfile("centos8", "centos-stream-8")
>       generate_dockerfile("debian-amd64", "debian-11",
>                           trailer="".join(debian11_extras))

Sounds like a good idea.

Reviewed-by: Thomas Huth <thuth@redhat.com>