WIP

Signed-off-by: Alexey Gladkov <gladkov.alexey@gmail.com>

Author: legionus

.github/workflows/ci.yml

@@ -13,47 +13,16 @@ on:
 jobs:
   verify:
     uses: ./.github/workflows/verify.yml
-  altlinux:
-    needs:
-      - verify
-    uses: ./.github/workflows/testcases.yml
-    with:
-      vendor: altlinux
-      exclude: '[{"testcase": "zfs-partition"}, {"testcase": "initramfs-on-erofs"}]'
-  fedora:
-    needs:
-      - verify
-    uses: ./.github/workflows/testcases.yml
-    with:
-      vendor: fedora
-      exclude: '[{"testcase": "zfs-partition"},{"testcase": "lvm+luks"}]'
-  ubuntu:
-    needs:
-      - verify
-    uses: ./.github/workflows/testcases.yml
-    with:
-      vendor: ubuntu
   gentoo:
     needs:
       - verify
     uses: ./.github/workflows/testcases.yml
     with:
       vendor: gentoo
       exclude: '[{"testcase": "zfs-partition"}]'
-  gentoo_musl:
-    needs:
-      - verify
-    uses: ./.github/workflows/testcases.yml
-    with:
-      vendor: gentoo_musl
-      exclude: '[{"testcase": "zfs-partition"}, {"testcase": "initramfs-on-erofs"}, {"testcase": "initramfs-on-squashfs"}]'
   metrics:
     needs:
-      - altlinux
-      - fedora
-      - ubuntu
       - gentoo
-      - gentoo_musl
     runs-on: ubuntu-latest
     if: success() || failure()
     steps:

testing/packages-gentoo

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 MAKE_INITRD_PACKAGES="app-alternatives/cpio app-arch/tar dev-build/make"
-MAKE_INITRD_PACKAGES+=" dev-libs/elfutils net-libs/libtirpc" # sys-apps/coreutils
+MAKE_INITRD_PACKAGES+=" dev-libs/elfutils net-libs/libtirpc sys-apps/coreutils"
 MAKE_INITRD_PACKAGES+=" sys-apps/findutils sys-apps/grep sys-apps/kmod sys-apps/util-linux"
 MAKE_INITRD_PACKAGES+=" virtual/libcrypt:= virtual/udev app-arch/bzip2 app-arch/xz-utils"
 MAKE_INITRD_PACKAGES+=" app-text/scdoc sys-libs/zlib app-arch/zstd dev-libs/json-c"

testing/testing-gentoo

@@ -65,7 +65,8 @@ for step in "$@"; do
 			RUN getuto >/dev/null
 			RUN emerge-webrsync --quiet
 			RUN emerge $emerge_args $KERNEL_PACKAGES
-			RUN emerge $emerge_args $SYSIMAGE_PACKAGES
+			RUN for i in $SYSIMAGE_PACKAGES; do [ -n "\$(find /var/db/pkg -mindepth 2 -maxdepth 2 -ipath "*/\${i%%:*}-*" -print -quit)"  ] || pkgs="\${pkgs-} \$i"; done; \
+			 [ -z "\${pkgs-}" ] || emerge $emerge_args \$pkgs
 			RUN emerge --depclean --with-bdeps=n --ask=n
 			RUN $(image_depmod)
 			RUN \
@@ -96,7 +97,8 @@ for step in "$@"; do
 			ENV USE="boot lvm -initramfs"
 			RUN emerge-webrsync --quiet
 			RUN emerge $emerge_args $KERNEL_PACKAGES
-			RUN emerge $emerge_args $KICKSTART_PACKAGES
+			RUN for i in $KICKSTART_PACKAGES; do [ -n "\$(find /var/db/pkg -mindepth 2 -maxdepth 2 -ipath "*/\${i%%:*}-*" -print -quit)"  ] || pkgs="\${pkgs-} \$i"; done; \
+			 [ -z "\${pkgs-}" ] || emerge $emerge_args \$pkgs
 			RUN emerge --depclean --with-bdeps=n --ask=n
 			RUN $(image_depmod)
 			RUN $(image_cleanup)