fix

Author: spiritLHLS

build_images.sh

@@ -89,8 +89,10 @@ build_or_list_images() {
         for arch in "${architectures[@]}"; do
             for variant in "${variants[@]}"; do
                 # apk apt dnf egoportage opkg pacman portage yum equo xbps zypper luet slackpkg
-                if [[ "$run_funct" == "centos" || "$run_funct" == "fedora" || "$run_funct" == "openeuler" ]]; then
+                if [[ "$run_funct" == "centos" || "$run_funct" == "openeuler" ]]; then
                     manager="yum"
+                elif [[ "$run_funct" == "fedora" ]]; then
+                    manager="dnf"
                 elif [[ "$run_funct" == "kali" || "$run_funct" == "ubuntu" || "$run_funct" == "debian" ]]; then
                     manager="apt"
                 elif [[ "$run_funct" == "almalinux" || "$run_funct" == "rockylinux" || "$run_funct" == "oracle" ]]; then
@@ -262,34 +264,26 @@ centos)
     build_or_list_images "9-Stream" "9" "default cloud"
     ;;
 almalinux)
-    URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-almalinux.yaml"
-    curl_output=$(curl -s "$URL" | awk '/name: release/{flag=1; next} /^$/{flag=0} flag && /^ *-/{if (!first) {printf "%s", $2; first=1} else {printf " %s", $2}}' | sed 's/"//g')
-    build_or_list_images "$curl_output" "$curl_output" "default cloud"
+    build_or_list_images "8 9 10" "8 9 10" "default cloud"
     ;;
 rockylinux)
-    URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-rockylinux.yaml"
-    curl_output=$(curl -s "$URL" | awk '/name: release/{flag=1; next} /^$/{flag=0} flag && /^ *-/{if (!first) {printf "%s", $2; first=1} else {printf " %s", $2}}' | sed 's/"//g')
-    build_or_list_images "$curl_output" "$curl_output" "default cloud"
+    build_or_list_images "8 9 10" "8 9 10" "default cloud"
     ;;
 alpine)
     URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-alpine.yaml"
     curl_output=$(curl -s "$URL" | awk '/name: release/{flag=1; next} /^$/{flag=0} flag && /^ *-/{if (!first) {printf "%s", $2; first=1} else {printf " %s", $2}}' | sed 's/"//g')
     build_or_list_images "$curl_output" "$curl_output" "default cloud"
     ;;
 openwrt)
-    URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-openwrt.yaml"
-    curl_output=$(curl -s "$URL" | awk '/name: release/{flag=1; next} /^$/{flag=0} flag && /^ *-/{if (!first) {printf "%s", $2; first=1} else {printf " %s", $2}}' | sed 's/"//g')
-    build_or_list_images "$curl_output" "$curl_output" "default cloud"
+    build_or_list_images "23.05 24.10" "23.05 24.10" "default cloud"
     ;;
 oracle)
     URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-oracle.yaml"
     curl_output=$(curl -s "$URL" | awk '/name: release/{flag=1; next} /^$/{flag=0} flag && /^ *-/{if (!first) {printf "%s", $2; first=1} else {printf " %s", $2}}' | sed 's/"//g')
     build_or_list_images "$curl_output" "$curl_output" "default cloud"
     ;;
 fedora)
-    URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-fedora.yaml"
-    curl_output=$(curl -s "$URL" | awk '/name: release/{flag=1; next} /^$/{flag=0} flag && /^ *-/{if (!first) {printf "%s", $2; first=1} else {printf " %s", $2}}' | sed 's/"//g')
-    build_or_list_images "$curl_output" "$curl_output" "default cloud"
+    build_or_list_images "41 42" "41 42" "default cloud"
     ;;
 opensuse)
     URL="https://raw.githubusercontent.com/lxc/lxc-ci/main/jenkins/jobs/image-opensuse.yaml"

clone_modify_yaml.sh

@@ -114,6 +114,26 @@ echo "$insert_content_2" >> temp.yaml
 tail -n 2 archlinux.yaml >> temp.yaml
 mv temp.yaml archlinux.yaml
 sed -i -e '/mappings:/i \ ' archlinux.yaml
+# 修复 ARM 架构：移除会导致构建失败的 kernel/openssh remove 块，保留 openssh 安装
+python3 - <<'PYEOF'
+import re
+with open('archlinux.yaml', 'r') as f:
+    content = f.read()
+# 移除 linux-aarch64 remove 块（ARM bootstrap 中内核依赖复杂，移除可能失败）
+content = re.sub(
+    r'\n  - packages:\n    - linux-aarch64\n    action: remove\n    architectures:\n    - aarch64\n    types:\n    - container',
+    '', content)
+# 移除 linux-armv7 remove 块
+content = re.sub(
+    r'\n  - packages:\n    - linux-armv7\n    action: remove\n    architectures:\n    - armv7',
+    '', content)
+# 从 ARM remove 块中去掉 openssh（aarch64/armv7 构建需要 openssh 提供 sshd）
+content = re.sub(
+    r'(\n  - packages:\n    - libedit\n    - net-tools)\n    - openssh(\n    action: remove\n    architectures:\n    - aarch64\n    - armv7)',
+    r'\1\2', content)
+with open('archlinux.yaml', 'w') as f:
+    f.write(content)
+PYEOF
 
 # gentoo
 rm -rf gentoo.yaml
@@ -143,6 +163,8 @@ cat fedora.yaml > temp.yaml
 echo "" >> temp.yaml
 echo "$insert_content_2" >> temp.yaml
 mv temp.yaml fedora.yaml
+# fipscheck 在 Fedora 28+ 已被移除，保留会导致构建失败
+sed -i '/^    - fipscheck$/d' fedora.yaml
 
 # alpine
 rm -rf alpine.yaml

images_yaml/archlinux.yaml

@@ -205,27 +205,8 @@ packages:
     - vm
 
   - packages:
-    - linux-aarch64
-    action: remove
-    architectures:
-    - aarch64
-    types:
-    - container
-
-  - packages:
-    - linux-armv7
-    action: remove
-    architectures:
-    - armv7
-
-  - packages:
-    - libedit
-    - net-tools
     - openssh
-    action: remove
-    architectures:
-    - aarch64
-    - armv7
+    action: install
 
   - packages:
     - linux-firmware
@@ -254,6 +235,24 @@ actions:
     # Update pacman-keyring to ensure package installs will not break because of GPG issues
     pacman -Sy --needed --noconfirm archlinux-keyring
 
+- trigger: post-packages
+  action: |-
+    #!/bin/sh
+    # Remove ARM bootstrap kernel packages from containers if present
+    pacman -R --noconfirm linux-aarch64 2>/dev/null || true
+  architectures:
+  - aarch64
+  types:
+  - container
+
+- trigger: post-packages
+  action: |-
+    #!/bin/sh
+    # Remove ARM bootstrap kernel and unused packages if present
+    pacman -R --noconfirm linux-armv7 libedit net-tools 2>/dev/null || true
+  architectures:
+  - armv7
+
 - trigger: post-packages
   action: |-
     #!/bin/sh

images_yaml/fedora.yaml

@@ -169,7 +169,6 @@ packages:
     - cpio
     - file
     - findutils
-    - fipscheck
     - gettext
     - glibc-all-langpacks
     - hardlink