Skip to content

Commit

Permalink
Merge pull request #12248 from Mab879/remove_uos20
Browse files Browse the repository at this point in the history
Remove uos20
  • Loading branch information
jan-cerny authored Aug 1, 2024
2 parents c048f13 + b02453c commit 452f1ca
Show file tree
Hide file tree
Showing 22 changed files with 3 additions and 593 deletions.
1 change: 0 additions & 1 deletion .github/workflows/gate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,6 @@ jobs:
rhel8 \
rhel9 \
rhel10 \
uos20 \
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
- name: Test
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/gate_fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
rhel9 \
rhel10 \
rhv4 \
uos20
env:
ADDITIONAL_CMAKE_OPTIONS: "-DSSG_ANSIBLE_PLAYBOOKS_PER_RULE_ENABLED=ON -DSSG_OVAL_SCHEMATRON_VALIDATION_ENABLED=OFF"
- name: Test
Expand Down
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ option(SSG_PRODUCT_UBUNTU1604 "If enabled, the Ubuntu 16.04 SCAP content will be
option(SSG_PRODUCT_UBUNTU1804 "If enabled, the Ubuntu 18.04 SCAP content will be built" ${SSG_PRODUCT_DEFAULT})
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)
Expand Down Expand Up @@ -341,7 +340,6 @@ message(STATUS "Ubuntu 16.04: ${SSG_PRODUCT_UBUNTU1604}")
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 Down Expand Up @@ -462,9 +460,6 @@ endif()
if(SSG_PRODUCT_UBUNTU2204)
add_subdirectory("products/ubuntu2204" "ubuntu2204")
endif()
if(SSG_PRODUCT_UOS20)
add_subdirectory("products/uos20" "uos20")
endif()
if(SSG_PRODUCT_OPENEMBEDDED)
add_subdirectory("products/openembedded" "openembedded")
endif()
Expand Down
1 change: 0 additions & 1 deletion build_product
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ all_cmake_products=(
UBUNTU1804
UBUNTU2004
UBUNTU2204
UOS20
MACOS1015
OPENEMBEDDED
OPENEULER2203
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# platform = multi_platform_al2023,multi_platform_alinux,multi_platform_anolis,multi_platform_fedora,multi_platform_ol,multi_platform_sle,multi_platform_ubuntu,multi_platform_uos
# platform = multi_platform_al2023,multi_platform_alinux,multi_platform_anolis,multi_platform_fedora,multi_platform_ol,multi_platform_sle,multi_platform_ubuntu
# reboot = true
# strategy = patch
# complexity = low
Expand Down
6 changes: 0 additions & 6 deletions products/uos20/CMakeLists.txt

This file was deleted.

Empty file removed products/uos20/overlays/.gitkeep
Empty file.
25 changes: 0 additions & 25 deletions products/uos20/product.yml

This file was deleted.

Loading

0 comments on commit 452f1ca

Please sign in to comment.