Re: [PATCH] automation: Add missing and drop obsoleted aliases from containerize

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Wed, 1 Mar 2023, Michal Orzel wrote:
> Add missing aliases for:
>  - debian:unstable-cppcheck
>  - debian:unstable-arm64v8-arm32-gcc
>  - ubuntu:bionic
> 
> Remove aliases for no longer used containers:
>  - centos:7.2
>  - debian:unstable-arm32-gcc
> 
> Modify docs to refer to CentOS 7 instead of 7.2 not to create confusion.
> 
> Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>

Acked-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> ---
> Open questions related to the CI cleanup (@Andrew, @Anthony):
>  - Why do we keep suse:sles11sp4 dockerfile?

please remove, it EOLed in 2016


>  - Why do we keep jessie dockefiles?

please remove, it EOLed in 2020


> ---
>  automation/build/README.md      | 4 ++--
>  automation/scripts/containerize | 5 +++--
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/automation/build/README.md b/automation/build/README.md
> index 4cc1acb6b41c..2d07cafe0eaa 100644
> --- a/automation/build/README.md
> +++ b/automation/build/README.md
> @@ -44,10 +44,10 @@ understands.
>    DOCKER_CMD=podman ./automation/scripts/containerize make
>    ```
>  
> -- CONTAINER: This overrides the container to use. For CentOS 7.2, use:
> +- CONTAINER: This overrides the container to use. For CentOS 7, use:
>  
>    ```
> -  CONTAINER=centos72 ./automation/scripts/containerize make
> +  CONTAINER=centos7 ./automation/scripts/containerize make
>    ```
>  
>  - CONTAINER_PATH: This overrides the path that will be available under the
> diff --git a/automation/scripts/containerize b/automation/scripts/containerize
> index 9b1a302d0565..5476ff0ea10d 100755
> --- a/automation/scripts/containerize
> +++ b/automation/scripts/containerize
> @@ -29,7 +29,6 @@ case "_${CONTAINER}" in
>      _archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
>      _riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;;
>      _centos7) CONTAINER="${BASE}/centos:7" ;;
> -    _centos72) CONTAINER="${BASE}/centos:7.2" ;;
>      _fedora) CONTAINER="${BASE}/fedora:29";;
>      _focal) CONTAINER="${BASE}/ubuntu:focal" ;;
>      _jessie) CONTAINER="${BASE}/debian:jessie" ;;
> @@ -39,8 +38,10 @@ case "_${CONTAINER}" in
>      _buster-gcc-ibt) CONTAINER="${BASE}/debian:buster-gcc-ibt" ;;
>      _unstable|_) CONTAINER="${BASE}/debian:unstable" ;;
>      _unstable-i386) CONTAINER="${BASE}/debian:unstable-i386" ;;
> -    _unstable-arm32-gcc) CONTAINER="${BASE}/debian:unstable-arm32-gcc" ;;
> +    _unstable-arm64v8-arm32-gcc) 
> CONTAINER="${BASE}/debian:unstable-arm64v8-arm32-gcc" ;;
>      _unstable-arm64v8) CONTAINER="${BASE}/debian:unstable-arm64v8" ;;
> +    _unstable-cppcheck) CONTAINER="${BASE}/debian:unstable-cppcheck" ;;
> +    _bionic) CONTAINER="${BASE}/ubuntu:bionic" ;;
>      _trusty) CONTAINER="${BASE}/ubuntu:trusty" ;;
>      _xenial) CONTAINER="${BASE}/ubuntu:xenial" ;;
>      _opensuse-leap|_leap) CONTAINER="${BASE}/suse:opensuse-leap" ;;
> -- 
> 2.25.1
>