From 00e29ff3ebd082550673f5d97a2d8a99a75bdd51 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:34:27 -0500 Subject: [PATCH 1/7] Enable RHEL 10 on RHEL 7 To check RHEL 10 as a derivative --- .github/workflows/gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index 556eaace899..e3b11ad5977 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -22,7 +22,7 @@ jobs: uses: actions/checkout@v3 - name: Build run: |- - ./build_product rhel7 rhel8 rhel9 --derivatives + ./build_product rhel7 rhel8 rhel9 rhel10 --derivatives env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" - name: Test From 6430ccc6ee9d5689aa8460b43c823a1f5e03d366 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:39:18 -0500 Subject: [PATCH 2/7] Reduce the products build on SLE15 This is to reduce the amount of duplication that is done by gating. --- .github/workflows/gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index e3b11ad5977..b06a263caaf 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -54,7 +54,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build - run: ./build_product alinux2 alinux3 chromium fedora firefox rhcos4 rhel7 rhel8 rhel9 sle12 sle15 ubuntu2004 ubuntu2204 uos20 + run: ./build_product sle12 sle15 - name: Test run: ctest -j2 --output-on-failure -E unique-stigids working-directory: ./build From a660caed9423f1b8c18b5a3ccdf05b925ef599f5 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:39:35 -0500 Subject: [PATCH 3/7] Reduce the products build on OpenSUSE This is to reduce the amount of duplication that is done by gating. --- .github/workflows/gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index b06a263caaf..0e7e7fca94d 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -70,7 +70,7 @@ jobs: - name: Checkout uses: actions/checkout@v4 - name: Build - run: ./build_product sle12 sle15 + run: ./build_product opensuse env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" - name: Test From 4d14bd51978d8d46dc26d096d0ba76c4a8ab653d Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:40:42 -0500 Subject: [PATCH 4/7] Add debian12 to Debian testing Ensure that Debian 12 is tested in CI. --- .github/workflows/gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index 0e7e7fca94d..127b2bdf55c 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -97,7 +97,7 @@ jobs: env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" run: |- - ./build_product debian10 debian11 + ./build_product debian10 debian11 debian12 - name: Test working-directory: ./build run: ctest -j2 --output-on-failure -E unique-stigids From 99d2be47f1a288845ddbce7b4caeaf715c016e77 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:42:03 -0500 Subject: [PATCH 5/7] Add ubuntu 16.04 and 18.04 to Ubuntu 20.04 testing Ensure these products are tested in CI. --- .github/workflows/gate.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index 127b2bdf55c..1d2988d1936 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -116,7 +116,7 @@ jobs: env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_SCE_ENABLED:BOOL=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" run: |- - ./build_product ubuntu2004 ubuntu2204 + ./build_product ubuntu1604 ubuntu1804 ubuntu2004 - name: Test run: ctest -j2 --output-on-failure -E unique-stigids working-directory: ./build From 5736e8634906842388e18e1c5ba02399a69ef484 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:49:30 -0500 Subject: [PATCH 6/7] Remove ubuntu2004 from ubuntu 22.04 testing We should only build every product once. --- .github/workflows/gate.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml index 1d2988d1936..482c477ca01 100644 --- a/.github/workflows/gate.yaml +++ b/.github/workflows/gate.yaml @@ -135,7 +135,7 @@ jobs: env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_SCE_ENABLED:BOOL=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" run: |- - ./build_product ubuntu2004 ubuntu2204 + ./build_product ubuntu2204 - name: Test run: ctest -j2 --output-on-failure -E unique-stigids working-directory: ./build @@ -168,6 +168,7 @@ jobs: rhel7 \ rhel8 \ rhel9 \ + rhel10 \ uos20 \ ocp4 env: From 6d7abd13265150bb16a5fef9c6222282e9d6ee15 Mon Sep 17 00:00:00 2001 From: Matthew Burket Date: Thu, 30 May 2024 14:52:25 -0500 Subject: [PATCH 7/7] Ensure that products are build during CI The products added in this commit where not tested anywhere else. The goal is to catch issues before the nightly build. --- .github/workflows/gate_fedora.yml | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gate_fedora.yml b/.github/workflows/gate_fedora.yml index 1d03faa3129..cf9c6a3bb44 100644 --- a/.github/workflows/gate_fedora.yml +++ b/.github/workflows/gate_fedora.yml @@ -24,22 +24,31 @@ jobs: run: pip install pcre2 -r requirements.txt -r test-requirements.txt - name: Build run: |- - ./build_product \ + ./build_product -j2 \ alinux2 \ alinux3 \ anolis23 \ anolis8 \ chromium \ + eks \ + example \ fedora \ firefox \ + macos1015 \ + ol7 \ + ol8 \ + ol9 \ + openembedded \ + openeuler2203 \ rhcos4 \ rhel7 \ rhel8 \ rhel9 \ rhel10 \ + rhv4 \ uos20 \ ocp4 \ - eks + uos20 env: ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF" - name: Test