From e60092a7691861246c76d2abe31a805a44f37823 Mon Sep 17 00:00:00 2001 From: Milan Lysonek Date: Wed, 17 Jul 2024 14:34:22 +0200 Subject: [PATCH 1/3] Introduce /static-checks CI also for all Fedora versions --- .packit.yaml | 5 +++++ tests/tmt-plans/main.fmf | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/.packit.yaml b/.packit.yaml index 57e367cc186..c69ed5fde6d 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -34,6 +34,11 @@ jobs: # when modifying this, modify also tests/tmt-plans/ +- <<: *test-static-checks + identifier: /static-checks-fedora + tmt_plan: /static-checks-fedora + targets: + fedora-all: {} - <<: *test-static-checks identifier: /hardening/host-os/ansible/anssi_bp28_high tmt_plan: /hardening/host-os/ansible/anssi_bp28_high diff --git a/tests/tmt-plans/main.fmf b/tests/tmt-plans/main.fmf index ca4163c9196..a965574ac60 100644 --- a/tests/tmt-plans/main.fmf +++ b/tests/tmt-plans/main.fmf @@ -108,3 +108,7 @@ report: - /static-checks/html-links # these always fail, meant for manual review - /static-checks/diff + +# Fedora specific plan +/static-checks-fedora: + discover+: {test: /static-checks/rpmbuild-ctest} From 9059f2097fd88cee4e918f68d79515b6b0cc2091 Mon Sep 17 00:00:00 2001 From: Milan Lysonek Date: Wed, 17 Jul 2024 16:10:52 +0200 Subject: [PATCH 2/3] Prevent matching multiple test plans via tmt_plan regex EOL check --- .packit.yaml | 56 ++++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index c69ed5fde6d..dbe143f17b9 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -27,7 +27,7 @@ jobs: trigger: pull_request fmf_path: tests/tmt-plans identifier: /static-checks - tmt_plan: /static-checks + tmt_plan: /static-checks$ targets: centos-stream-8: {} centos-stream-9: {} @@ -36,89 +36,89 @@ jobs: - <<: *test-static-checks identifier: /static-checks-fedora - tmt_plan: /static-checks-fedora + tmt_plan: /static-checks-fedora$ targets: fedora-all: {} - <<: *test-static-checks identifier: /hardening/host-os/ansible/anssi_bp28_high - tmt_plan: /hardening/host-os/ansible/anssi_bp28_high + tmt_plan: /hardening/host-os/ansible/anssi_bp28_high$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/ccn_advanced - tmt_plan: /hardening/host-os/ansible/ccn_advanced + tmt_plan: /hardening/host-os/ansible/ccn_advanced$ targets: centos-stream-9: {} - <<: *test-static-checks identifier: /hardening/host-os/ansible/cis - tmt_plan: /hardening/host-os/ansible/cis + tmt_plan: /hardening/host-os/ansible/cis$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/cis_server_l1 - tmt_plan: /hardening/host-os/ansible/cis_server_l1 + tmt_plan: /hardening/host-os/ansible/cis_server_l1$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/cis_workstation_l1 - tmt_plan: /hardening/host-os/ansible/cis_workstation_l1 + tmt_plan: /hardening/host-os/ansible/cis_workstation_l1$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/cis_workstation_l2 - tmt_plan: /hardening/host-os/ansible/cis_workstation_l2 + tmt_plan: /hardening/host-os/ansible/cis_workstation_l2$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/cui - tmt_plan: /hardening/host-os/ansible/cui + tmt_plan: /hardening/host-os/ansible/cui$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/e8 - tmt_plan: /hardening/host-os/ansible/e8 + tmt_plan: /hardening/host-os/ansible/e8$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/hipaa - tmt_plan: /hardening/host-os/ansible/hipaa + tmt_plan: /hardening/host-os/ansible/hipaa$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/ism_o - tmt_plan: /hardening/host-os/ansible/ism_o + tmt_plan: /hardening/host-os/ansible/ism_o$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/ospp - tmt_plan: /hardening/host-os/ansible/ospp + tmt_plan: /hardening/host-os/ansible/ospp$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/pci-dss - tmt_plan: /hardening/host-os/ansible/pci-dss + tmt_plan: /hardening/host-os/ansible/pci-dss$ - <<: *test-static-checks identifier: /hardening/host-os/ansible/stig - tmt_plan: /hardening/host-os/ansible/stig + tmt_plan: /hardening/host-os/ansible/stig$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/anssi_bp28_high - tmt_plan: /hardening/host-os/oscap/anssi_bp28_high + tmt_plan: /hardening/host-os/oscap/anssi_bp28_high$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/ccn_advanced - tmt_plan: /hardening/host-os/oscap/ccn_advanced + tmt_plan: /hardening/host-os/oscap/ccn_advanced$ targets: centos-stream-9: {} - <<: *test-static-checks identifier: /hardening/host-os/oscap/cis - tmt_plan: /hardening/host-os/oscap/cis + tmt_plan: /hardening/host-os/oscap/cis$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/cis_server_l1 - tmt_plan: /hardening/host-os/oscap/cis_server_l1 + tmt_plan: /hardening/host-os/oscap/cis_server_l1$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/cis_workstation_l1 - tmt_plan: /hardening/host-os/oscap/cis_workstation_l1 + tmt_plan: /hardening/host-os/oscap/cis_workstation_l1$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/cis_workstation_l2 - tmt_plan: /hardening/host-os/oscap/cis_workstation_l2 + tmt_plan: /hardening/host-os/oscap/cis_workstation_l2$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/cui - tmt_plan: /hardening/host-os/oscap/cui + tmt_plan: /hardening/host-os/oscap/cui$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/e8 - tmt_plan: /hardening/host-os/oscap/e8 + tmt_plan: /hardening/host-os/oscap/e8$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/hipaa - tmt_plan: /hardening/host-os/oscap/hipaa + tmt_plan: /hardening/host-os/oscap/hipaa$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/ism_o - tmt_plan: /hardening/host-os/oscap/ism_o + tmt_plan: /hardening/host-os/oscap/ism_o$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/ospp - tmt_plan: /hardening/host-os/oscap/ospp + tmt_plan: /hardening/host-os/oscap/ospp$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/pci-dss - tmt_plan: /hardening/host-os/oscap/pci-dss + tmt_plan: /hardening/host-os/oscap/pci-dss$ - <<: *test-static-checks identifier: /hardening/host-os/oscap/stig - tmt_plan: /hardening/host-os/oscap/stig + tmt_plan: /hardening/host-os/oscap/stig$ From 373a9fbe8a9749868854425d5b3535d0a817a01f Mon Sep 17 00:00:00 2001 From: Milan Lysonek Date: Fri, 26 Jul 2024 09:05:50 +0200 Subject: [PATCH 3/3] Rename Fedora TF job to make it more accurate --- .packit.yaml | 4 ++-- tests/tmt-plans/main.fmf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.packit.yaml b/.packit.yaml index dbe143f17b9..eb3a21978ce 100644 --- a/.packit.yaml +++ b/.packit.yaml @@ -35,8 +35,8 @@ jobs: # when modifying this, modify also tests/tmt-plans/ - <<: *test-static-checks - identifier: /static-checks-fedora - tmt_plan: /static-checks-fedora$ + identifier: /rpmbuild-ctest-fedora + tmt_plan: /rpmbuild-ctest-fedora$ targets: fedora-all: {} - <<: *test-static-checks diff --git a/tests/tmt-plans/main.fmf b/tests/tmt-plans/main.fmf index a965574ac60..778ba60287e 100644 --- a/tests/tmt-plans/main.fmf +++ b/tests/tmt-plans/main.fmf @@ -110,5 +110,5 @@ report: - /static-checks/diff # Fedora specific plan -/static-checks-fedora: +/rpmbuild-ctest-fedora: discover+: {test: /static-checks/rpmbuild-ctest}