Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions ci/prow-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ setup_variant() {
ln -snf "manifest-${variant}.yaml" "src/config/manifest.yaml"
ln -snf "extensions-${variant}.yaml" "src/config/extensions.yaml"
ln -snf "image-${variant}.yaml" "src/config/image.yaml"
ln -snf "kola-denylist-${variant}.yaml" "src/config/kola-denylist.yaml"
}

# Do a cosa build & cosa build-extensions only.
Expand Down Expand Up @@ -148,10 +149,6 @@ kola_test_metal() {
}

# Temporary to get EL9 in CI
kola_test_qemu_light() {
cosa buildextend-qemu
cosa kola --basic-qemu-scenarios
}
kola_test_metal_light() {
cosa buildextend-metal
cosa buildextend-metal4k
Expand Down Expand Up @@ -276,25 +273,23 @@ main () {
# Temporary. Will be removed once variant support is in COSA
setup_variant "c9s"
cosa_build
# Temporary light tests only until all tests pass
kola_test_qemu_light
# kola_test_qemu
kola_test_qemu
;;
"scos-9-build-test-metal" )
setup_user
cosa_init
# Temporary. Will be removed once variant support is in COSA
setup_variant "c9s"
cosa_build
# Temporary light tests only until all tests pass
# Temporary to get SCOS in CI
kola_test_metal_light
# kola_test_metal
;;
"explicitely-disabled-test")
echo "Disabled tests"
exit 0
;;
*)
# This case ensures that we exhaustively list the tests that should
# pass for a PR. To add a new test in openshift/os:
# 1. Add a new test case here that does nothing and get it merged
# 2. Add a new test job in openshift/release that calls this test
# 3. Update your test here and debug it with the CI in the PR
echo "Unknown test name"
exit 1
;;
Expand Down
10 changes: 7 additions & 3 deletions common-el9.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ postprocess:
#!/usr/bin/env bash
set -xeo pipefail

# FIXME: Force enable dbus-broker to get the dbus.service → dbus-broker.service
systemctl enable dbus-broker

# FIXME: Why is this only broken here? NM isn't removing the link?
sed -i '/etc.resolv/d' /usr/lib/tmpfiles.d/etc.conf

Expand All @@ -27,6 +24,13 @@ postprocess:
runtime_path="/usr/bin/crun"
EOF

# Enable tmp-on-tmpfs by default because we don't want to have things leak
# across reboots, it increases alignment with FCOS, and also fixes the
# Live ISO. First, verify that RHEL is still disabling.
grep -q '# RHEL-only: Disable /tmp on tmpfs' /usr/lib/systemd/system/basic.target
echo '# RHCOS-only: we follow the Fedora/upstream default' >> /usr/lib/systemd/system/basic.target
echo 'Wants=tmp.mount' >> /usr/lib/systemd/system/basic.target

# Packages that are only for SCOS & RHCOS 9
packages:
- openvswitch2.17
52 changes: 52 additions & 0 deletions kola-denylist-c9s.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
# This file documents currently known-to-fail kola tests. It is consumed by
# coreos-assembler to automatically skip some tests. For more information,
# see: https://github.com/coreos/coreos-assembler/pull/866.
- pattern: fips.enable*
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=1782026
arches:
- s390x
- pattern: coreos.ignition.journald-log
tracker: https://github.com/coreos/coreos-assembler/issues/1173
- pattern: coreos.ignition.mount.*
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=1899990
arches:
- s390x
- pattern: ext.config.shared.ignition.stable-boot
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=2075085
arches:
- s390x
- pattern: ext.config.shared.kdump.crash
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: coreos.boot-mirror.luks
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: coreos.boot-mirror
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: ext.config.shared.files.file-directory-permissions
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1243
arches:
- s390x
- pattern: ext.config.shared.kdump.crash
tracker: https://github.com/coreos/fedora-coreos-config/issues/1500
arches:
- s390x

# Broken tests under investigation
- pattern: coreos.boot-mirror
- pattern: ext.config.shared.chrony.dhcp-propagation
- pattern: ext.config.shared.files.dracut-executable
tracker: https://github.com/openshift/os/issues/942
- pattern: ext.config.shared.networking.default-network-behavior-change
- pattern: ext.config.shared.networking.force-persist-ip
- pattern: ext.config.shared.networking.mtu-on-bond-kargs
- pattern: ext.config.shared.networking.prefer-ignition-networking
- pattern: ext.config.shared.podman.dns
- pattern: ext.config.version.rhel-major-version
- pattern: ext.config.version.rhel-matches-rhcos-build
- pattern: rhcos.network.bond-with-dhcp
- pattern: rhcos.network.bond-with-restart
37 changes: 37 additions & 0 deletions kola-denylist-rhel-8.6.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This file documents currently known-to-fail kola tests. It is consumed by
# coreos-assembler to automatically skip some tests. For more information,
# see: https://github.com/coreos/coreos-assembler/pull/866.
- pattern: fips.enable*
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=1782026
arches:
- s390x
- pattern: coreos.ignition.journald-log
tracker: https://github.com/coreos/coreos-assembler/issues/1173
- pattern: coreos.ignition.mount.*
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=1899990
arches:
- s390x
- pattern: ext.config.shared.ignition.stable-boot
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=2075085
arches:
- s390x
- pattern: ext.config.shared.kdump.crash
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: coreos.boot-mirror.luks
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: coreos.boot-mirror
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: ext.config.shared.files.file-directory-permissions
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1243
arches:
- s390x
- pattern: ext.config.shared.kdump.crash
tracker: https://github.com/coreos/fedora-coreos-config/issues/1500
arches:
- s390x
37 changes: 37 additions & 0 deletions kola-denylist-rhel-9.0.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# This file documents currently known-to-fail kola tests. It is consumed by
# coreos-assembler to automatically skip some tests. For more information,
# see: https://github.com/coreos/coreos-assembler/pull/866.
- pattern: fips.enable*
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=1782026
arches:
- s390x
- pattern: coreos.ignition.journald-log
tracker: https://github.com/coreos/coreos-assembler/issues/1173
- pattern: coreos.ignition.mount.*
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=1899990
arches:
- s390x
- pattern: ext.config.shared.ignition.stable-boot
tracker: https://bugzilla.redhat.com/show_bug.cgi?id=2075085
arches:
- s390x
- pattern: ext.config.shared.kdump.crash
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: coreos.boot-mirror.luks
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: coreos.boot-mirror
tracker: https://github.com/coreos/coreos-assembler/issues/2725
arches:
- ppc64le
- pattern: ext.config.shared.files.file-directory-permissions
tracker: https://github.com/coreos/fedora-coreos-tracker/issues/1243
arches:
- s390x
- pattern: ext.config.shared.kdump.crash
tracker: https://github.com/coreos/fedora-coreos-config/issues/1500
arches:
- s390x
37 changes: 0 additions & 37 deletions kola-denylist.yaml

This file was deleted.

1 change: 1 addition & 0 deletions kola-denylist.yaml
4 changes: 4 additions & 0 deletions manifest-c9s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ include:

# Starting from here, everything should be specific to SCOS

# SCOS specific overlays
ostree-layers:
- overlay/07c9s

# CentOS Stream 9 repos + internal repos for now
repos:
- baseos
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
disable iscsid.socket
1 change: 1 addition & 0 deletions tests/kola/toolbox
18 changes: 0 additions & 18 deletions tests/kola/version/toolbox

This file was deleted.