automation: rename RISCV_64 container and jobs

[PATCH] automation: rename RISCV_64 container and jobs

Posted by Oleksii Kurochko 1 year, 3 months ago

All RISCV_64-related stuff was renamed to be consistent with
ARM (arm32 is cross build as RISCV_64).

The patch is based on the following patch series:
[PATCH *] Basic early_printk and smoke test implementation

Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
 ...v64.dockerfile => current-riscv64.dockerfile} |  0
 automation/gitlab-ci/build.yaml                  | 16 ++++++++--------
 automation/gitlab-ci/test.yaml                   |  4 ++--
 automation/scripts/containerize                  |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)
 rename automation/build/archlinux/{riscv64.dockerfile => current-riscv64.dockerfile} (100%)

diff --git a/automation/build/archlinux/riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile
similarity index 100%
rename from automation/build/archlinux/riscv64.dockerfile
rename to automation/build/archlinux/current-riscv64.dockerfile
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index 6784974619..7ccd153375 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -647,31 +647,31 @@ alpine-3.12-gcc-debug-arm64-boot-cpupools:
       CONFIG_BOOT_TIME_CPUPOOLS=y
 
 # RISC-V 64 cross-build
-riscv64-cross-gcc:
+archlinux-current-gcc-riscv64:
   extends: .gcc-riscv64-cross-build
   variables:
-    CONTAINER: archlinux:riscv64
+    CONTAINER: archlinux:current-riscv64
     KBUILD_DEFCONFIG: tiny64_defconfig
     HYPERVISOR_ONLY: y
 
-riscv64-cross-gcc-debug:
+archlinux-current-gcc-riscv64-debug:
   extends: .gcc-riscv64-cross-build-debug
   variables:
-    CONTAINER: archlinux:riscv64
+    CONTAINER: archlinux:current-riscv64
     KBUILD_DEFCONFIG: tiny64_defconfig
     HYPERVISOR_ONLY: y
 
-riscv64-cross-gcc-randconfig:
+archlinux-current-gcc-riscv64-randconfig:
   extends: .gcc-riscv64-cross-build
   variables:
-    CONTAINER: archlinux:riscv64
+    CONTAINER: archlinux:current-riscv64
     KBUILD_DEFCONFIG: tiny64_defconfig
     RANDCONFIG: y
 
-riscv64-cross-gcc-debug-randconfig:
+archlinux-current-gcc-riscv64-debug-randconfig:
   extends: .gcc-riscv64-cross-build-debug
   variables:
-    CONTAINER: archlinux:riscv64
+    CONTAINER: archlinux:current-riscv64
     KBUILD_DEFCONFIG: tiny64_defconfig
     RANDCONFIG: y
 
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 64f47a0ab9..4ca3e54862 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -57,7 +57,7 @@
 .qemu-riscv64:
   extends: .test-jobs-common
   variables:
-    CONTAINER: archlinux:riscv64
+    CONTAINER: archlinux:current-riscv64
     LOGFILE: qemu-smoke-riscv64.log
   artifacts:
     paths:
@@ -252,7 +252,7 @@ qemu-smoke-riscv64-gcc:
   script:
     - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
   needs:
-    - riscv64-cross-gcc
+    - archlinux-current-gcc-riscv64
 
 # Yocto test jobs
 yocto-qemuarm64:
diff --git a/automation/scripts/containerize b/automation/scripts/containerize
index 0f4645c4cc..9e508918bf 100755
--- a/automation/scripts/containerize
+++ b/automation/scripts/containerize
@@ -27,7 +27,7 @@ case "_${CONTAINER}" in
     _alpine) CONTAINER="${BASE}/alpine:3.12" ;;
     _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.12-arm64v8" ;;
     _archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
-    _riscv64) CONTAINER="${BASE}/archlinux:riscv64" ;;
+    _riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;;
     _centos7) CONTAINER="${BASE}/centos:7" ;;
     _centos72) CONTAINER="${BASE}/centos:7.2" ;;
     _fedora) CONTAINER="${BASE}/fedora:29";;
-- 
2.38.1

Re: [PATCH] automation: rename RISCV_64 container and jobs

Posted by Stefano Stabellini 1 year, 2 months ago

On Tue, 10 Jan 2023, Oleksii Kurochko wrote:
> All RISCV_64-related stuff was renamed to be consistent with
> ARM (arm32 is cross build as RISCV_64).
> 
> The patch is based on the following patch series:
> [PATCH *] Basic early_printk and smoke test implementation
> 
> Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>

Reviewed and committed.

Now the container name is archlinux:current-riscv64, make sure to update
it appropriate in the patch "automation: add RISC-V smoke test" when/if
you send a new version


> ---
>  ...v64.dockerfile => current-riscv64.dockerfile} |  0
>  automation/gitlab-ci/build.yaml                  | 16 ++++++++--------
>  automation/gitlab-ci/test.yaml                   |  4 ++--
>  automation/scripts/containerize                  |  2 +-
>  4 files changed, 11 insertions(+), 11 deletions(-)
>  rename automation/build/archlinux/{riscv64.dockerfile => current-riscv64.dockerfile} (100%)
> 
> diff --git a/automation/build/archlinux/riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile
> similarity index 100%
> rename from automation/build/archlinux/riscv64.dockerfile
> rename to automation/build/archlinux/current-riscv64.dockerfile
> diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
> index 6784974619..7ccd153375 100644
> --- a/automation/gitlab-ci/build.yaml
> +++ b/automation/gitlab-ci/build.yaml
> @@ -647,31 +647,31 @@ alpine-3.12-gcc-debug-arm64-boot-cpupools:
>        CONFIG_BOOT_TIME_CPUPOOLS=y
>  
>  # RISC-V 64 cross-build
> -riscv64-cross-gcc:
> +archlinux-current-gcc-riscv64:
>    extends: .gcc-riscv64-cross-build
>    variables:
> -    CONTAINER: archlinux:riscv64
> +    CONTAINER: archlinux:current-riscv64
>      KBUILD_DEFCONFIG: tiny64_defconfig
>      HYPERVISOR_ONLY: y
>  
> -riscv64-cross-gcc-debug:
> +archlinux-current-gcc-riscv64-debug:
>    extends: .gcc-riscv64-cross-build-debug
>    variables:
> -    CONTAINER: archlinux:riscv64
> +    CONTAINER: archlinux:current-riscv64
>      KBUILD_DEFCONFIG: tiny64_defconfig
>      HYPERVISOR_ONLY: y
>  
> -riscv64-cross-gcc-randconfig:
> +archlinux-current-gcc-riscv64-randconfig:
>    extends: .gcc-riscv64-cross-build
>    variables:
> -    CONTAINER: archlinux:riscv64
> +    CONTAINER: archlinux:current-riscv64
>      KBUILD_DEFCONFIG: tiny64_defconfig
>      RANDCONFIG: y
>  
> -riscv64-cross-gcc-debug-randconfig:
> +archlinux-current-gcc-riscv64-debug-randconfig:
>    extends: .gcc-riscv64-cross-build-debug
>    variables:
> -    CONTAINER: archlinux:riscv64
> +    CONTAINER: archlinux:current-riscv64
>      KBUILD_DEFCONFIG: tiny64_defconfig
>      RANDCONFIG: y
>  
> diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
> index 64f47a0ab9..4ca3e54862 100644
> --- a/automation/gitlab-ci/test.yaml
> +++ b/automation/gitlab-ci/test.yaml
> @@ -57,7 +57,7 @@
>  .qemu-riscv64:
>    extends: .test-jobs-common
>    variables:
> -    CONTAINER: archlinux:riscv64
> +    CONTAINER: archlinux:current-riscv64
>      LOGFILE: qemu-smoke-riscv64.log
>    artifacts:
>      paths:
> @@ -252,7 +252,7 @@ qemu-smoke-riscv64-gcc:
>    script:
>      - ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
>    needs:
> -    - riscv64-cross-gcc
> +    - archlinux-current-gcc-riscv64
>  
>  # Yocto test jobs
>  yocto-qemuarm64:
> diff --git a/automation/scripts/containerize b/automation/scripts/containerize
> index 0f4645c4cc..9e508918bf 100755
> --- a/automation/scripts/containerize
> +++ b/automation/scripts/containerize
> @@ -27,7 +27,7 @@ case "_${CONTAINER}" in
>      _alpine) CONTAINER="${BASE}/alpine:3.12" ;;
>      _alpine-arm64v8) CONTAINER="${BASE}/alpine:3.12-arm64v8" ;;
>      _archlinux|_arch) CONTAINER="${BASE}/archlinux:current" ;;
> -    _riscv64) CONTAINER="${BASE}/archlinux:riscv64" ;;
> +    _riscv64) CONTAINER="${BASE}/archlinux:current-riscv64" ;;
>      _centos7) CONTAINER="${BASE}/centos:7" ;;
>      _centos72) CONTAINER="${BASE}/centos:7.2" ;;
>      _fedora) CONTAINER="${BASE}/fedora:29";;
> -- 
> 2.38.1
>

Re: [PATCH] automation: rename RISCV_64 container and jobs

Posted by Andrew Cooper 1 year, 3 months ago

On 10/01/2023 4:25 pm, Oleksii Kurochko wrote:
> All RISCV_64-related stuff was renamed to be consistent with
> ARM (arm32 is cross build as RISCV_64).
>
> The patch is based on the following patch series:
> [PATCH *] Basic early_printk and smoke test implementation
>
> Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
> ---
>  ...v64.dockerfile => current-riscv64.dockerfile} |  0

This rename will break Xen 4.17

Now, as 4.17's RISC-V support was so token that it wasn't even properly
wired into CI, then this is probably fine.

But we absolutely do need to be aware of the consequence before taking
the patch.

~Andrew

Re: [PATCH] automation: rename RISCV_64 container and jobs

Posted by Michal Orzel 1 year, 3 months ago


On 11/01/2023 11:44, Andrew Cooper wrote:
> 
> 
> On 10/01/2023 4:25 pm, Oleksii Kurochko wrote:
>> All RISCV_64-related stuff was renamed to be consistent with
>> ARM (arm32 is cross build as RISCV_64).
>>
>> The patch is based on the following patch series:
>> [PATCH *] Basic early_printk and smoke test implementation
>>
>> Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
>> ---
>>  ...v64.dockerfile => current-riscv64.dockerfile} |  0
> 
> This rename will break Xen 4.17
I guess only if we decide to remove the old container from registry,
which we do not need to do. We already have a few containers in the registry
whose dockerfiles no longer appear in xen.git but are kept in gitlab for backwards compatibility.

> 
> Now, as 4.17's RISC-V support was so token that it wasn't even properly
> wired into CI, then this is probably fine.
> 
> But we absolutely do need to be aware of the consequence before taking
> the patch.
> 
> ~Andrew

~Michal