From 8cfed64b4e66e7cffc003d1568b858fdfca4dbba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E5=B0=8F=E7=99=BD?= <296015668@qq.com> Date: Sat, 28 Dec 2024 18:55:52 +0800 Subject: [PATCH] =?UTF-8?q?openeuler:=20=E4=BF=AE=E6=AD=A3=20loongarch64?= =?UTF-8?q?=20=E6=9E=B6=E6=9E=84=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 吴小白 <296015668@qq.com> --- .jenkins/docker_images_build.sh | 6 ++--- openeuler/download.sh | 40 ++++++++++++++++++++------------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/.jenkins/docker_images_build.sh b/.jenkins/docker_images_build.sh index fea765a6..a06426e8 100644 --- a/.jenkins/docker_images_build.sh +++ b/.jenkins/docker_images_build.sh @@ -57,14 +57,14 @@ build_app_os() for os_version in $(ls -l ${WORKDIR}/${app_name}/${app_version} | grep -v grep | grep ^d | awk '{print $9}') do - if [[ "$os_version" == "22.03-lts" ]]; then + if [[ "$os_version" =~ ^(22\.03|24\.03)-lts$ ]]; then platforms="${platforms},linux/loong64" fi - ##TODO: consider deduplicate the build of the same docker image + ##TODO: consider deduplicate the build of the same docker image echo "start to build docker image for ${app_name}-${app_version} on openEuler-${os_version}" cd ${WORKDIR}/${app_name}/${app_version}/${os_version} && \ - docker buildx build -t "${REPOSITORY}/${app_name}:${app_version}-${os_version}" --platform ${platforms} . --push + docker buildx build -t "${REPOSITORY}/${app_name}:${app_version}-${os_version}" --platform ${platforms} . --push done } diff --git a/openeuler/download.sh b/openeuler/download.sh index 772f7d66..7a9caf8d 100755 --- a/openeuler/download.sh +++ b/openeuler/download.sh @@ -2,24 +2,34 @@ set -ex -archs="x86_64 aarch64 loong64" +archs="x86_64 aarch64 loongarch64" input_version=$1 versions=${input_version:-"20.03-lts 20.03-lts-sp1 20.03-lts-sp2 20.09 21.03 21.09 22.03-lts 22.03-lts-sp1 22.03-lts-sp2 22.09 23.03 23.09"} -for ARCH in $archs ; -do - if [[ "$ARCH" = "aarch64" ]];then - DOCKER_ARCH=arm64 - elif [[ "$ARCH" = "x86_64" ]];then - DOCKER_ARCH=amd64 - elif [[ "$ARCH" = "loong64" && "$versions" = "22.03-lts" ]];then - DOCKER_ARCH=loong64 - else - echo "Unknow arch: "$ARCH - exit 1 - fi - for VERSION in $versions ; - do + +for ARCH in $archs; do + case "$ARCH" in + "aarch64") + DOCKER_ARCH=arm64 + ;; + "x86_64") + DOCKER_ARCH=amd64 + ;; + "loongarch64") + DOCKER_ARCH=loong64 + ;; + *) + echo "Unknown arch: $ARCH" + exit 1 + ;; + esac + for VERSION in $versions; do mkdir -p $VERSION + # "Loongarch64 is supported in 22.03-lts and 24.03-lts" + if [ "$ARCH" == "loongarch64" ]; then + if [[ ! "$VERSION" =~ ^(22\.03|24\.03)-lts$ ]]; then + continue + fi + fi # Download cd $VERSION URL_VERSION=`echo $VERSION | tr 'a-z' 'A-Z'` -- Gitee