[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] automation: rename RISCV_64 container and jobs
commit 87ee7a817d1800dc41e118f4035917b80498433a Author: Oleksii Kurochko <oleksii.kurochko@xxxxxxxxx> AuthorDate: Tue Jan 24 14:15:30 2023 -0800 Commit: Stefano Stabellini <stefano.stabellini@xxxxxxx> CommitDate: Tue Jan 24 14:32:10 2023 -0800 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 <oleksii.kurochko@xxxxxxxxx> Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxx> Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx> --- .../build/archlinux/current-riscv64.dockerfile | 21 +++++++++++++++++++++ automation/build/archlinux/riscv64.dockerfile | 21 --------------------- automation/gitlab-ci/build.yaml | 16 ++++++++-------- automation/scripts/containerize | 2 +- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/automation/build/archlinux/current-riscv64.dockerfile b/automation/build/archlinux/current-riscv64.dockerfile new file mode 100644 index 0000000000..abf8e7bf0b --- /dev/null +++ b/automation/build/archlinux/current-riscv64.dockerfile @@ -0,0 +1,21 @@ +FROM archlinux +LABEL maintainer.name="The Xen Project" \ + maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" + +# Packages needed for the build +RUN pacman --noconfirm --needed -Syu \ + base-devel \ + git \ + inetutils \ + riscv64-linux-gnu-binutils \ + riscv64-linux-gnu-gcc \ + riscv64-linux-gnu-glibc \ + # For test phase + qemu-system-riscv + +# Add compiler path +ENV CROSS_COMPILE=riscv64-linux-gnu- + +RUN useradd --create-home user +USER user +WORKDIR /build diff --git a/automation/build/archlinux/riscv64.dockerfile b/automation/build/archlinux/riscv64.dockerfile deleted file mode 100644 index abf8e7bf0b..0000000000 --- a/automation/build/archlinux/riscv64.dockerfile +++ /dev/null @@ -1,21 +0,0 @@ -FROM archlinux -LABEL maintainer.name="The Xen Project" \ - maintainer.email="xen-devel@xxxxxxxxxxxxxxxxxxxx" - -# Packages needed for the build -RUN pacman --noconfirm --needed -Syu \ - base-devel \ - git \ - inetutils \ - riscv64-linux-gnu-binutils \ - riscv64-linux-gnu-gcc \ - riscv64-linux-gnu-glibc \ - # For test phase - qemu-system-riscv - -# Add compiler path -ENV CROSS_COMPILE=riscv64-linux-gnu- - -RUN useradd --create-home user -USER user -WORKDIR /build 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";; -- generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |