tree: import changes from testing-devel at 94ae5f5e1d

.github/workflows/container-native.yml

@@ -1,64 +0,0 @@
-name: Container-native
-
-on:
-  pull_request:
-    branches: [testing-devel]
-
-permissions:
-  contents: read
-
-jobs:
-  podman_build:
-    name: Podman Build
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v4
-      # cargo-culted from rpm-ostree CI
-      # https://github.com/containers/podman/discussions/17362
-      - name: Get newer podman
-        run: |
-          set -xeuo pipefail
-          echo 'deb [trusted=yes] https://ftp.debian.org/debian/ testing main' | sudo tee /etc/apt/sources.list.d/testing.list
-          sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 6ED0E7B82643E131 78DBA3BC47EF2265
-          sudo apt update
-          DIVERSION_PATHS="lib32 libo32 lib64"
-          for PATH_NAME in $DIVERSION_PATHS; do
-            sudo dpkg-divert --remove --package base-files --divert /$PATH_NAME.usr-is-merged /$PATH_NAME || true
-            sudo dpkg-divert --remove --package base-files --divert /.$PATH_NAME.usr-is-merged /$PATH_NAME || true
-          done
-          sudo dpkg --configure -a
-          sudo apt --fix-broken install
-          sudo apt install -y crun/testing podman/testing skopeo/testing
-          # Something is confused in latest GHA here
-          sudo rm /var/lib/containers -rf
-      - name: Download override packages and create yum repo
-        run: |
-          podman run --rm -v $PWD:/run/src -w /run/src quay.io/fedora/fedora:latest sh -c '
-            set -xeuo pipefail
-            dnf -y install koji createrepo_c python3-dnf python3-PyYAML && dnf clean all
-            overridesdir="overrides/rpm"
-
-            # prepare directory to download override packages
-            mkdir -p "${overridesdir}"
-
-            curl -LO https://raw.githubusercontent.com/coreos/coreos-assembler/refs/heads/main/src/download-overrides.py
-            python3 download-overrides.py --downloaddir "./${overridesdir}" --lockfiledir "./"
-
-            # create local yum repo
-            if [[ -n $(ls "${overridesdir}/"*.rpm 2> /dev/null) ]]; then
-              (cd "${overridesdir}" && createrepo_c .)
-            else
-              # remove empty dir rpmoverrides
-              rm -rf "${overridesdir}/"
-            fi
-            rm download-overrides.py
-          '
-      - name: Build
-        # Note: we should be able to drop the `-v $PWD:/run/src` once
-        # https://github.com/containers/buildah/issues/5952 is fixed.
-        run: |
-          set -xeuo pipefail
-          podman build --security-opt=label=disable --cap-add=all --device /dev/fuse --build-arg-file build-args.conf  -v $PWD:/run/src . -t localhost/fedora-coreos
-      - name: Sanity-check
-        run: podman run --rm localhost/fedora-coreos echo hello

tests/kola/composefs/enabled

@@ -9,12 +9,6 @@ set -euo pipefail
 # shellcheck disable=SC1091
 . "$KOLA_EXT_DATA/commonlib.sh"
 
-# RHCOS based on 9.4 doesn't use composefs, but legacy sysroot.readonly flag
-if is_rhcos && [[ "$(get_rhel_ver)" = "9.4" ]]; then
-    echo "skipping 9.4"
-    exit 0
-fi
-
 features=$(ostree --version)
 if ! [[ "${features}" =~ "composefs" ]]; then
     fatal "Error: ostree has no composefs support: ${features}"