Merge pull request #13491 from comps/centos_stream_10_stab

[stabilization] enable `centos-stream-10` in Packit and on Testing Farm

Author: vojtapolasek

.packit.yaml

@@ -17,6 +17,7 @@ jobs:
   - fedora-all-x86_64
   - centos-stream-8-x86_64
   - centos-stream-9-x86_64
+  - centos-stream-10-x86_64
 
 - <<: *build
   trigger: commit
@@ -31,6 +32,7 @@ jobs:
   targets:
     centos-stream-8: {}
     centos-stream-9: {}
+    centos-stream-10: {}
 
 # when modifying this, modify also tests/tmt-plans/
 
@@ -62,6 +64,9 @@ jobs:
 - <<: *test-static-checks
   identifier: /hardening/host-os/ansible/cui
   tmt_plan: /hardening/host-os/ansible/cui$
+  targets:
+    centos-stream-8: {}
+    centos-stream-9: {}
 - <<: *test-static-checks
   identifier: /hardening/host-os/ansible/e8
   tmt_plan: /hardening/host-os/ansible/e8$
@@ -104,6 +109,9 @@ jobs:
 - <<: *test-static-checks
   identifier: /hardening/host-os/oscap/cui
   tmt_plan: /hardening/host-os/oscap/cui$
+  targets:
+    centos-stream-8: {}
+    centos-stream-9: {}
 - <<: *test-static-checks
   identifier: /hardening/host-os/oscap/e8
   tmt_plan: /hardening/host-os/oscap/e8$

linux_os/guide/services/ntp/chrony_set_nts/bash/shared.sh

@@ -1,23 +1,19 @@
 # platform = multi_platform_all
 
-{{% if 'sle' in product or 'ubuntu' in product %}}
-pof="/bin/pidof"
-{{% else %}}
-pof="/usr/sbin/pidof"
-{{% endif %}}
+config_files=(/etc/ntp.conf)
+config_files+=("{{{ chrony_conf_path }}}")
 
-CONFIG_FILES="/etc/ntp.conf"
-$pof ntpd || {
-    CHRONY_D_PATH={{{ chrony_d_path }}}
-    mapfile -t CONFIG_FILES < <(find ${CHRONY_D_PATH}.* -type f -name '*.conf')
-    CONFIG_FILES+=({{{ chrony_conf_path }}})
-}
+chrony_d_path={{{ chrony_d_path }}}
+if [[ -d $chrony_d_path ]]; then
+    while IFS= read -r filename; do
+        config_files+=("$filename")
+    done < <(find "$chrony_d_path" -type f -name '*.conf')
+fi
 
-# get list of ntp files
-
-for config_file in "${CONFIG_FILES[@]}" ; do
-    # Add maxpoll to server, pool or peer entries without maxpoll
-    grep "^\(server\|pool\|peer\)" "$config_file" | grep -v maxpoll | while read -r line ; do
-        sed -i "s/$line/& nts/" "$config_file"
-    done
+for config_file in "${config_files[@]}"; do
+    [[ -e $config_file ]] || continue
+    # if the line doesn't start with 'server/pool/peer ', just print it
+    # if the line does contain ' nts' already, skip it
+    # else append ' nts' to it
+    sed "/^\(server\|pool\|peer\) /! b; / nts/ b; s/$/ nts/" -i "$config_file"
 done

scap-security-guide.spec

@@ -97,8 +97,8 @@ rm %{buildroot}/%{_docdir}/%{name}/Contributors.md
 
 %files
 %{_datadir}/xml/scap/ssg/content
-# No kickstarts for Fedora
-%if 0%{?_rhel_like}
+# No kickstarts for Fedora or CentOS Stream 10+
+%if 0%{?_rhel_like} && 0%{?_rhel_like} < 10
 %{_datadir}/%{name}/kickstart
 %endif
 %{_datadir}/%{name}/ansible/*.yml