From 2ae9190e5584f8f23b5a2dd0044f111d7a8680e3 Mon Sep 17 00:00:00 2001 From: gursewak1997 Date: Wed, 14 Dec 2022 09:14:09 -0800 Subject: [PATCH] kola: Update kola tests to use new YAML format for kola options --- README.md | 7 ++-- tests/kola/README.md | 3 +- tests/kola/binfmt/qemu | 25 +++++++------- tests/kola/boot/bootupd | 3 +- tests/kola/clhm/ignition-warnings/test.sh | 12 +++---- tests/kola/containers/cgroups-v2 | 10 +++--- tests/kola/disks/root-boot-ro | 3 +- tests/kola/disks/root-prjquota | 3 +- tests/kola/disks/systemd-repart-service | 12 ++++--- tests/kola/disks/tmpfs | 3 +- tests/kola/extensions/module | 21 ++++++------ tests/kola/extensions/package | 20 ++++++----- tests/kola/files/aleph-version | 3 +- tests/kola/files/check-symlink | 3 +- tests/kola/files/etc-passwd-group-permissions | 3 +- tests/kola/files/fcos_groups | 4 ++- tests/kola/files/fcos_users | 4 ++- tests/kola/files/file-directory-permissions | 3 +- tests/kola/files/kernel-headers | 3 +- tests/kola/files/license | 3 +- tests/kola/files/logrotate-service | 3 +- tests/kola/files/remove-manifest-files | 10 +++--- tests/kola/files/root-immutable-bit | 3 +- tests/kola/files/rpmdb-sqlite | 8 +++-- tests/kola/files/setgid | 3 +- tests/kola/files/setuid | 3 +- tests/kola/files/sudoers | 3 +- tests/kola/files/system-generators | 3 +- tests/kola/files/trust-cpu | 3 +- tests/kola/files/unlabeled-contexts | 3 +- tests/kola/files/yum-repo-dir | 3 +- tests/kola/firewall/iptables-legacy/test.sh | 8 +++-- tests/kola/firewall/iptables/test.sh | 3 +- tests/kola/ignition/delete-config/test.sh | 8 ++--- tests/kola/ignition/remote/test.sh | 3 +- .../resource/authenticated-gs/test.sh | 10 +++--- .../resource/authenticated-s3/test.sh | 10 +++--- tests/kola/ignition/resource/remote/test.sh | 14 ++++---- tests/kola/ignition/stable-boot/test.sh | 9 ++--- tests/kola/ignition/systemd-disable/test.sh | 15 +++++---- .../ignition/systemd-enable-units/test.sh | 7 ++-- tests/kola/ignition/systemd-unmasking/test.sh | 16 +++++---- tests/kola/k8s/node-e2e/master | 10 ++++-- tests/kola/kdump/crash/test.sh | 18 +++++----- tests/kola/kdump/service | 3 +- tests/kola/kubernetes/kube-watch/test.sh | 3 +- .../kola/kubernetes/systemd-env-read/test.sh | 3 +- tests/kola/logging/printk | 3 +- tests/kola/multipath/multipathd-service-fix | 6 ++-- .../default-network-behavior-change/test.sh | 6 ++-- tests/kola/networking/dnsmasq-service | 10 +++--- .../kola/networking/force-persist-ip/test.sh | 27 ++++++++------- .../hostname/fallback-hostname/test.sh | 3 +- tests/kola/networking/kargs-rd-net | 21 ++++++------ .../networking/mtu-on-bond-ignition/test.sh | 25 +++++++------- tests/kola/networking/mtu-on-bond-kargs | 27 ++++++++------- tests/kola/networking/nameserver | 14 ++++---- tests/kola/networking/network-online-service | 3 +- tests/kola/networking/nic-naming | 12 ++++--- tests/kola/networking/nm-dhcp-client | 3 +- tests/kola/networking/nm-start | 3 +- .../bootif | 18 +++++----- .../default | 3 +- .../prefer-ignition-networking/test.sh | 30 ++++++++--------- tests/kola/networking/resolv/systemd-resolved | 8 +++-- .../chrony/coreos-platform-chrony-generator | 4 ++- ...reos-platform-chrony-generator-permissions | 3 +- tests/kola/ntp/chrony/dhcp-propagation | 2 +- .../ntp/timesyncd/dhcp-propagation/test.sh | 2 +- tests/kola/podman/dns/test.sh | 25 +++++++------- tests/kola/podman/rootless-systemd | 28 ++++++++-------- tests/kola/reboot/test.sh | 3 +- .../root-reprovision/filesystem-only/test.sh | 21 ++++++------ tests/kola/root-reprovision/linear/test.sh | 26 +++++++-------- tests/kola/root-reprovision/luks/test.sh | 25 +++++++------- tests/kola/root-reprovision/raid1/test.sh | 26 +++++++-------- .../root-reprovision/swap-before-root/test.sh | 33 +++++++++---------- tests/kola/rpm-ostree-countme/test.sh | 9 +++-- tests/kola/rpm-ostree/container-deps | 3 +- .../security/coreos-update-ca-trust/test.sh | 3 +- tests/kola/security/passwd/test.sh | 8 +++-- tests/kola/selinux/enforcing | 3 +- tests/kola/selinux/stub-resolve-context | 8 +++-- tests/kola/selinux/usrlocal-context | 3 +- tests/kola/swap/zram-default | 3 +- tests/kola/swap/zram-generator/test.sh | 8 +++-- tests/kola/toolbox/test.sh | 20 ++++++----- tests/kola/var-mount/luks/test.sh | 6 ++-- tests/kola/var-mount/scsi-id/test.sh | 4 ++- tests/kola/var-mount/simple/test.sh | 3 +- 90 files changed, 457 insertions(+), 377 deletions(-) diff --git a/README.md b/README.md index af09c028..1809f276 100644 --- a/README.md +++ b/README.md @@ -160,9 +160,10 @@ Tests should follow the following format: ```bash #!/bin/bash -# kola: { "exclusive": false, ... } -# ^^----- kola option comment -# ^^----- See all options in +## kola: +## exclusive: false +## platforms: aws gcp +## # See all options in https://coreos.github.io/coreos-assembler/kola/external-tests/#kolajson # # Short summary of what the test does, why we need it, etc. # diff --git a/tests/kola/README.md b/tests/kola/README.md index 4364c00f..7bcce156 100644 --- a/tests/kola/README.md +++ b/tests/kola/README.md @@ -12,6 +12,7 @@ so: ```bash #!/bin/bash -# kola: {"distros": "fcos"} +## kola: +## distros: fcos ... ``` diff --git a/tests/kola/binfmt/qemu b/tests/kola/binfmt/qemu index 9ab29048..b6345b55 100755 --- a/tests/kola/binfmt/qemu +++ b/tests/kola/binfmt/qemu @@ -1,20 +1,19 @@ #!/bin/bash -# kola: {"platforms": "qemu", "exclusive": false, "tags": "needs-internet", "distros": "fcos", "architectures": "aarch64 s390x"} # Test the x86_64 emulator on aarch64 and s390x images for now # https://github.com/coreos/fedora-coreos-tracker/issues/1237 # -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - exclusive: false -# - This test doesn't make meaningful changes to the system and -# should be able to be combined with other tests. -# - tags: needs-internet -# - This test pulls a container from a registry. -# - distros: -# - Only run on fcos, as rhel does not support emulation -# - architectures: aarch64 s390x -# - We decided to ship x86_64 emulator to only these arches for now. -# - Refer to the above referenced issue for more details +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # This test doesn't make meaningful changes to the system and should +## # be able to be combined with other tests. +## exclusive: false +## # This test pulls a container from a registry. +## tags: needs-internet +## # Only run on fcos, as rhel does not support emulation +## distros: fcos +## # We decided to ship x86_64 emulator to only these arches for now. +## architectures: aarch64 s390x set -xeuo pipefail diff --git a/tests/kola/boot/bootupd b/tests/kola/boot/bootupd index f30cf498..51a5ba43 100755 --- a/tests/kola/boot/bootupd +++ b/tests/kola/boot/bootupd @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # This is just a basic sanity check; at some point we # will implement "project-owned tests run in the pipeline" # and be able to run the existing bootupd tests: diff --git a/tests/kola/clhm/ignition-warnings/test.sh b/tests/kola/clhm/ignition-warnings/test.sh index e687c525..f9d6febb 100755 --- a/tests/kola/clhm/ignition-warnings/test.sh +++ b/tests/kola/clhm/ignition-warnings/test.sh @@ -1,11 +1,11 @@ #!/bin/bash -# kola: { "platforms": "qemu-unpriv", "allowConfigWarnings": true } -# - platforms: qemu-unpriv -# - This test should pass everywhere if it passes anywhere. -# - allowConfigWarnings: true -# - We intentionally exclude the Install section from a systemd unit. -# This is valid but not ideal, so Butane warns about it. # This test ensures that Ignition warnings are displayed on the console. +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu-unpriv +## # We intentionally exclude the Install section from a systemd unit. +## # This is valid but not ideal, so Butane warns about it. +## allowConfigWarnings: true set -xeuo pipefail diff --git a/tests/kola/containers/cgroups-v2 b/tests/kola/containers/cgroups-v2 index 15493938..5f952585 100755 --- a/tests/kola/containers/cgroups-v2 +++ b/tests/kola/containers/cgroups-v2 @@ -1,8 +1,10 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS because RHCOS does not currently support cgroupsv2 -# by default. -# TODO-RHCOS: drop "fcos" tag when cgroupsv2 lands in RHCOS +## kola: +## # This test only runs on FCOS because RHCOS does not currently +## # support cgroupsv2 by default. +## # TODO-RHCOS: drop "fcos" tag when cgroupsv2 lands in RHCOS +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/disks/root-boot-ro b/tests/kola/disks/root-boot-ro index 41f81fc0..9857cecc 100755 --- a/tests/kola/disks/root-boot-ro +++ b/tests/kola/disks/root-boot-ro @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/disks/root-prjquota b/tests/kola/disks/root-prjquota index 40320371..2a2eb03a 100755 --- a/tests/kola/disks/root-prjquota +++ b/tests/kola/disks/root-prjquota @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/disks/systemd-repart-service b/tests/kola/disks/systemd-repart-service index 307c8ff3..b12b6e3a 100755 --- a/tests/kola/disks/systemd-repart-service +++ b/tests/kola/disks/systemd-repart-service @@ -1,9 +1,11 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS because the version of `systemd-udev` in RHCOS does -# not include `systemd-repart` -# TODO-RHCOS: consider dropping the "fcos" tag if/when `systemd-udev` in RHEL -# starts to include `systemd-repart` +## kola: +## # This test only runs on FCOS because the version of `systemd-udev` in RHCOS does +## # not include `systemd-repart` +## # TODO-RHCOS: consider dropping the "fcos" tag if/when `systemd-udev` in RHEL +## # starts to include `systemd-repart` +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/disks/tmpfs b/tests/kola/disks/tmpfs index 8d3af044..e2fb240f 100755 --- a/tests/kola/disks/tmpfs +++ b/tests/kola/disks/tmpfs @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/extensions/module b/tests/kola/extensions/module index 3dffd446..e562fc66 100755 --- a/tests/kola/extensions/module +++ b/tests/kola/extensions/module @@ -1,16 +1,17 @@ #!/bin/bash +# This test ensures that we can install some common tools as OS extensions. set -xeuo pipefail -# This test only runs on FCOS as OS extensions are implemented differently on RHCOS. -# kola: { "distros": "fcos", "tags": "needs-internet", "platforms": "qemu", "timeoutMin": 15, "minMemory": 1536 } -# -# This test ensures that we can install some common tools as OS extensions. -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - timeoutMin: 15 -# - This is dependent on network and disk speed but we've seen the -# test take longer than 10 minutes in our aarch64 qemu tests. +## kola: +## # This test only runs on FCOS as OS extensions are implemented differently on RHCOS. +## distros: fcos +## tags: needs-internet +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # This is dependent on network and disk speed but we've seen the +## # test take longer than 10 minutes in our aarch64 qemu tests. +## timeoutMin: 15 +## minMemory: 1536 . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/extensions/package b/tests/kola/extensions/package index a9d9d6c6..9c296920 100755 --- a/tests/kola/extensions/package +++ b/tests/kola/extensions/package @@ -1,16 +1,18 @@ #!/bin/bash set -xeuo pipefail -# This test only runs on FCOS as OS extensions are implemented differently on RHCOS. -# kola: { "distros": "fcos", "tags": "needs-internet", "platforms": "qemu", "timeoutMin": 15, "minMemory": 1536 } -# +## kola: +## # This test only runs on FCOS as OS extensions are implemented differently on RHCOS. +## distros: fcos +## tags: needs-internet +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # This is dependent on network and disk speed but we've seen the +## # test take longer than 10 minutes in our aarch64 qemu tests. +## timeoutMin: 15 +## minMemory: 1536 + # This test ensures that we can install some common tools as OS extensions. -# -# - timeoutMin: 15 -# - This is dependent on network and disk speed but we've seen the -# test take longer than 10 minutes in our aarch64 qemu tests. -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/files/aleph-version b/tests/kola/files/aleph-version index 3819e7b2..b5a521e4 100755 --- a/tests/kola/files/aleph-version +++ b/tests/kola/files/aleph-version @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/check-symlink b/tests/kola/files/check-symlink index 3c8614a5..ba194537 100755 --- a/tests/kola/files/check-symlink +++ b/tests/kola/files/check-symlink @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # Verify /etc release symlinks are valid # See: # - https://bugzilla.redhat.com/show_bug.cgi?id=2068148 diff --git a/tests/kola/files/etc-passwd-group-permissions b/tests/kola/files/etc-passwd-group-permissions index e2d1574b..7c6e10c3 100755 --- a/tests/kola/files/etc-passwd-group-permissions +++ b/tests/kola/files/etc-passwd-group-permissions @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/fcos_groups b/tests/kola/files/fcos_groups index d2e637a0..8bf3b4b2 100755 --- a/tests/kola/files/fcos_groups +++ b/tests/kola/files/fcos_groups @@ -1,5 +1,7 @@ #!/usr/bin/env bash -# kola: { "distros": "fcos", "exclusive": false } +## kola: +## distros: fcos +## exclusive: false # # This performs a sanity check on system groups that are shipped # as part of the base OS. Those groups come in different shapes diff --git a/tests/kola/files/fcos_users b/tests/kola/files/fcos_users index 48716ecc..b097823a 100755 --- a/tests/kola/files/fcos_users +++ b/tests/kola/files/fcos_users @@ -1,5 +1,7 @@ #!/usr/bin/env bash -# kola: { "distros": "fcos", "exclusive": false } +## kola: +## distros: fcos +## exclusive: false # # This performs a sanity check on system users that are shipped # as part of the base OS. Those users come in different shapes diff --git a/tests/kola/files/file-directory-permissions b/tests/kola/files/file-directory-permissions index 43d38f85..c9f541b1 100755 --- a/tests/kola/files/file-directory-permissions +++ b/tests/kola/files/file-directory-permissions @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/kernel-headers b/tests/kola/files/kernel-headers index ecf1f167..2712b153 100755 --- a/tests/kola/files/kernel-headers +++ b/tests/kola/files/kernel-headers @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # check that we are not including the kernel headers on the host # See: # - https://bugzilla.redhat.com/show_bug.cgi?id=1814719 diff --git a/tests/kola/files/license b/tests/kola/files/license index 1f31ca2c..28eafc76 100755 --- a/tests/kola/files/license +++ b/tests/kola/files/license @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/logrotate-service b/tests/kola/files/logrotate-service index 8e0d1f76..a7b53c87 100755 --- a/tests/kola/files/logrotate-service +++ b/tests/kola/files/logrotate-service @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # Test some services are enabled or disabled appropriately set -xeuo pipefail diff --git a/tests/kola/files/remove-manifest-files b/tests/kola/files/remove-manifest-files index f858be3a..69f3b328 100755 --- a/tests/kola/files/remove-manifest-files +++ b/tests/kola/files/remove-manifest-files @@ -1,8 +1,10 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS bceause RHCOS does ship `info` which is a -# Requires on a number of RHCOS packages. -# TODO-RHCOS: modify test to check for RHCOS-specific `remove-files` entry +## kola: +## # This test only runs on FCOS bceause RHCOS does ship `info` which is a +## # Requires on a number of RHCOS packages. +## # TODO-RHCOS: modify test to check for RHCOS-specific `remove-files` entry +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/root-immutable-bit b/tests/kola/files/root-immutable-bit index e4d81d86..627e8788 100755 --- a/tests/kola/files/root-immutable-bit +++ b/tests/kola/files/root-immutable-bit @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/rpmdb-sqlite b/tests/kola/files/rpmdb-sqlite index 3479ddf0..d1eef68e 100755 --- a/tests/kola/files/rpmdb-sqlite +++ b/tests/kola/files/rpmdb-sqlite @@ -1,7 +1,9 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS as the RHCOS rpmdb has not migrated to sqlite yet. -# TODO-RHCOS: drop the "fcos" tag when RHCOS migrates to using sqlite +## kola: +## # This test only runs on FCOS as the RHCOS rpmdb has not migrated to sqlite yet. +## # TODO-RHCOS: drop the "fcos" tag when RHCOS migrates to using sqlite +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/setgid b/tests/kola/files/setgid index b777dd13..63df1b07 100755 --- a/tests/kola/files/setgid +++ b/tests/kola/files/setgid @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/files/setuid b/tests/kola/files/setuid index 0efd5d11..51a0494a 100755 --- a/tests/kola/files/setuid +++ b/tests/kola/files/setuid @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/sudoers b/tests/kola/files/sudoers index 7e56a4c6..e8cecd57 100755 --- a/tests/kola/files/sudoers +++ b/tests/kola/files/sudoers @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/system-generators b/tests/kola/files/system-generators index 10795ae2..b30aa790 100755 --- a/tests/kola/files/system-generators +++ b/tests/kola/files/system-generators @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/trust-cpu b/tests/kola/files/trust-cpu index 3c7bbf33..b8d0274f 100755 --- a/tests/kola/files/trust-cpu +++ b/tests/kola/files/trust-cpu @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/unlabeled-contexts b/tests/kola/files/unlabeled-contexts index bf918bb0..be6fe589 100755 --- a/tests/kola/files/unlabeled-contexts +++ b/tests/kola/files/unlabeled-contexts @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/files/yum-repo-dir b/tests/kola/files/yum-repo-dir index ff064136..c9c079b7 100755 --- a/tests/kola/files/yum-repo-dir +++ b/tests/kola/files/yum-repo-dir @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/firewall/iptables-legacy/test.sh b/tests/kola/firewall/iptables-legacy/test.sh index 8ef28366..e5153d5b 100755 --- a/tests/kola/firewall/iptables-legacy/test.sh +++ b/tests/kola/firewall/iptables-legacy/test.sh @@ -1,7 +1,9 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": true } -# This test verifies that one can configure a node to use the legacy iptables -# backend. It is scoped to only FCOS because RHCOS only supports nft. +## kola: +## # This test verifies that one can configure a node to use the legacy iptables +## # backend. It is scoped to only FCOS because RHCOS only supports nft. +## distros: fcos +## exclusive: true set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/firewall/iptables/test.sh b/tests/kola/firewall/iptables/test.sh index d255c4a4..af6fd2c1 100755 --- a/tests/kola/firewall/iptables/test.sh +++ b/tests/kola/firewall/iptables/test.sh @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # Verifies that the expected iptables backend is configured. # https://github.com/coreos/fedora-coreos-tracker/issues/676 set -xeuo pipefail diff --git a/tests/kola/ignition/delete-config/test.sh b/tests/kola/ignition/delete-config/test.sh index 185377e7..70233c0e 100755 --- a/tests/kola/ignition/delete-config/test.sh +++ b/tests/kola/ignition/delete-config/test.sh @@ -1,8 +1,8 @@ #!/bin/bash -# kola: { "platforms": "qemu-unpriv" } -# - platforms: qemu-unpriv -# - Ideally we'd test on virtualbox and vmware, but we don't have tests -# there, so we mock specifically for ignition.platform.id=qemu +## kola: +## # Ideally we'd test on virtualbox and vmware, but we don't have tests +## # there, so we mock specifically for ignition.platform.id=qemu +## platforms: qemu-unpriv set -xeuo pipefail diff --git a/tests/kola/ignition/remote/test.sh b/tests/kola/ignition/remote/test.sh index 86a0e291..8b1e6c35 100755 --- a/tests/kola/ignition/remote/test.sh +++ b/tests/kola/ignition/remote/test.sh @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "tags": "needs-internet" } +## kola: +## tags: needs-internet # To test https://bugzilla.redhat.com/show_bug.cgi?id=1980679 # remote.ign on github: inject kernelArguments and write something to /etc/testfile # config.ign to include remote kargsfile.ign diff --git a/tests/kola/ignition/resource/authenticated-gs/test.sh b/tests/kola/ignition/resource/authenticated-gs/test.sh index a3d3b501..3f65697a 100755 --- a/tests/kola/ignition/resource/authenticated-gs/test.sh +++ b/tests/kola/ignition/resource/authenticated-gs/test.sh @@ -1,9 +1,9 @@ #!/bin/bash -# kola: { "tags": "needs-internet", "platforms": "gce" } -# - tags: needs-internet -# - We fetch resources from GCS. -# - platforms: gce -# - We authenticate to GCS with the GCE instance's credentials. +## kola: +## # We fetch resources from GCS. +## tags: needs-internet +## # We authenticate to GCS with the GCE instance's credentials. +## platforms: gce set -xeuo pipefail diff --git a/tests/kola/ignition/resource/authenticated-s3/test.sh b/tests/kola/ignition/resource/authenticated-s3/test.sh index 152eed0c..ccf499b9 100755 --- a/tests/kola/ignition/resource/authenticated-s3/test.sh +++ b/tests/kola/ignition/resource/authenticated-s3/test.sh @@ -1,9 +1,9 @@ #!/bin/bash -# kola: { "tags": "needs-internet", "platforms": "aws" } -# - tags: needs-internet -# - We fetch resources from S3. -# - platforms: aws -# - We authenticate to S3 with the EC2 instance's IAM role. +## kola: +## # We fetch resources from S3. +## tags: needs-internet +## # We authenticate to S3 with the EC2 instance's IAM role. +## platforms: aws set -xeuo pipefail diff --git a/tests/kola/ignition/resource/remote/test.sh b/tests/kola/ignition/resource/remote/test.sh index 44d1ab2e..76faea9d 100755 --- a/tests/kola/ignition/resource/remote/test.sh +++ b/tests/kola/ignition/resource/remote/test.sh @@ -1,11 +1,11 @@ #!/bin/bash -# kola: { "tags": "needs-internet", "noInstanceCreds": true } -# - tags: needs-internet -# - We fetch resources from S3 and GCS. -# - noInstanceCreds: don't pass AWS or GCP credentials to instance -# - This test verifies that Ignition can fetch anonymous resources within -# a cloud platform (S3 -> EC2, GCS -> GCE) when no credentials are -# supplied +## kola: +## # We fetch resources from S3 and GCS +## tags: needs-internet +## # Don't pass AWS or GCP credentials to instance +## # This test verifies that Ignition can fetch anonymous resources within +## # a cloud platform (S3 -> EC2, GCS -> GCE) when no credentials are supplied +## noInstanceCreds: true set -xeuo pipefail diff --git a/tests/kola/ignition/stable-boot/test.sh b/tests/kola/ignition/stable-boot/test.sh index 5714e703..6b72dbd6 100755 --- a/tests/kola/ignition/stable-boot/test.sh +++ b/tests/kola/ignition/stable-boot/test.sh @@ -1,8 +1,9 @@ #!/bin/bash -# kola: { "platforms": "qemu-unpriv" } -# This test makes sure that ignition is able to use `coreos-boot-disk` symlink. -# We don't need to test this on every platform. If it passes in one place it -# will pass everywhere. +## kola: +## # This test makes sure that ignition is able to use `coreos-boot-disk` symlink. +## # We don't need to test this on every platform. If it passes in one place it +## # will pass everywhere. +## platforms: qemu-unpriv set -xeuo pipefail diff --git a/tests/kola/ignition/systemd-disable/test.sh b/tests/kola/ignition/systemd-disable/test.sh index 404ce445..66917532 100755 --- a/tests/kola/ignition/systemd-disable/test.sh +++ b/tests/kola/ignition/systemd-disable/test.sh @@ -1,14 +1,15 @@ #!/bin/bash -# kola: { "distros": "fcos", "platforms": "qemu-unpriv" } +## kola: +## # This test is currently scoped to FCOS because `zincati` is only available on +## # FCOS. +## # TODO-RHCOS: Determine if any services on RHCOS may be disabled and adapt test +## distros: fcos +## # We don't need to test this on every platform. If it passes in +## # one place it will pass everywhere. +## platforms: qemu-unpriv # This test makes sure that ignition is able to disable units # https://github.com/coreos/fedora-coreos-tracker/issues/392 -# We don't need to test this on every platform. If it passes in -# one place it will pass everywhere. -# This test is currently scoped to FCOS because `zincati` is only available on -# FCOS. -# TODO-RHCOS: Determine if any services on RHCOS may be disabled and adapt test - set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/ignition/systemd-enable-units/test.sh b/tests/kola/ignition/systemd-enable-units/test.sh index ac80c7c0..f5658950 100755 --- a/tests/kola/ignition/systemd-enable-units/test.sh +++ b/tests/kola/ignition/systemd-enable-units/test.sh @@ -1,11 +1,12 @@ #!/bin/bash -# kola: { "platforms": "qemu-unpriv" } +## kola: +## # We don't need to test this on every platform. If it passes in +## # one place it will pass everywhere. +## platforms: qemu-unpriv # This test makes sure that ignition is able to enable systemd units of # different types. # https://github.com/coreos/ignition/issues/586 # https://github.com/systemd/systemd/pull/9901 -# We don't need to test this on every platform. If it passes in one place it -# will pass everywhere. set -xeuo pipefail diff --git a/tests/kola/ignition/systemd-unmasking/test.sh b/tests/kola/ignition/systemd-unmasking/test.sh index 147e3c49..7a5c7b15 100755 --- a/tests/kola/ignition/systemd-unmasking/test.sh +++ b/tests/kola/ignition/systemd-unmasking/test.sh @@ -1,15 +1,17 @@ #!/bin/bash -# kola: { "distros": "fcos", "platforms": "qemu-unpriv" } +## kola: +## # This test is currently scoped to FCOS because `dnsmasq` is not masked on +## # RHCOS. +## # TODO-RHCOS: determine if any services on RHCOS are masked and adapt test +## distros: fcos +## # We don't need to test this on every platform. If it passes in one place it +## # will pass everywhere. +## platforms: qemu-unpriv + # This test makes sure that ignition is able to unmask units # It just so happens we have masked dnsmasq in FCOS so we can # test this by unmasking it. -# We don't need to test this on every platform. If it passes in one place it -# will pass everywhere. -# This test is currently scoped to FCOS because `dnsmasq` is not masked on -# RHCOS. -# TODO-RHCOS: determine if any services on RHCOS are masked and adapt test - set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/k8s/node-e2e/master b/tests/kola/k8s/node-e2e/master index a575717e..80cb9bb5 100755 --- a/tests/kola/k8s/node-e2e/master +++ b/tests/kola/k8s/node-e2e/master @@ -1,6 +1,12 @@ #!/bin/bash -# kola: {"minMemory": 4096, "timeoutMin": 45, "minDisk": 20, "architectures": "x86_64", "requiredTag": "k8s", "tags": "needs-internet"} -# Just run on x86_64 for now. We'd need multi-arch images with go 1.17. +## kola: +## minMemory: 4096 +## timeoutMin: 45 +## minDisk: 20 +## # Just run on x86_64 for now. We'd need multi-arch images with go 1.17. +## architectures: x86_64 +## requiredTag: k8s +## tags: needs-internet set -xeuo pipefail diff --git a/tests/kola/kdump/crash/test.sh b/tests/kola/kdump/crash/test.sh index 02406e59..9f48f9e6 100755 --- a/tests/kola/kdump/crash/test.sh +++ b/tests/kola/kdump/crash/test.sh @@ -1,14 +1,14 @@ #!/bin/bash # https://docs.fedoraproject.org/en-US/fedora-coreos/debugging-kernel-crashes/ -# kola: {"minMemory": 4096, "tags": "skip-base-checks", "timeoutMin": 15} -# - minMemory: 4096 -# - Testing kdump requires some reserved memory for the crashkernel. -# - tags: skip-base-checks -# - Skip checks for things like kernel crashes in the console logs. -# For this test we trigger a kernel crash on purpose. -# - timeoutMin: 15 -# - This test includes a few reboots and the generation of a vmcore, -# which can take longer than the default 10 minute timeout. +## kola: +## # Testing kdump requires some reserved memory for the crashkernel. +## minMemory: 4096 +## # Skip checks for things like kernel crashes in the console logs. +## # For this test we trigger a kernel crash on purpose. +## tags: skip-base-checks +## # This test includes a few reboots and the generation of a vmcore, +## # which can take longer than the default 10 minute timeout. +## timeoutMin: 15 set -xeuo pipefail diff --git a/tests/kola/kdump/service b/tests/kola/kdump/service index 78a9afd3..5e532e0b 100755 --- a/tests/kola/kdump/service +++ b/tests/kola/kdump/service @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # Make sure that kdump didn't start (it's either disabled, or enabled but # conditional on crashkernel= karg, which we don't bake). diff --git a/tests/kola/kubernetes/kube-watch/test.sh b/tests/kola/kubernetes/kube-watch/test.sh index 90824e5f..e09e4f54 100755 --- a/tests/kola/kubernetes/kube-watch/test.sh +++ b/tests/kola/kubernetes/kube-watch/test.sh @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # This is for verifying that `kubernetes_file_t` labeled files can be # watched by systemd # See: https://github.com/coreos/fedora-coreos-tracker/issues/861 diff --git a/tests/kola/kubernetes/systemd-env-read/test.sh b/tests/kola/kubernetes/systemd-env-read/test.sh index d47005ff..9880981d 100755 --- a/tests/kola/kubernetes/systemd-env-read/test.sh +++ b/tests/kola/kubernetes/systemd-env-read/test.sh @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/logging/printk b/tests/kola/logging/printk index 1996c60a..5a704634 100755 --- a/tests/kola/logging/printk +++ b/tests/kola/logging/printk @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # Verify default console log level; xref https://github.com/coreos/fedora-coreos-tracker/issues/1244 set -xeuo pipefail diff --git a/tests/kola/multipath/multipathd-service-fix b/tests/kola/multipath/multipathd-service-fix index 9fb9e9ed..cbb51024 100755 --- a/tests/kola/multipath/multipathd-service-fix +++ b/tests/kola/multipath/multipathd-service-fix @@ -1,6 +1,8 @@ #!/bin/bash -# kola: { "exclusive": false, "platforms": "qemu-unpriv" } -# Just run on qemu since the answer is the same everywhere +## kola: +## exclusive: false +## # Just run on qemu since the answer is the same everywhere +## platforms: qemu-unpriv set -xeuo pipefail diff --git a/tests/kola/networking/default-network-behavior-change/test.sh b/tests/kola/networking/default-network-behavior-change/test.sh index 3dfde50b..bc3bbd47 100755 --- a/tests/kola/networking/default-network-behavior-change/test.sh +++ b/tests/kola/networking/default-network-behavior-change/test.sh @@ -1,6 +1,8 @@ #!/bin/bash -# kola: { "exclusive": false, "platforms": "qemu-unpriv" } -# No need to run on any other platform than QEMU. +## kola: +## exclusive: false +## # No need to run on any other platform than QEMU. +## platforms: qemu-unpriv set -xeuo pipefail diff --git a/tests/kola/networking/dnsmasq-service b/tests/kola/networking/dnsmasq-service index a9dc3e6c..e25a34ea 100755 --- a/tests/kola/networking/dnsmasq-service +++ b/tests/kola/networking/dnsmasq-service @@ -1,8 +1,10 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS because the `dnsmasq` service on RHCOS is simply -# disabled, not masked. -# TODO-RHCOS: adapt test to check that `dnsmasq` is in the proper state on RHCOS +## kola: +## # This test only runs on FCOS because the `dnsmasq` service on RHCOS is simply +## # disabled, not masked. +## # TODO-RHCOS: adapt test to check that `dnsmasq` is in the proper state on RHCOS +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/networking/force-persist-ip/test.sh b/tests/kola/networking/force-persist-ip/test.sh index da20c52a..c157de32 100755 --- a/tests/kola/networking/force-persist-ip/test.sh +++ b/tests/kola/networking/force-persist-ip/test.sh @@ -10,20 +10,19 @@ set -xeuo pipefail # https://bugzilla.redhat.com/show_bug.cgi?id=1958930#c29 -# kola: { "platforms": "qemu", "additionalNics": 1, "appendKernelArgs": "ip=10.10.10.10::10.10.10.1:255.255.255.0:myhostname:eth1:none:8.8.8.8 net.ifnames=0 coreos.force_persist_ip", "architectures": "!s390x" } -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - additionalNics: 1 -# - Add 1 NIC for this test -# - appendKernelArgs: "ip=10.10.10.10::10.10.10.1:255.255.255.0:myhostname:eth1:none:8.8.8.8 net.ifnames=0 coreos.force_persist_ip" -# - The functionality we're testing here and the configuration for the NIC -# - We use net.ifnames=0 to disable consistent network naming here because on -# different firmwares (BIOS vs UEFI) the NIC names are different. -# See https://github.com/coreos/fedora-coreos-tracker/issues/1060 -# - architectures: !s390x -# - appendKernelArgs doesn't work on s390x -# - https://github.com/coreos/coreos-assembler/issues/2776 +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Add 1 NIC for this test +## additionalNics: 1 +## # The functionality we're testing here and the configuration for the NIC +## # We use net.ifnames=0 to disable consistent network naming here because on +## # different firmwares (BIOS vs UEFI) the NIC names are different. +## # See https://github.com/coreos/fedora-coreos-tracker/issues/1060 +## appendKernelArgs: "ip=10.10.10.10::10.10.10.1:255.255.255.0:myhostname:eth1:none:8.8.8.8 net.ifnames=0 coreos.force_persist_ip" +## # appendKernelArgs doesn't work on s390x +## # https://github.com/coreos/coreos-assembler/issues/2776 +## architectures: "!s390x" . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/networking/hostname/fallback-hostname/test.sh b/tests/kola/networking/hostname/fallback-hostname/test.sh index f54bc818..97275211 100755 --- a/tests/kola/networking/hostname/fallback-hostname/test.sh +++ b/tests/kola/networking/hostname/fallback-hostname/test.sh @@ -1,7 +1,8 @@ #!/bin/bash set -xeuo pipefail -# kola: { "platforms": "qemu" } +## kola: +## platforms: qemu # # Test that the fallback hostname is `localhost`. This test # validates that the fallback hostname is set to `localhost` diff --git a/tests/kola/networking/kargs-rd-net b/tests/kola/networking/kargs-rd-net index f7e4aa14..faa91527 100755 --- a/tests/kola/networking/kargs-rd-net +++ b/tests/kola/networking/kargs-rd-net @@ -1,7 +1,14 @@ #!/bin/bash -# kola: { "platforms": "qemu", "appendFirstbootKernelArgs": "rd.net.timeout.dhcp=30 rd.net.dhcp.retry=8", "architectures": "!s390x"} -# -# Veirfy rd.net.timeout.dhcp and rd.net.dhcp.retry are supported +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # The functionality we're testing here. +## appendFirstbootKernelArgs: "rd.net.timeout.dhcp=30 rd.net.dhcp.retry=8" +## # appendFirstbootKernelArgs doesn't work on s390x +## # https://github.com/coreos/coreos-assembler/issues/2776 +## architectures: "!s390x" + +# Verify rd.net.timeout.dhcp and rd.net.dhcp.retry are supported # by NetworkManager. Append them to kernel parameter when boot, # get total timeout is `timeout * retry`, 30*8(240) seconds # in this test scenario @@ -9,14 +16,6 @@ # - https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/issues/559 # - https://bugzilla.redhat.com/show_bug.cgi?id=1879094#c10 # - https://bugzilla.redhat.com/show_bug.cgi?id=1877740 -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - appendFirstbootKernelArgs: "rd.net.timeout.dhcp=30 rd.net.dhcp.retry=8" -# - The functionality we're testing here. -# - architectures: !s390x -# - appendFirstbootKernelArgs doesn't work on s390x -# - https://github.com/coreos/coreos-assembler/issues/2776 set -xeuo pipefail diff --git a/tests/kola/networking/mtu-on-bond-ignition/test.sh b/tests/kola/networking/mtu-on-bond-ignition/test.sh index f79618b7..997f1fe5 100755 --- a/tests/kola/networking/mtu-on-bond-ignition/test.sh +++ b/tests/kola/networking/mtu-on-bond-ignition/test.sh @@ -1,5 +1,16 @@ #!/bin/bash -# kola: { "platforms": "qemu", "additionalNics": 2, "appendKernelArgs": "net.ifnames=0", "architectures": "!s390x"} +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Add 2 NIC for this test +## additionalNics: 2 +## # We use net.ifnames=0 to disable consistent network naming here because on +## # different firmwares (BIOS vs UEFI) the NIC names are different. +## # See https://github.com/coreos/fedora-coreos-tracker/issues/1060 +## appendKernelArgs: net.ifnames=0 +## # appendKernelArgs doesn't work on s390x +## # https://github.com/coreos/coreos-assembler/issues/2776 +## architectures: "!s390x" # Set MTU on a VLAN subinterface for the bond using ignition config and check # - verify MTU on the bond matches config @@ -16,18 +27,6 @@ # Using kernel args to `configure MTU on a VLAN subinterface for the bond` refer to # https://github.com/coreos/fedora-coreos-config/pull/1401 -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - additionalNics: 2 -# - Add 2 NIC for this test -# - appendKernelArgs: "net.ifnames=0" -# - We use net.ifnames=0 to disable consistent network naming here because on -# different firmwares (BIOS vs UEFI) the NIC names are different. -# See https://github.com/coreos/fedora-coreos-tracker/issues/1060 -# - architectures: !s390x -# - appendKernelArgs doesn't work on s390x -# - https://github.com/coreos/coreos-assembler/issues/2776 - set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/networking/mtu-on-bond-kargs b/tests/kola/networking/mtu-on-bond-kargs index 242bfe3c..c7514a7a 100755 --- a/tests/kola/networking/mtu-on-bond-kargs +++ b/tests/kola/networking/mtu-on-bond-kargs @@ -1,5 +1,17 @@ #!/bin/bash -# kola: { "platforms": "qemu", "additionalNics": 2, "appendKernelArgs": "bond=bond0:eth1,eth2:mode=active-backup,miimon=100:9000 ip=10.10.10.10::10.10.10.1:255.255.255.0:staticvlanbond:bond0.100:none:9000 vlan=bond0.100:bond0 net.ifnames=0", "architectures": "!s390x"} +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Add 2 NIC for this test +## additionalNics: 2 +## # Configuration of the 2 NICs for this test +## # We use net.ifnames=0 to disable consistent network naming here because on +## # different firmwares (BIOS vs UEFI) the NIC names are different. +## # See https://github.com/coreos/fedora-coreos-tracker/issues/1060 +## appendKernelArgs: "bond=bond0:eth1,eth2:mode=active-backup,miimon=100:9000 ip=10.10.10.10::10.10.10.1:255.255.255.0:staticvlanbond:bond0.100:none:9000 vlan=bond0.100:bond0 net.ifnames=0" +## # appendKernelArgs doesn't work on s390x +## # https://github.com/coreos/coreos-assembler/issues/2776 +## architectures: "!s390x" # Configuring MTU on a VLAN subinterface for the bond, # - verify MTU on the bond matches config @@ -7,19 +19,6 @@ # - verify ip address on the VLAN subinterface for the bond matches config # See https://bugzilla.redhat.com/show_bug.cgi?id=1932502#c9 -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - additionalNics: 2 -# - Add 2 NIC for this test -# - appendKernelArgs: "bond=bond0:eth1,eth2:mode=active-backup,miimon=100:9000 ip=10.10.10.10::10.10.10.1:255.255.255.0:staticvlanbond:bond0.100:none:9000 vlan=bond0.100:bond0 net.ifnames=0" -# - Configuration of the 2 NICs for this test -# - We use net.ifnames=0 to disable consistent network naming here because on -# different firmwares (BIOS vs UEFI) the NIC names are different. -# See https://github.com/coreos/fedora-coreos-tracker/issues/1060 -# - architectures: !s390x -# - appendKernelArgs doesn't work on s390x -# - https://github.com/coreos/coreos-assembler/issues/2776 - set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/networking/nameserver b/tests/kola/networking/nameserver index f602d774..9b3e45f6 100755 --- a/tests/kola/networking/nameserver +++ b/tests/kola/networking/nameserver @@ -1,17 +1,17 @@ #!/bin/bash -# kola: { "platforms": "qemu", "appendKernelArgs": "nameserver=8.8.8.8 nameserver=1.1.1.1", "architectures": "!s390x"} +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## appendKernelArgs: "nameserver=8.8.8.8 nameserver=1.1.1.1" +## # appendKernelArgs doesn't work on s390x +## # https://github.com/coreos/coreos-assembler/issues/2776 +## architectures: "!s390x" # Verify multiple nameservers config via kernel arguments work well # RHCOS: need to check /etc/resolv.conf and nmconnection # FCOS: using systemd-resolved which needs to run resolvectl to check # See https://bugzilla.redhat.com/show_bug.cgi?id=1763341 -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - architectures: !s390x -# - appendKernelArgs doesn't work on s390x -# - https://github.com/coreos/coreos-assembler/issues/2776 - set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/networking/network-online-service b/tests/kola/networking/network-online-service index a615a2ca..80a14d72 100755 --- a/tests/kola/networking/network-online-service +++ b/tests/kola/networking/network-online-service @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/networking/nic-naming b/tests/kola/networking/nic-naming index 7af6d5ac..79c24121 100755 --- a/tests/kola/networking/nic-naming +++ b/tests/kola/networking/nic-naming @@ -1,9 +1,11 @@ #!/bin/bash -# kola: { "exclusive": false, "platforms": "!azure" } -# Disable on azure because of a limitation of the hv_netvsc driver -# there. According to [1] and [2] the driver does not provide sufficient -# information to systemd-udev for systemd's naming to work. It falls -# back to basic ethX naming. +## kola: +## exclusive: false +## # Disable on azure because of a limitation of the hv_netvsc driver +## # there. According to [1] and [2] the driver does not provide sufficient +## # information to systemd-udev for systemd's naming to work. It falls +## # back to basic ethX naming. +## platforms: "!azure" # # [1] https://access.redhat.com/solutions/3204751 # [2] https://github.com/Azure/WALinuxAgent/issues/1877 diff --git a/tests/kola/networking/nm-dhcp-client b/tests/kola/networking/nm-dhcp-client index 4ab6a399..f58ee571 100755 --- a/tests/kola/networking/nm-dhcp-client +++ b/tests/kola/networking/nm-dhcp-client @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/networking/nm-start b/tests/kola/networking/nm-start index 19b914f3..683d871a 100755 --- a/tests/kola/networking/nm-start +++ b/tests/kola/networking/nm-start @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/networking/no-default-initramfs-net-propagation/bootif b/tests/kola/networking/no-default-initramfs-net-propagation/bootif index a53345ec..6928b8dc 100755 --- a/tests/kola/networking/no-default-initramfs-net-propagation/bootif +++ b/tests/kola/networking/no-default-initramfs-net-propagation/bootif @@ -1,18 +1,16 @@ #!/bin/bash -# kola: { "platforms": "qemu", "appendFirstbootKernelArgs": "BOOTIF=52:54:00:12:34:56" } -# +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Append BOOTIF kernel argument so we can test how nm-initrd-generator +## # and the coreos-teardown-initramfs interact. The MAC address is from: +## # https://github.com/coreos/coreos-assembler/blob/d5f1623aad6d133b2c7c00e784c04ab6828450c1/mantle/platform/metal.go#L468 +## appendFirstbootKernelArgs: BOOTIF=52:54:00:12:34:56 + # In addition to the pure network defaults case we should also make # sure that when BOOTIF= or rd.bootif= are provided on the kernel # command line (typically from PXE servers) that we don't propagate # networking configs either. See https://github.com/coreos/fedora-coreos-tracker/issues/1048 -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - appendFirstbootKernelArgs: "BOOTIF=52:54:00:12:34:56" -# - Append BOOTIF kernel argument so we can test how nm-initrd-generator -# and the coreos-teardown-initramfs interact. The MAC address is from: -# https://github.com/coreos/coreos-assembler/blob/d5f1623aad6d133b2c7c00e784c04ab6828450c1/mantle/platform/metal.go#L468 - set -xeuo pipefail diff --git a/tests/kola/networking/no-default-initramfs-net-propagation/default b/tests/kola/networking/no-default-initramfs-net-propagation/default index da6af16d..ca3fd45e 100755 --- a/tests/kola/networking/no-default-initramfs-net-propagation/default +++ b/tests/kola/networking/no-default-initramfs-net-propagation/default @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # With pure network defaults no networking should have been propagated # from the initramfs. This test tries to verify that is the case. # https://github.com/coreos/fedora-coreos-tracker/issues/696 diff --git a/tests/kola/networking/prefer-ignition-networking/test.sh b/tests/kola/networking/prefer-ignition-networking/test.sh index 72d199ce..63e534d6 100755 --- a/tests/kola/networking/prefer-ignition-networking/test.sh +++ b/tests/kola/networking/prefer-ignition-networking/test.sh @@ -1,6 +1,20 @@ #!/bin/bash set -xeuo pipefail +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Add 1 additional NIC for this test +## additionalNics: 1 +## # Set the kernel arguments so that we can set the configuration for the NIC. +## # We use net.ifnames=0 to disable consistent network naming here because on +## # different firmwares (BIOS vs UEFI) the NIC names are different. +## # See https://github.com/coreos/fedora-coreos-tracker/issues/1060 +## appendKernelArgs: "ip=10.10.10.10::10.10.10.1:255.255.255.0:myhostname:eth1:none:8.8.8.8 net.ifnames=0" +## # appendKernelArgs doesn't work on s390x so skip there +## # https://github.com/coreos/coreos-assembler/issues/2776 +## architectures: "!s390x" + # Setup configuration for a single NIC with two different ways: # - kargs provide static network config for eth1 without coreos.force_persist_ip # - ignition provides dhcp network config for eth1 @@ -10,22 +24,6 @@ set -xeuo pipefail # https://bugzilla.redhat.com/show_bug.cgi?id=1958930#c29 -# https://github.com/coreos/fedora-coreos-config/issues/1499 -# - Disable the test on s390x -# kola: { "platforms": "qemu", "additionalNics": 1, "appendKernelArgs": "ip=10.10.10.10::10.10.10.1:255.255.255.0:myhostname:eth1:none:8.8.8.8 net.ifnames=0", "architectures": "!s390x" } -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - additionalNics: 1 -# - Add 1 NIC for this test -# - appendKernelArgs: "ip=10.10.10.10::10.10.10.1:255.255.255.0:myhostname:eth1:none:8.8.8.8 net.ifnames=0" -# - The functionality we're testing here and the configuration for the NIC -# - We use net.ifnames=0 to disable consistent network naming here because on -# different firmwares (BIOS vs UEFI) the NIC names are different. -# See https://github.com/coreos/fedora-coreos-tracker/issues/1060 -# - architectures: !s390x -# - appendKernelArgs doesn't work on s390x -# - https://github.com/coreos/coreos-assembler/issues/2776 - . $KOLA_EXT_DATA/commonlib.sh # Verify eth1 gets ip address via dhcp diff --git a/tests/kola/networking/resolv/systemd-resolved b/tests/kola/networking/resolv/systemd-resolved index fff9b961..9507789c 100755 --- a/tests/kola/networking/resolv/systemd-resolved +++ b/tests/kola/networking/resolv/systemd-resolved @@ -1,7 +1,9 @@ #!/bin/bash -# This test only runs on FCOS because `systemd-resolved` is not installed on -# RHCOS -# kola: { "distros": "fcos", "exclusive": false } +## kola: +## # This test only runs on FCOS because `systemd-resolved` is not installed on +## # RHCOS +## distros: fcos +## exclusive: false set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/ntp/chrony/coreos-platform-chrony-generator b/tests/kola/ntp/chrony/coreos-platform-chrony-generator index 6b881e68..39a290e8 100755 --- a/tests/kola/ntp/chrony/coreos-platform-chrony-generator +++ b/tests/kola/ntp/chrony/coreos-platform-chrony-generator @@ -1,5 +1,7 @@ #!/bin/bash -# kola: { "exclusive": false, "platforms": "aws azure gce" } +## kola: +## exclusive: false +## platforms: "aws azure gce" # Test the coreos-platform-chrony generator. set -xeuo pipefail diff --git a/tests/kola/ntp/chrony/coreos-platform-chrony-generator-permissions b/tests/kola/ntp/chrony/coreos-platform-chrony-generator-permissions index 6942ddfd..9c3015de 100755 --- a/tests/kola/ntp/chrony/coreos-platform-chrony-generator-permissions +++ b/tests/kola/ntp/chrony/coreos-platform-chrony-generator-permissions @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/ntp/chrony/dhcp-propagation b/tests/kola/ntp/chrony/dhcp-propagation index c6b3ba5e..1d15cab0 100755 --- a/tests/kola/ntp/chrony/dhcp-propagation +++ b/tests/kola/ntp/chrony/dhcp-propagation @@ -6,7 +6,7 @@ # regression that might cause in RHCOS or FCOS when the upstream changes # come down and obsolete the temporary work (https://github.com/coreos/fedora-coreos-config/pull/412) # -## kola: +## kola: ## # Add the needs-internet tag. This test builds a container from remote ## # sources and uses a remote NTP server. ## tags: "needs-internet" diff --git a/tests/kola/ntp/timesyncd/dhcp-propagation/test.sh b/tests/kola/ntp/timesyncd/dhcp-propagation/test.sh index b38fff20..2ca5e892 100755 --- a/tests/kola/ntp/timesyncd/dhcp-propagation/test.sh +++ b/tests/kola/ntp/timesyncd/dhcp-propagation/test.sh @@ -6,7 +6,7 @@ # regression that might cause in RHCOS or FCOS when the upstream changes # come down and obsolete the temporary work (https://github.com/coreos/fedora-coreos-config/pull/412) # -## kola: +## kola: ## # Add the needs-internet tag. This test builds a container from remote ## # sources and uses a remote NTP server. ## tags: "needs-internet" diff --git a/tests/kola/podman/dns/test.sh b/tests/kola/podman/dns/test.sh index 86867567..dea14216 100755 --- a/tests/kola/podman/dns/test.sh +++ b/tests/kola/podman/dns/test.sh @@ -1,21 +1,20 @@ #!/bin/bash set -xeuo pipefail -# kola: { "platforms": "qemu", "tags": "needs-internet", "exclusive": false, "timeoutMin": 3 } +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # This test pulls a container from a registry. +## tags: needs-internet +## # This test doesn't make meaningful changes to the system and +## # should be able to be combined with other tests. +## exclusive: false +## # This test reaches out to the internet and it could take more +## # time to pull down the container. +## timeoutMin: 3 + # Tests that rootless podman containers can DNS resolve external domains. # https://github.com/coreos/fedora-coreos-tracker/issues/923 -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - tags: needs-internet -# - This test pulls a container from a registry. -# - exclusive: false -# - This test doesn't make meaningful changes to the system and -# should be able to be combined with other tests. -# - Root reprovisioning requires at least 4GiB of memory. -# - timeoutMin: 3 -# - This test reaches out to the internet and it could take more -# time to pull down the container. . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/podman/rootless-systemd b/tests/kola/podman/rootless-systemd index 7c093c79..70799838 100755 --- a/tests/kola/podman/rootless-systemd +++ b/tests/kola/podman/rootless-systemd @@ -1,5 +1,18 @@ #!/bin/bash -# kola: { "tags": "needs-internet", "platforms": "qemu-unpriv", "timeoutMin": 15, "minMemory": 1536 } +## kola: +## # This test builds a container from remote sources. +## # This test uses a remote NTP server. +## tags: needs-internet +## # If the test works anywhere it should work everywhere. +## platforms: qemu-unpriv +## # Pulling and building the container can take a long time if a +## # slow mirror gets chosen. +## timeoutMin: 15 +## # There's a bug in dnf that is causing OOM on low memory systems: +## # https://bugzilla.redhat.com/show_bug.cgi?id=1907030 +## # https://pagure.io/releng/issue/10935#comment-808601 +## minMemory: 1536 + # This script runs a rootless podman container (rootless because it's # run as the `core` user) with systemd inside that brings up httpd. # It tests that rootless+systemd works. See issue: @@ -7,19 +20,6 @@ # # If it gets easy to change the kargs in the future we should try this # both on cgroups v1 and cgroups v2. -# -# - tags: needs-internet -# - This test builds a container from remote sources. -# - This test uses a remote NTP server. -# - platforms: qemu-unpriv -# - If the test works anywhere it should work everywhere. -# - timeoutMin: 15 -# - Pulling and building the container can take a long time if a -# slow mirror gets chosen. -# - minMemory: 1536 -# - There's a bug in dnf that is causing OOM on low memory systems: -# https://bugzilla.redhat.com/show_bug.cgi?id=1907030 -# https://pagure.io/releng/issue/10935#comment-808601 set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/reboot/test.sh b/tests/kola/reboot/test.sh index f4164f0d..d749bc13 100755 --- a/tests/kola/reboot/test.sh +++ b/tests/kola/reboot/test.sh @@ -1,5 +1,6 @@ #!/bin/bash -# kola: {"platforms": "qemu"} +## kola: +## platforms: qemu # These are read-only not-necessarily-related checks that verify default system # configuration both on first and subsequent boots. diff --git a/tests/kola/root-reprovision/filesystem-only/test.sh b/tests/kola/root-reprovision/filesystem-only/test.sh index 06a53d9c..da56b961 100755 --- a/tests/kola/root-reprovision/filesystem-only/test.sh +++ b/tests/kola/root-reprovision/filesystem-only/test.sh @@ -1,15 +1,14 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "timeoutMin": 15, "tags": "reprovision" } -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - tags: reprovision -# - This test reprovisions the rootfs. -# - minMemory: 4096 -# - Root reprovisioning requires at least 4GiB of memory. -# - timeoutMin: 15 -# - This test includes a lot of disk I/O and needs a higher -# timeout value than the default. +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Root reprovisioning requires at least 4GiB of memory. +## minMemory: 4096 +## # This test includes a lot of disk I/O and needs a higher +## # timeout value than the default. +## timeoutMin: 15 +## # This test reprovisions the rootfs. +## tags: reprovision set -xeuo pipefail diff --git a/tests/kola/root-reprovision/linear/test.sh b/tests/kola/root-reprovision/linear/test.sh index d9ca084b..3aaa6c86 100755 --- a/tests/kola/root-reprovision/linear/test.sh +++ b/tests/kola/root-reprovision/linear/test.sh @@ -1,18 +1,16 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "additionalDisks": ["5G", "5G"], "timeoutMin": 15, "tags": "reprovision" } -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - additionalDisks is only supported on qemu. -# - tags: reprovision -# - This test reprovisions the rootfs. -# - minMemory: 4096 -# - Root reprovisioning requires at least 4GiB of memory. -# - additionalDisks: ["5G", "5G"] -# - Linear RAID is setup on these disks. -# - timeoutMin: 15 -# - This test includes a lot of disk I/O and needs a higher -# timeout value than the default. +## kola: +## # additionalDisks is only supported on qemu. +## platforms: qemu +## # Root reprovisioning requires at least 4GiB of memory. +## minMemory: 4096 +## # Linear RAID is setup on these disks. +## additionalDisks: ["5G", "5G"] +## # This test includes a lot of disk I/O and needs a higher +## # timeout value than the default. +## timeoutMin: 15 +## # This test reprovisions the rootfs. +## tags: reprovision set -xeuo pipefail diff --git a/tests/kola/root-reprovision/luks/test.sh b/tests/kola/root-reprovision/luks/test.sh index 42a162bb..ac783de4 100755 --- a/tests/kola/root-reprovision/luks/test.sh +++ b/tests/kola/root-reprovision/luks/test.sh @@ -1,17 +1,16 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "architectures": "!s390x", "timeoutMin": 15, "tags": "reprovision" } -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - tags: reprovision -# - This test reprovisions the rootfs. -# - minMemory: 4096 -# - Root reprovisioning requires at least 4GiB of memory. -# - architectures: !s390x -# - A TPM backend device is not available on s390x to suport TPM. -# - timeoutMin: 15 -# - This test includes a lot of disk I/O and needs a higher -# timeout value than the default. +## kola: +## # This test should pass everywhere if it passes anywhere. +## platforms: qemu +## # Root reprovisioning requires at least 4GiB of memory. +## minMemory: 4096 +## # A TPM backend device is not available on s390x to suport TPM. +## architectures: "!s390x" +## # This test includes a lot of disk I/O and needs a higher +## # timeout value than the default. +## timeoutMin: 15 +## # This test reprovisions the rootfs. +## tags: reprovision set -xeuo pipefail diff --git a/tests/kola/root-reprovision/raid1/test.sh b/tests/kola/root-reprovision/raid1/test.sh index 3da3d74a..15c15b3c 100755 --- a/tests/kola/root-reprovision/raid1/test.sh +++ b/tests/kola/root-reprovision/raid1/test.sh @@ -1,18 +1,16 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "additionalDisks": ["5G", "5G"], "timeoutMin": 15, "tags": "reprovision" } -# -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - additionalDisks is only supported on qemu. -# - tags: reprovision -# - This test reprovisions the rootfs. -# - minMemory: 4096 -# - Root reprovisioning requires at least 4GiB of memory. -# - additionalDisks: ["5G", "5G"] -# - A RAID1 is setup on these disks. -# - timeoutMin: 15 -# - This test includes a lot of disk I/O and needs a higher -# timeout value than the default. +## kola: +## # additionalDisks is only supported on qemu. +## platforms: qemu +## # Root reprovisioning requires at least 4GiB of memory. +## minMemory: 4096 +## # Linear RAID is setup on these disks. +## additionalDisks: ["5G", "5G"] +## # This test includes a lot of disk I/O and needs a higher +## # timeout value than the default. +## timeoutMin: 15 +## # This test reprovisions the rootfs. +## tags: reprovision set -xeuo pipefail diff --git a/tests/kola/root-reprovision/swap-before-root/test.sh b/tests/kola/root-reprovision/swap-before-root/test.sh index b5ffb905..c4ea978a 100755 --- a/tests/kola/root-reprovision/swap-before-root/test.sh +++ b/tests/kola/root-reprovision/swap-before-root/test.sh @@ -1,21 +1,20 @@ #!/bin/bash -# kola: { "distros": "fcos", "platforms": "qemu", "minMemory": 4096, "timeoutMin": 15, "allowConfigWarnings": true, "tags": "reprovision" } -# -# - distros: fcos -# - This test only runs on FCOS due to a problem enabling a swap partition on -# RHCOS. See: https://github.com/openshift/os/issues/665 -# - platforms: qemu -# - This test should pass everywhere if it passes anywhere. -# - tags: reprovision -# - This test reprovisions the rootfs. -# - minMemory: 4096 -# - Root reprovisioning requires at least 4GiB of memory. -# - timeoutMin: 15 -# - This test includes a lot of disk I/O and needs a higher -# timeout value than the default. -# - allowConfigWarnings: true -# - We intentionally put the root filesystem on partition 5. This is -# legal but usually not intended, so Butane warns about it. +## kola: +## # This test only runs on FCOS due to a problem enabling a swap partition on +## # RHCOS. See: https://github.com/openshift/os/issues/665 +## distros: fcos +## # additionalDisks is only supported on qemu. +## platforms: qemu +## # Root reprovisioning requires at least 4GiB of memory. +## minMemory: 4096 +## # This test includes a lot of disk I/O and needs a higher +## # timeout value than the default. +## timeoutMin: 15 +## # We intentionally put the root filesystem on partition 5. This is +## # legal but usually not intended, so Butane warns about it. +## allowConfigWarnings: true +## # This test reprovisions the rootfs. +## tags: reprovision set -xeuo pipefail diff --git a/tests/kola/rpm-ostree-countme/test.sh b/tests/kola/rpm-ostree-countme/test.sh index c859ffd7..66986b95 100755 --- a/tests/kola/rpm-ostree-countme/test.sh +++ b/tests/kola/rpm-ostree-countme/test.sh @@ -1,7 +1,10 @@ #!/bin/bash -# kola: { "distros": "fcos", "tags": "needs-internet", "platforms": "qemu-unpriv" } -# No need to run on any other platform than QEMU. -# This test only runs on FCOS because countme support is not available in RHCOS +## kola: +## # This test only runs on FCOS because countme support is not available in RHCOS +## distros: fcos +## tags: needs-internet +## # No need to run on any other platform than QEMU. +## platforms: qemu-unpriv set -xeuo pipefail diff --git a/tests/kola/rpm-ostree/container-deps b/tests/kola/rpm-ostree/container-deps index a6c8473e..98888bc5 100755 --- a/tests/kola/rpm-ostree/container-deps +++ b/tests/kola/rpm-ostree/container-deps @@ -1,6 +1,7 @@ #!/bin/bash # Verify some dependencies of the rpm-ostree container stack. -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/security/coreos-update-ca-trust/test.sh b/tests/kola/security/coreos-update-ca-trust/test.sh index e3fe4ca9..1eb8fcda 100755 --- a/tests/kola/security/coreos-update-ca-trust/test.sh +++ b/tests/kola/security/coreos-update-ca-trust/test.sh @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/security/passwd/test.sh b/tests/kola/security/passwd/test.sh index 92e2ff49..3602bd1c 100755 --- a/tests/kola/security/passwd/test.sh +++ b/tests/kola/security/passwd/test.sh @@ -1,7 +1,9 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS because RHCOS does not support `yescrypt` -# TODO-RHCOS: adapt to use different `crypt` scheme for RHCOS +## kola: +## # This test only runs on FCOS because RHCOS does not support `yescrypt` +## # TODO-RHCOS: adapt to use different `crypt` scheme for RHCOS +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/selinux/enforcing b/tests/kola/selinux/enforcing index a8660240..abb3ab3b 100755 --- a/tests/kola/selinux/enforcing +++ b/tests/kola/selinux/enforcing @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/selinux/stub-resolve-context b/tests/kola/selinux/stub-resolve-context index c4c87d9b..da753758 100755 --- a/tests/kola/selinux/stub-resolve-context +++ b/tests/kola/selinux/stub-resolve-context @@ -1,7 +1,9 @@ #!/usr/bin/env bash -# kola: { "distros": "fcos", "exclusive": false } -# This test only runs on FCOS because `systemd-resolved` is not installed on -# RHCOS +## kola: +## # This test only runs on FCOS because `systemd-resolved` is not installed on +## # RHCOS +## distros: fcos +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/selinux/usrlocal-context b/tests/kola/selinux/usrlocal-context index bd1f717f..8cfe357f 100755 --- a/tests/kola/selinux/usrlocal-context +++ b/tests/kola/selinux/usrlocal-context @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false set -xeuo pipefail diff --git a/tests/kola/swap/zram-default b/tests/kola/swap/zram-default index 4c61eb8b..472fd354 100755 --- a/tests/kola/swap/zram-default +++ b/tests/kola/swap/zram-default @@ -1,5 +1,6 @@ #!/bin/bash -# kola: { "exclusive": false } +## kola: +## exclusive: false # We can run this on both FCOS and RHCOS as neither should have a zram device # enabled by default. (In RHCOS, there is no zram support at all) diff --git a/tests/kola/swap/zram-generator/test.sh b/tests/kola/swap/zram-generator/test.sh index a610a0cd..5fcd5abf 100755 --- a/tests/kola/swap/zram-generator/test.sh +++ b/tests/kola/swap/zram-generator/test.sh @@ -1,7 +1,9 @@ #!/bin/bash -# kola: { "distros": "fcos", "exclusive": true} -# This test conflicts with swap/zram-default so we cannot set this to non-exclusive -# This test only runs on FCOS because RHCOS does not have zram support. +## kola: +## # This test only runs on FCOS because RHCOS does not have zram support. +## distros: fcos +## # This test conflicts with swap/zram-default so we cannot set this to non-exclusive +## exclusive: true set -xeuo pipefail diff --git a/tests/kola/toolbox/test.sh b/tests/kola/toolbox/test.sh index 7ea33606..55a8ef03 100755 --- a/tests/kola/toolbox/test.sh +++ b/tests/kola/toolbox/test.sh @@ -1,5 +1,16 @@ #!/bin/bash -# kola: { "distros": "fcos", "tags": "needs-internet", "platforms": "qemu-unpriv", "architectures": "x86_64 aarch64" } +## kola: +## # This test only runs on FCOS because RHCOS is missing the `machinectl` command. +## # Additionally, there are some distro specific choices made for this test that +## # should/could be adapted for RHCOS. +## # TODO-RHCOS: adapt test for RHCOS specifics or create separate RHCOS toolbox test +## distros: fcos +## tags: needs-internet +## # Only run on QEMU to reduce CI costs as nothing is platform specific here. +## platforms: qemu-unpriv +## # Toolbox container is currently available only for x86_64 and aarch64 in Fedora +## architectures: x86_64 aarch64 + # Make sure that basic toolbox functionnality is working: # - Creating a toolbox # - Running a command in a toolbox @@ -11,13 +22,6 @@ # code/status of the invoked shell process thus we need additionnal checks to # ensure that previous commands were successful. -# Only run on QEMU to reduce CI costs as nothing is platform specific here. -# Toolbox container is currently available only for x86_64 and aarch64 in Fedora -# This test only runs on FCOS because RHCOS is missing the `machinectl` command. -# Additionally, there are some distro specific choices made for this test that -# should/could be adpated for RHCOS. -# TODO-RHCOS: adapt test for RHCOS specifics or create separate RHCOS toolbox test - set -xeuo pipefail . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/var-mount/luks/test.sh b/tests/kola/var-mount/luks/test.sh index f27dd70a..c332c1c5 100755 --- a/tests/kola/var-mount/luks/test.sh +++ b/tests/kola/var-mount/luks/test.sh @@ -1,8 +1,10 @@ #!/bin/bash set -xeuo pipefail -# restrict to qemu for now because the primary disk path is platform-dependent -# kola: {"platforms": "qemu", "architectures": "!s390x"} +## kola: +## # restrict to qemu for now because the primary disk path is platform-dependent +## platforms: qemu +## architectures: "!s390x" . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/var-mount/scsi-id/test.sh b/tests/kola/var-mount/scsi-id/test.sh index b02eaf2a..f26818b3 100755 --- a/tests/kola/var-mount/scsi-id/test.sh +++ b/tests/kola/var-mount/scsi-id/test.sh @@ -4,7 +4,9 @@ set -xeuo pipefail # symlinks present in initramfs # https://bugzilla.redhat.com/show_bug.cgi?id=1990506 -# kola: {"platforms": "qemu", "additionalDisks": ["5G:mpath"]} +## kola: +## platforms: qemu +## additionalDisks: ["5G:mpath"] . $KOLA_EXT_DATA/commonlib.sh diff --git a/tests/kola/var-mount/simple/test.sh b/tests/kola/var-mount/simple/test.sh index 2c1c608e..8c4f8ae4 100755 --- a/tests/kola/var-mount/simple/test.sh +++ b/tests/kola/var-mount/simple/test.sh @@ -2,7 +2,8 @@ set -xeuo pipefail # restrict to qemu for now because the primary disk path is platform-dependent -# kola: {"platforms": "qemu"} +## kola: +## platforms: qemu . $KOLA_EXT_DATA/commonlib.sh