From c9849728f40aa763bf44ad6497f9811ecc396391 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 5 Aug 2022 11:16:58 -0400 Subject: [PATCH] tests/kola/root-reprovision: add `reprovision` tag This can be used to conveniently skip those tests by tag. --- tests/kola/root-reprovision/filesystem-only/test.sh | 4 +++- tests/kola/root-reprovision/linear/test.sh | 4 +++- tests/kola/root-reprovision/luks/test.sh | 4 +++- tests/kola/root-reprovision/raid1/test.sh | 4 +++- tests/kola/root-reprovision/swap-before-root/test.sh | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tests/kola/root-reprovision/filesystem-only/test.sh b/tests/kola/root-reprovision/filesystem-only/test.sh index 102a8a86f4..06a53d9ccc 100755 --- a/tests/kola/root-reprovision/filesystem-only/test.sh +++ b/tests/kola/root-reprovision/filesystem-only/test.sh @@ -1,8 +1,10 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "timeoutMin": 15 } +# 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 diff --git a/tests/kola/root-reprovision/linear/test.sh b/tests/kola/root-reprovision/linear/test.sh index 7355ab3633..d9ca084b33 100755 --- a/tests/kola/root-reprovision/linear/test.sh +++ b/tests/kola/root-reprovision/linear/test.sh @@ -1,9 +1,11 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "additionalDisks": ["5G", "5G"], "timeoutMin": 15 } +# 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"] diff --git a/tests/kola/root-reprovision/luks/test.sh b/tests/kola/root-reprovision/luks/test.sh index 5ec6513792..42a162bbce 100755 --- a/tests/kola/root-reprovision/luks/test.sh +++ b/tests/kola/root-reprovision/luks/test.sh @@ -1,8 +1,10 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "architectures": "!s390x", "timeoutMin": 15 } +# 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 diff --git a/tests/kola/root-reprovision/raid1/test.sh b/tests/kola/root-reprovision/raid1/test.sh index 1fb966ff45..3da3d74aea 100755 --- a/tests/kola/root-reprovision/raid1/test.sh +++ b/tests/kola/root-reprovision/raid1/test.sh @@ -1,9 +1,11 @@ #!/bin/bash -# kola: { "platforms": "qemu", "minMemory": 4096, "additionalDisks": ["5G", "5G"], "timeoutMin": 15 } +# 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"] diff --git a/tests/kola/root-reprovision/swap-before-root/test.sh b/tests/kola/root-reprovision/swap-before-root/test.sh index ebe9fdaff6..b5ffb90599 100755 --- a/tests/kola/root-reprovision/swap-before-root/test.sh +++ b/tests/kola/root-reprovision/swap-before-root/test.sh @@ -1,11 +1,13 @@ #!/bin/bash -# kola: { "distros": "fcos", "platforms": "qemu", "minMemory": 4096, "timeoutMin": 15, "allowConfigWarnings": true } +# 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