Merge pull request #1675 from ErikJiang/big_cloud_os

support bcLinux for os package

Author: ErikJiang

.github/workflows/call-speedup-offline-packags.yaml

@@ -7,7 +7,7 @@ jobs:
       strategy:
         fail-fast: false
         matrix:
-          file: [ files-amd64, images-amd64, files-arm64, images-arm64, os-pkgs-centos7, os-pkgs-kylin-v10sp2, os-pkgs-kylin-v10sp3, os-pkgs-kylin-v112503, os-pkgs-redhat8, os-pkgs-ubuntu2204 ]
+          file: [ files-amd64, images-amd64, files-arm64, images-arm64, os-pkgs-centos7, os-pkgs-kylin-v10sp2, os-pkgs-kylin-v10sp3, os-pkgs-kylin-v112503, os-pkgs-redhat8, os-pkgs-ubuntu2204, os-pkgs-bigcloud2110 ]
       permissions:
         packages: write
         contents: read

.github/workflows/os-pkgs-matrix.json

@@ -14,5 +14,6 @@
   { "name": "tencent31", "dockerfile":"build/os-packages/Dockerfile.tencent31"},
   { "name": "ubuntu2004", "dockerfile":"build/os-packages/Dockerfile.ubuntu2004"},
   { "name": "ubuntu2204", "dockerfile":"build/os-packages/Dockerfile.ubuntu2204"},
-  { "name": "ubuntu2404", "dockerfile":"build/os-packages/Dockerfile.ubuntu2404"}
+  { "name": "ubuntu2404", "dockerfile":"build/os-packages/Dockerfile.ubuntu2404"},
+  { "name": "bigcloud2110", "dockerfile":"build/os-packages/Dockerfile.bigcloud2110"}
 ]

artifacts/import_iso.sh

@@ -124,6 +124,12 @@ function iso::mk_server_path() {
             return
           fi
         fi
+        if [[ "$os" =~ "BigCloud" ]]; then
+          if [[ "${version}" == "21" ]]; then
+            echo "/bigcloud-iso/2110/os/$arch"
+            return
+          fi
+        fi
         if [[ "$os" =~ "Rocky Linux" ]]; then
           echo "/rocky-iso/$version/os/$arch"
           return

build/os-packages/Dockerfile.bigcloud2110

@@ -0,0 +1,19 @@
+FROM openeuler/openeuler:22.03-lts as bclinux2110
+ARG OS_VERSION=2210
+ARG BUILD_TOOLS="dnf-utils dnf-plugins-core createrepo"
+
+WORKDIR /bigcloud/${OS_VERSION}/os
+COPY build/os-packages/repos/bigcloud.2110.repo /etc/yum.repos.d/
+COPY build/os-packages/packages.yml .
+COPY --from=mikefarah/yq:4.30.8 /usr/bin/yq /usr/bin/yq
+RUN yq eval '.common[],.yum[],.bigcloud[]' packages.yml > packages.list
+
+RUN ARCH=$(uname -m) \
+    && rm -rf /etc/yum.repos.d/openEuler* \
+    && dnf install -y ${BUILD_TOOLS} \
+    && dnf clean all && dnf makecache \
+    && while read -r line; do dnf install -y --downloadonly --downloaddir=${ARCH} ${line} --nobest --allowerasing; done <<<"$(sort -u packages.list)" \
+    && createrepo -d ${ARCH}
+
+FROM scratch
+COPY --from=bclinux2110 /bigcloud /resources/bigcloud

build/os-packages/check_rebuild_pkgs.sh

@@ -36,7 +36,7 @@ fi
 git diff --quiet "${prev_tag}" "${late_tag}" "build/os-packages/Dockerfile.${OS_NAME}" || { echo "true"; exit; }
 
 # centos / kylinv / redhat / rocky / oracle / tencent / openEuler
-if [[ "${OS_NAME}" =~ ^(centos|kylin|redhat|rocky|oracle|tencent|openeuler).* ]]; then
+if [[ "${OS_NAME}" =~ ^(centos|kylin|redhat|rocky|oracle|tencent|openeuler|bigcloud).* ]]; then
   os_key="${OS_NAME/-v10sp*/}"
   late_digest=$(echo "${late_packages_yml}" | yq eval ".common[],.yum[],.${os_key}[]" | sort | sha1sum | awk '{print $1}')
   prev_digest=$(echo "${prev_packages_yml}" | yq eval ".common[],.yum[],.${os_key}[]" | sort | sha1sum | awk '{print $1}')

build/os-packages/packages.yml

@@ -115,3 +115,7 @@ tencentos31:
   - nss
   - socat
   - container-selinux
+
+bigcloud2110:
+  - socat
+  - container-selinux

build/os-packages/repos/bigcloud.2110.repo

@@ -0,0 +1,30 @@
+[OS]
+name=OS
+baseurl=http://mirrors.cmecloud.cn/bclinux/v21.10U4/OS/$basearch/
+enabled=1
+gpgcheck=0
+
+[everything]
+name=everything
+baseurl=http://mirrors.cmecloud.cn/bclinux/v21.10U4/everything/$basearch/
+enabled=1
+gpgcheck=0
+
+[debuginfo]
+name=debuginfo
+baseurl=http://mirrors.cmecloud.cn/bclinux/v21.10U4/debuginfo/$basearch/
+enabled=1
+gpgcheck=0
+
+# sshpass package is missing in v21.10U4 repo, use oe21.10 repo to supplement it.
+[everything-oe21.10]
+name=everything-oe21.10
+baseurl=http://mirrors.cmecloud.cn/bclinux/oe21.10/everything/$basearch/
+enabled=1
+gpgcheck=0
+
+[update]
+name=update
+baseurl=http://mirrors.cmecloud.cn/bclinux/v21.10U4/update/$basearch/
+enabled=1
+gpgcheck=0