various fixes

.github/actions/image-setup/action.yml

@@ -27,12 +27,37 @@ runs:
       run: |
         sudo apt-get -qq update
         sudo apt-get install -y --no-install-recommends \
+            btrfs-progs \
+            build-essential \
+            ca-certificates \
+            curl \
             debootstrap \
-            qemu-utils \
+            dirmngr \
+            dosfstools \
+            gcc \
+            gdisk \
             git \
             gpg \
+            gpg-agent \
+            kpartx \
+            libc6-dev \
+            libncurses-dev \
+            make \
+            mawk \
+            patch \
+            python3 \
+            qemu-utils \
             rsync \
-            squashfs-tools
+            squashfs-tools \
+            unzip \
+            xz-utils \
+            zstd
+            # debootstrap \
+            # qemu-utils \
+            # git \
+            # gpg \
+            # rsync \
+            # squashfs-tools
 
     - name: Install Go ${{ inputs.go-version }}
       uses: actions/setup-go@v5

.github/workflows/image-centos.yml

@@ -22,7 +22,7 @@ jobs:
       matrix:
         release:
           - 7 # CentOS 7 tests require cgroups v1. They will pass on ubuntu-20.04 runner.
-          - 8-Stream
+          # - 8-Stream
           - 9-Stream
         variant:
           - default

.github/workflows/images.yml

@@ -15,9 +15,9 @@ jobs:
   # almalinux:
   #   uses: ./.github/workflows/image-almalinux.yml
   #   secrets: inherit
-  alpine:
-    uses: ./.github/workflows/image-alpine.yml
-    secrets: inherit
+  # alpine:
+  #   uses: ./.github/workflows/image-alpine.yml
+  #   secrets: inherit
   # alt:
   #   uses: ./.github/workflows/image-alt.yml
   #   secrets: inherit
@@ -30,9 +30,9 @@ jobs:
   # busybox:
   #   uses: ./.github/workflows/image-busybox.yml
   #   secrets: inherit
-  # centos:
-  #   uses: ./.github/workflows/image-centos.yml
-  #   secrets: inherit
+  centos:
+    uses: ./.github/workflows/image-centos.yml
+    secrets: inherit
   # debian:
   #   uses: ./.github/workflows/image-debian.yml
   #   secrets: inherit
@@ -57,9 +57,9 @@ jobs:
   # openeuler:
   #   uses: ./.github/workflows/image-openeuler.yml
   #   secrets: inherit
-  # opensuse:
-  #   uses: ./.github/workflows/image-opensuse.yml
-  #   secrets: inherit
+  opensuse:
+    uses: ./.github/workflows/image-opensuse.yml
+    secrets: inherit
   # openwrt:
   #   uses: ./.github/workflows/image-openwrt.yml
   #   secrets: inherit

bin/helpers

@@ -13,7 +13,7 @@ waitSnapdSeed() (
 # waitInstanceReady: waits for the instance to be ready (processes count > 1).
 waitInstanceReady() (
   set +x
-  maxWait=120
+  maxWait="${MAX_WAIT_SECONDS:-120}"
   instName="${1}"
   instProj="${2:-}"
   if [ -z "${instProj}" ]; then

bin/test-image

@@ -155,6 +155,10 @@ for i in ${INSTANCES}; do
         MIN_PROC_COUNT=1
     fi
 
+    if [ "${DIST}" == "centos" ]; then
+        MAX_WAIT_SECONDS=180
+    fi
+
     waitInstanceReady "${i}"
 done