Merge pull request #4946 from agullon/patch-12

[release-4.19] USHIFT-5775: TLS config RF test: skip cipher if not available

Author: openshift-merge-bot[bot]

test/suites/standard2/configuration.robot

@@ -280,15 +280,20 @@ CSI Snapshot Controller Is Deployed
 
 Openssl Connect Command
     [Documentation]    Run Openssl Connect Command in the remote server
-    [Arguments]    ${host_and_port}    ${args}
+    [Arguments]    ${host_and_port}    ${args}    ${expected_rc}    ${expected_str}
     ${stdout}    ${rc}=    Execute Command
     ...    openssl s_client -connect ${host_and_port} ${args} <<< "Q"
     ...    sudo=True    return_stdout=True    return_stderr=False    return_rc=True
-    RETURN    ${stdout}    ${rc}
+    Should Be Equal As Integers    ${rc}    ${expected_rc}
+    IF    "${rc}" == "0"    Should Contain    ${stdout}    ${expected_str}
 
 Check TLS Endpoints
     [Documentation]    Run Openssl Connect Command to check k8s internal endpoints
     [Arguments]    ${return_code}    ${tls_version}    ${cipher}
+
+    ${cipher_available}=    Is Cipher Available    ${cipher}
+    IF    ${cipher_available} == ${FALSE}    RETURN
+
     IF    "${tls_version}" == "TLSv1.2"
         Set Test Variable    ${TLS_AND_CIPHER_ARGS}    -tls1_2 -cipher ${cipher}
     ELSE IF    "${tls_version}" == "TLSv1.3"
@@ -297,15 +302,25 @@ Check TLS Endpoints
 
     # api server, kubelet, kube controller manager and kube scheduler endpoint ports
     FOR    ${port}    IN    6443    10250    10257    10259
-        ${stdout}    ${rc}=    Openssl Connect Command    ${USHIFT_HOST}:${port}    ${TLS_AND_CIPHER_ARGS}
-        Should Be Equal As Integers    ${return_code}    ${rc}
-        IF    "${rc}" == "0"
-            Should Contain    ${stdout}    ${tls_version}, Cipher is ${cipher}
-        END
+        ${stdout}=    Wait Until Keyword Succeeds    10x    10s
+        ...    Openssl Connect Command    localhost:${port}
+        ...        ${TLS_AND_CIPHER_ARGS}
+        ...        ${return_code}
+        ...        ${tls_version}, Cipher is ${cipher}
     END
 
     # etcd endpoint, need to use cert and key because etcd requires mTLS
     Set Test Variable    ${CERT_ARG}    -cert ${APISERVER_ETCD_CLIENT_CERT}/client.crt
     Set Test Variable    ${KEY_ARG}    -key ${APISERVER_ETCD_CLIENT_CERT}/client.key
-    ${stdout}    ${rc}=    Openssl Connect Command    localhost:2379    ${TLS_AND_CIPHER_ARGS} ${CERT_ARG} ${KEY_ARG}
-    Should Be Equal As Integers    ${return_code}    ${rc}
+    Wait Until Keyword Succeeds    10x    2s
+    ...    Openssl Connect Command    localhost:2379
+    ...        ${TLS_AND_CIPHER_ARGS} ${CERT_ARG} ${KEY_ARG}
+    ...        ${return_code}
+    ...        CONNECTED
+
+Is Cipher Available
+    [Documentation]    Check if openssl keywork is available from ssl list
+    [Arguments]    ${cipher}
+    ${stdout}    ${stderr}    ${rc}=    Execute Command    openssl ciphers ${cipher}
+    ...    sudo=True    return_stdout=True    return_stderr=True    return_rc=True
+    IF    "${rc}" == "0"    RETURN    ${TRUE}    ELSE    RETURN    ${FALSE}