From 87ee7a817d1800dc41e118f4035917b80498433a Mon Sep 17 00:00:00 2001 From: Oleksii Kurochko Date: Tue, 24 Jan 2023 14:15:30 -0800 Subject: [PATCH] automation: rename RISCV_64 container and jobs All RISCV_64-related stuff was renamed to be consistent with ARM (arm32 is cross build as RISCV_64). Signed-off-by: Oleksii Kurochko Signed-off-by: Stefano Stabellini Reviewed-by: Stefano Stabellini --- ...v64.dockerfile => current-riscv64.dockerfile} | 0 automation/gitlab-ci/build.yaml | 16 ++++++++-------- automation/scripts/containerize | 2 +- 3 files changed, 9 insertions(+), 9 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 a292f0fb18..a053c5c732 100644 --- a/automation/gitlab-ci/build.yaml +++ b/automation/gitlab-ci/build.yaml @@ -647,33 +647,33 @@ 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 EXTRA_FIXED_RANDCONFIG: CONFIG_COVERAGE=n -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 EXTRA_FIXED_RANDCONFIG: 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.39.5