Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add al2023 product #12006

Merged
merged 28 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
6664143
fix merge conflicts
hipponix May 31, 2024
4a7d1fe
Add al2023 to gate_fedora.yml - fix a merge conflict
hipponix May 2, 2024
6c57fed
Fix al2023 faling test on CPE validation
hipponix May 3, 2024
c5172c2
Build al2023 on centos, sle and fedora
hipponix May 3, 2024
762edc8
Build al2023 sle and fedora
hipponix May 3, 2024
578e9d8
Fix os version check/name on AL2023
hipponix May 15, 2024
58ad915
Complete al2023 setup (add components, controls, linux_os)
hipponix May 19, 2024
3d60664
Add aws fingerprint and fix ensure_amazon_gpgkey_installed
hipponix May 19, 2024
ff39928
fix a typo in cis.profile
hipponix May 21, 2024
472659c
fix a typo in cis_server_l1.profile
hipponix May 21, 2024
170ae4f
Update linux_os/guide/system/software/updating/ensure_amazon_gpgkey_i…
hipponix May 30, 2024
4435892
Update linux_os/guide/system/software/updating/ensure_amazon_gpgkey_i…
hipponix May 30, 2024
32686e4
Update linux_os/guide/system/software/updating/ensure_amazon_gpgkey_i…
hipponix May 30, 2024
73a1121
Update linux_os/guide/system/software/updating/ensure_amazon_gpgkey_i…
hipponix May 30, 2024
f362c43
Update linux_os/guide/system/software/updating/ensure_amazon_gpgkey_i…
hipponix May 30, 2024
067ac60
remove not needed controls from cis profiles - fix chronyd conf by po…
hipponix May 31, 2024
668b829
Add AL2023 product
hipponix May 2, 2024
7ff54a7
Fix os version check/name on AL2023
hipponix May 15, 2024
f59006f
fix conflicts
Jun 4, 2024
2f2fe79
Revert "remove not needed controls from cis profiles - fix chronyd co…
Jun 3, 2024
33d926c
Fix indentation/sorting issues
hipponix Jun 12, 2024
b376bf7
bring cis_al2023.yml back
hipponix Jun 13, 2024
d20eb65
fix and test on al2023 / add minor changes
hipponix Jun 17, 2024
2a46058
Replace cis_al2023.yml with a previous version - Rename CIS 2 profile…
hipponix Jun 18, 2024
d0055a5
fix syntaxt and CIS content errors
hipponix Jun 18, 2024
3532dd8
address additional syntax settings
hipponix Jun 18, 2024
5892000
Fix typos
hipponix Jun 20, 2024
1324b12
fix cis_al2023.yml and its manual settings
hipponix Jun 25, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .github/workflows/gate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -157,20 +157,21 @@ jobs:
- name: Build
run: |-
./build_product \
al2023 \
alinux2 \
alinux3 \
anolis23 \
anolis8 \
chromium \
fedora \
firefox \
ocp4 \
rhcos4 \
rhel7 \
rhel8 \
rhel9 \
rhel10 \
uos20 \
ocp4
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
- name: Test
Expand Down
5 changes: 3 additions & 2 deletions .github/workflows/gate_fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ jobs:
- name: Build
run: |-
./build_product -j2 \
al2023 \
alinux2 \
alinux3 \
anolis23 \
Expand All @@ -35,6 +36,7 @@ jobs:
fedora \
firefox \
macos1015 \
ocp4 \
ol7 \
ol8 \
ol9 \
Expand All @@ -46,8 +48,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
Expand Down
5 changes: 5 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,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)
option(SSG_SCIENTIFIC_LINUX_DERIVATIVES_ENABLED "If enabled, Scientific Linux derivative content will be built from the RHEL content" TRUE)
Expand Down Expand Up @@ -344,6 +345,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 " ")

Expand All @@ -369,6 +371,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()
Expand Down
1 change: 1 addition & 0 deletions build_product
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,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
Expand Down
1 change: 1 addition & 0 deletions components/rpm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading
Loading