Merge pull request #12006 from hipponix/11785-create-al2023-product

Add al2023 product
ComplianceAsCode · Jun 27, 2024 · e2a9877 · e2a9877
2 parents a1c362f + 1324b12
commit e2a9877
Show file tree

Hide file tree

Showing 26 changed files with 2,525 additions and 7 deletions.
diff --git a/.github/workflows/gate.yaml b/.github/workflows/gate.yaml
@@ -157,19 +157,20 @@ jobs:
       -   name: Build
           run: |-
             ./build_product \
+                al2023 \
                 alinux2 \
                 alinux3 \
                 anolis23 \
                 anolis8 \
                 chromium \
                 fedora \
                 firefox \
+                ocp4 \
                 rhcos4 \
                 rhel8 \
                 rhel9 \
                 rhel10 \
                 uos20 \
-                ocp4
           env:
             ADDITIONAL_CMAKE_OPTIONS: "-DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
       -   name: Test

diff --git a/.github/workflows/gate_fedora.yml b/.github/workflows/gate_fedora.yml
@@ -25,6 +25,7 @@ jobs:
             -   name: Build
                 run: |-
                     ./build_product -j2 \
+                        al2023 \
                         alinux2 \
                         alinux3 \
                         anolis23 \
@@ -35,6 +36,7 @@ jobs:
                         fedora \
                         firefox \
                         macos1015 \
+                        ocp4 \
                         ol7  \
                         ol8 \
                         ol9 \
@@ -45,8 +47,7 @@ jobs:
                         rhel9 \
                         rhel10 \
                         rhv4 \
-                        uos20 \
-                        ocp4
+                        uos20
                 env:
                     ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
             -   name: Test

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -115,6 +115,7 @@ option(SSG_PRODUCT_UBUNTU1804 "If enabled, the Ubuntu 18.04 SCAP content will be
 option(SSG_PRODUCT_UBUNTU2004 "If enabled, the Ubuntu 20.04 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
 option(SSG_PRODUCT_UBUNTU2204 "If enabled, the Ubuntu 22.04 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
 option(SSG_PRODUCT_UOS20 "If enabled, the Uos 20 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
+option(SSG_PRODUCT_AL2023 "If enabled, the AL2023 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
 # Products derivatives
 option(SSG_CENTOS_DERIVATIVES_ENABLED "If enabled, CentOS derivative content will be built from the RHEL content" TRUE)
 
@@ -341,6 +342,7 @@ message(STATUS "Ubuntu 18.04: ${SSG_PRODUCT_UBUNTU1804}")
 message(STATUS "Ubuntu 20.04: ${SSG_PRODUCT_UBUNTU2004}")
 message(STATUS "Ubuntu 22.04: ${SSG_PRODUCT_UBUNTU2204}")
 message(STATUS "Uos 20: ${SSG_PRODUCT_UOS20}")
+message(STATUS "AL 2023: ${SSG_PRODUCT_AL2023}")
 message(STATUS "OpenEmbedded: ${SSG_PRODUCT_OPENEMBEDDED}")
 message(STATUS " ")
 
@@ -366,6 +368,9 @@ add_custom_target(render-policies)
 
 ssg_build_man_page()
 
+if(SSG_PRODUCT_AL2023)
+    add_subdirectory("products/al2023" "al2023")
+endif()
 if(SSG_PRODUCT_ALINUX2)
     add_subdirectory("products/alinux2" "alinux2")
 endif()

diff --git a/build_product b/build_product
@@ -342,6 +342,7 @@ set_explict_build_targets() {
 # Get this using
 # grep 'option(SSG_PRODUCT' CMakeLists.txt  | sed -e 's/option(SSG_PRODUCT_\(\w\+\).*/\1/'
 all_cmake_products=(
+	AL2023
 	ALINUX2
 	ALINUX3
 	ANOLIS8

diff --git a/components/rpm.yml b/components/rpm.yml
@@ -17,6 +17,7 @@ rules:
 - ensure_oracle_gpgkey_installed
 - ensure_package_repositories_are_configured
 - ensure_redhat_gpgkey_installed
+- ensure_amazon_gpgkey_installed
 - ensure_suse_gpgkey_installed
 - package_dnf-automatic_installed
 - package_gnome_software_installed