Merge pull request rhinstaller#1094 from rvykydal/update-rhelx-checks

Update is_rhelX function to return 0/1 values
rvykydal · Mar 22, 2024 · 713e095 · 713e095
2 parents 7126161 + ff85495
commit 713e095
Show file tree

Hide file tree

Showing 15 changed files with 32 additions and 28 deletions.
diff --git a/anaconda-conf.ks.in b/anaconda-conf.ks.in
@@ -21,7 +21,10 @@ fi
 
 %post --nochroot
 
-if [[ "@KSTEST_OS_NAME@" == "rhel" ]]; then
+@KSINCLUDE@ scripts-lib.sh
+
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ || \
+   is_rhel9 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     LOG_MSG="Writing a temporary configuration loaded from"
 else
     LOG_MSG="Configuration loaded from:"

diff --git a/anaconda-modules.ks.in b/anaconda-modules.ks.in
@@ -10,13 +10,16 @@
 
 %post --nochroot
 
+@KSINCLUDE@ scripts-lib.sh
+
 # Get the activated Anaconda DBus modules.
 cat /tmp/syslog | grep "Activating service name" | \
 grep "org.fedoraproject.Anaconda.Modules" | cut -d"'" -f2 \
 | sort > /tmp/generated.out
 
 # Generate the expected output.
-if [[ "@KSTEST_OS_NAME@" == "rhel" ]]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ || \
+   is_rhel9 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     cat > /tmp/expected.out << EOF
 org.fedoraproject.Anaconda.Modules.Localization
 org.fedoraproject.Anaconda.Modules.Network

diff --git a/bindtomac-bridge-2devs-httpks.ks.in b/bindtomac-bridge-2devs-httpks.ks.in
@@ -76,7 +76,7 @@ check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE
 
 check_device_config_value bridge1_slave_1 ONBOOT yes connection autoconnect __NONE
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE: anaconda does not create default config file for enslaved device in RHEL8
     check_config_exists @KSTEST_NETDEV2@ no
 else

diff --git a/bindtomac-bridge-2devs-pre.ks.in b/bindtomac-bridge-2devs-pre.ks.in
@@ -76,7 +76,7 @@ check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE
 
 check_device_config_value bridge1_slave_1 ONBOOT yes connection autoconnect __NONE
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE: anaconda does not create default config file for enslaved device in RHEL8
     check_config_exists @KSTEST_NETDEV2@ no
 else

diff --git a/bond-ks-initramfs.ks.in b/bond-ks-initramfs.ks.in
@@ -19,7 +19,7 @@ network --device bond0 --bootproto dhcp --bondslaves=@KSTEST_NETDEV1@,@KSTEST_NE
 @KSINCLUDE@ post-lib-network.sh
 @KSINCLUDE@ scripts-lib.sh
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # Ifcfg files for the kickstart configuration are created in initramfs
     check_config_exists bond0 yes
     check_config_exists bond0_slave_1 yes
@@ -61,7 +61,7 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ bond0
 @KSINCLUDE@ scripts-lib.sh
 
 check_device_config_value bond0 ONBOOT yes connection autoconnect __NONE
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_device_config_value bond0_slave_1 ONBOOT yes connection autoconnect __NONE
     check_device_config_value bond0_slave_1 SLAVE yes connection slave-type bond
     check_device_config_value bond0_slave_2 ONBOOT yes connection autoconnect __NONE

diff --git a/bridge-2devs-httpks.ks.in b/bridge-2devs-httpks.ks.in
@@ -77,7 +77,7 @@ check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE
 
 check_device_config_value bridge1_slave_1 ONBOOT yes connection autoconnect __NONE
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE: anaconda does not create default config file for enslaved device in RHEL8
     check_config_exists @KSTEST_NETDEV2@ no
 else

diff --git a/bridge-2devs-pre.ks.in b/bridge-2devs-pre.ks.in
@@ -76,7 +76,7 @@ check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE
 
 check_device_config_value bridge1_slave_1 ONBOOT yes connection autoconnect __NONE
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE: anaconda does not create default config file for enslaved device in RHEL8
     check_config_exists @KSTEST_NETDEV2@ no
 else

diff --git a/bridge-2devs.ks.in b/bridge-2devs.ks.in
@@ -75,7 +75,7 @@ check_device_config_value bridge1 ONBOOT yes connection autoconnect __NONE
 
 check_device_config_value bridge1_slave_1 ONBOOT yes connection autoconnect __NONE
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE: anaconda does not create default config file for enslaved device in RHEL8
     check_config_exists @KSTEST_NETDEV2@ no
 else

diff --git a/bridge-no-bootopts-net.ks.in b/bridge-no-bootopts-net.ks.in
@@ -38,7 +38,7 @@ check_gui_configurations @KSTEST_NETDEV1@ bridge0
 check_device_connected bridge0 yes
 check_device_connected @KSTEST_NETDEV1@ yes
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE: in rhel 8 the ifcfg is generated in initramfs by Anaconda
     check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection master bridge0
     check_device_config_value bridge0_slave_1 BRIDGE bridge0 connection slave-type bridge

diff --git a/network-addr-gen-mode.ks.in b/network-addr-gen-mode.ks.in
@@ -56,7 +56,7 @@ check_gui_configurations @KSTEST_NETDEV1@ @KSTEST_NETDEV2@ @KSTEST_NETDEV3@ @KST
 check_device_config_value @KSTEST_NETDEV1@ IPV6_ADDR_GEN_MODE eui64 ipv6 addr-gen-mode eui64
 check_connection_setting "@KSTEST_NETDEV1@" ipv6.addr-gen-mode eui64
 check_device_config_value @KSTEST_NETDEV2@ IPV6_ADDR_GEN_MODE __NONE ipv6 addr-gen-mode eui64
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # In rhel8 ifcfg from kickstart is generated in initramfs
     check_connection_setting "System @KSTEST_NETDEV2@" ipv6.addr-gen-mode default-or-eui64
 else

diff --git a/network-autoconnections-dhcpall-httpks.ks.in b/network-autoconnections-dhcpall-httpks.ks.in
@@ -28,7 +28,7 @@ shutdown
 @KSINCLUDE@ scripts-lib.sh
 
 check_config_exists @KSTEST_NETDEV1@ no
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_config_exists @KSTEST_NETDEV2@ yes
 else
     check_config_exists @KSTEST_NETDEV2@ no
@@ -38,7 +38,7 @@ check_device_connected @KSTEST_NETDEV1@ yes
 check_device_connected @KSTEST_NETDEV2@ yes
 check_device_connected @KSTEST_NETDEV3@ yes
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_number_of_connections 2
 else
     # includes "lo" connection
@@ -47,7 +47,7 @@ fi
 
 check_connection_device "Wired Connection" @KSTEST_NETDEV1@
 check_connection_device "Wired Connection" @KSTEST_NETDEV2@
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_connection_device "System @KSTEST_NETDEV2@"
 fi
 check_connection_device "Wired Connection" @KSTEST_NETDEV3@
@@ -89,7 +89,7 @@ check_device_connected @KSTEST_NETDEV3@ yes
 check_connection_device "Wired Connection" @KSTEST_NETDEV2@
 check_connection_device @KSTEST_NETDEV2@
 
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_number_of_connections 4
 else
     # includes "lo" connection

diff --git a/network-autoconnections-httpks.ks.in b/network-autoconnections-httpks.ks.in
@@ -31,7 +31,7 @@ shutdown
 # check_config_exists @KSTEST_NETDEV1@ yes
 check_config_exists @KSTEST_NETDEV1@ no
 # In RHEL8 ifcfg files are created from kickstart already in initramfs
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_config_exists @KSTEST_NETDEV2@ yes
 else
     check_config_exists @KSTEST_NETDEV2@ no
@@ -40,7 +40,7 @@ check_config_exists @KSTEST_NETDEV3@ no
 
 check_device_connected @KSTEST_NETDEV1@ yes
 check_connection_device @KSTEST_NETDEV1@ @KSTEST_NETDEV1@
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     check_connection_device "System @KSTEST_NETDEV2@"
 fi
 
@@ -53,7 +53,7 @@ check_connection_setting "@KSTEST_NETDEV1@" 802-3-ethernet.mac-address --
 detect_nm_has_autoconnections_off
 nm_has_autoconnections_off=$?
 if [[ $nm_has_autoconnections_off -eq 0 ]]; then
-    if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+    if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
         check_number_of_connections 2
     else
         # includes "lo" connection
@@ -103,7 +103,7 @@ detect_nm_has_autoconnections_off
 nm_has_autoconnections_off=$?
 if [[ $nm_has_autoconnections_off -eq 0 ]]; then
     check_device_config_value @KSTEST_NETDEV3@ ONBOOT no connection autoconnect false
-    if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+    if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
         check_number_of_connections 3
     else
         # includes "lo" connection

diff --git a/network-device-mac.ks.in b/network-device-mac.ks.in
@@ -30,7 +30,7 @@ shutdown
 # discoverable in sysfs yet so it picks its own name ksdevX and uses infname= to
 # name the device which results in binding also to HWADDR (because of ifname=
 # being used).
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     # RHEL-8-FAILURE mac binding for ifname= is not applied when updating connection,
     # fixed upstream in commit a5cb6311e22587b539248bd5d2a227d08c0bb581
     check_device_config_value ksdev0 HWADDR __NONE ethernet mac-address __NONE

diff --git a/repo-install.ks.in b/repo-install.ks.in
@@ -17,8 +17,8 @@ repo --name=test05 --baseurl=EMPTY_REPO_URL --includepkgs=p1,p2 --excludepkgs=p3
 @KSINCLUDE@ scripts-lib.sh
 
 # Define patterns for repo options.
-if [ $(is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ] || \
-   [ $(is_rhel9 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@) == "yes" ]; then
+if is_rhel8 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ || \
+   is_rhel9 @KSTEST_OS_NAME@ @KSTEST_OS_VERSION@ ; then
     cost='^cost=25$'
     sslverify='^sslverify=0$'
     includepkgs='^includepkgs=p1,p2$'

diff --git a/scripts-lib.sh b/scripts-lib.sh
@@ -2,26 +2,24 @@
 
 # is_rhel8 KSTESTS_OS_NAME KSTESTS_OS_VERSION
 # Are we testing rhel 8 (based on the name and version detected from boot.iso) ?
-# Returns "yes" or "no".
 function is_rhel8 {
    local os_name=$1
    local os_version=$2
    if [ ${os_name} == "rhel" ] && [ ${os_version:0:1} == "8" ] ; then
-       echo "yes"
+       return 0
    else
-       echo "no"
+       return 1
    fi
 }
 
 # is_rhel9 KSTESTS_OS_NAME KSTESTS_OS_VERSION
 # Are we testing rhel 9 (based on the name and version detected from boot.iso) ?
-# Returns "yes" or "no".
 function is_rhel9 {
    local os_name=$1
    local os_version=$2
    if [ ${os_name} == "rhel" ] && [ ${os_version:0:1} == "9" ] ; then
-       echo "yes"
+       return 0
    else
-       echo "no"
+       return 1
    fi
 }