test: Update test using ClientConfig

Signed-off-by: Viet Nguyen Duc <[email protected]>

Author: VietND96

tests/SeleniumTests/__init__.py

@@ -18,6 +18,7 @@
 SELENIUM_GRID_PORT = os.environ.get('SELENIUM_GRID_PORT', '4444')
 SELENIUM_GRID_USERNAME = os.environ.get('SELENIUM_GRID_USERNAME', None)
 SELENIUM_GRID_PASSWORD = os.environ.get('SELENIUM_GRID_PASSWORD', None)
+CHART_CERT_PATH = os.environ.get('CHART_CERT_PATH', None)
 SELENIUM_GRID_TEST_HEADLESS = os.environ.get('SELENIUM_GRID_TEST_HEADLESS', 'false').lower() == 'true'
 SELENIUM_ENABLE_MANAGED_DOWNLOADS = os.environ.get('SELENIUM_ENABLE_MANAGED_DOWNLOADS', 'true').lower() == 'true'
 WEB_DRIVER_WAIT_TIMEOUT = int(os.environ.get('WEB_DRIVER_WAIT_TIMEOUT', 60))
@@ -37,7 +38,8 @@
     keep_alive=True,
     timeout=3600,
     username=SELENIUM_GRID_USERNAME,
-    password=SELENIUM_GRID_PASSWORD
+    password=SELENIUM_GRID_PASSWORD,
+    ca_certs=CHART_CERT_PATH,
 )
 
 if TEST_NODE_RELAY == 'Android':
@@ -167,7 +169,7 @@ def setUp(self):
             start_time = time.time()
             self.driver = webdriver.Remote(
                 options=options,
-                command_executor="%s://%s:%s" % (SELENIUM_GRID_PROTOCOL,SELENIUM_GRID_HOST,SELENIUM_GRID_PORT),
+                command_executor=SELENIUM_GRID_URL,
                 client_config=CLIENT_CONFIG
             )
             end_time = time.time()
@@ -196,7 +198,7 @@ def setUp(self):
             start_time = time.time()
             self.driver = webdriver.Remote(
                 options=options,
-                command_executor="%s://%s:%s" % (SELENIUM_GRID_PROTOCOL,SELENIUM_GRID_HOST,SELENIUM_GRID_PORT),
+                command_executor=SELENIUM_GRID_URL,
                 client_config=CLIENT_CONFIG
             )
             end_time = time.time()
@@ -230,7 +232,7 @@ def setUp(self):
             start_time = time.time()
             self.driver = webdriver.Remote(
                 options=options,
-                command_executor="%s://%s:%s" % (SELENIUM_GRID_PROTOCOL,SELENIUM_GRID_HOST,SELENIUM_GRID_PORT),
+                command_executor=SELENIUM_GRID_URL,
                 client_config=CLIENT_CONFIG
             )
             end_time = time.time()

tests/bootstrap.sh

@@ -16,10 +16,6 @@ fi
 
 python3 -m pip install docker requests chardet | grep -v 'Requirement already satisfied'
 
-if [ "${SELENIUM_GRID_PROTOCOL}" = "https" ]; then
-  export REQUESTS_CA_BUNDLE="${CHART_CERT_PATH}"
-fi
-
 python3 test.py $1
 ret_code=$?
 

tests/charts/make/chart_test.sh

@@ -67,11 +67,9 @@ cleanup() {
     echo "Logs for pod $pod"
     kubectl logs -n ${SELENIUM_NAMESPACE} $pod --all-containers > tests/tests/pod_logs_${pod}.txt
   done
-  if [ "${SKIP_CLEANUP}" = "false" ]; then
+  if [ "${SKIP_CLEANUP}" = "false" ] || [ "${CI:-false}" = "true" ]; then
     echo "Clean up chart release and namespace"
     helm delete ${RELEASE_NAME} --namespace ${SELENIUM_NAMESPACE} --wait
-    kubectl patch ns ${SELENIUM_NAMESPACE} -p '{"metadata":{"finalizers":null}}'
-    kubectl delete namespace ${SELENIUM_NAMESPACE} --wait=false
   fi
 }
 
@@ -251,8 +249,6 @@ if [ "${SECURE_INGRESS_ONLY_GENERATE}" = "true" ] && [ "${RENDER_HELM_TEMPLATE_O
   --set tls.ingress.defaultSANList[0]=${SELENIUM_GRID_HOST} \
   --set tls.ingress.defaultIPList[0]=$(hostname -I | awk '{print $1}') \
   "
-  kubectl get secret ${SELENIUM_TLS_SECRET_NAME} -n ${SELENIUM_NAMESPACE} -o jsonpath="{.data.tls\.crt}" | base64 -d > ./tests/tests/tls.crt
-  CHART_CERT_PATH="./tests/tests/tls.crt"
 fi
 
 if [ "${SECURE_INGRESS_ONLY_DEFAULT}" = "true" ]; then
@@ -280,13 +276,14 @@ if [ "${SECURE_USE_EXTERNAL_CERT}" = "true" ] && [ "${RENDER_HELM_TEMPLATE_ONLY}
   --set ingress.nginx.sslSecret="${SELENIUM_NAMESPACE}/${EXTERNAL_TLS_SECRET_NAME}" \
   "
   cert_dir="./tests/tests"
-  ADD_IP_ADDRESS=hostname ./${CHART_PATH}/certs/gen-cert-helper.sh -d ${cert_dir}
-  kubectl delete secret -n ${SELENIUM_NAMESPACE} ${EXTERNAL_TLS_SECRET_NAME} --ignore-not-found=true
-  kubectl create secret generic -n ${SELENIUM_NAMESPACE} ${EXTERNAL_TLS_SECRET_NAME} \
-  --from-file=tls.crt=${cert_dir}/tls.crt \
-  --from-file=tls.key=${cert_dir}/tls.key \
-  --from-file=server.jks=${cert_dir}/server.jks \
-  --from-file=server.pass=${cert_dir}/server.pass
+  if [ ! -f "./tests/tests/tls.crt" ]; then
+    ADD_IP_ADDRESS=hostname ./${CHART_PATH}/certs/gen-cert-helper.sh -d ${cert_dir}
+    kubectl create secret generic -n ${SELENIUM_NAMESPACE} ${EXTERNAL_TLS_SECRET_NAME} \
+    --from-file=tls.crt=${cert_dir}/tls.crt \
+    --from-file=tls.key=${cert_dir}/tls.key \
+    --from-file=server.jks=${cert_dir}/server.jks \
+    --from-file=server.pass=${cert_dir}/server.pass
+  fi
   CHART_CERT_PATH="./tests/tests/tls.crt"
 fi
 
@@ -408,7 +405,7 @@ if [ "${TEST_UPGRADE_CHART}" = "true" ]; then
   exit 0
 fi
 
-if [ "${SECURE_INGRESS_ONLY_GENERATE}" = "true" ]; then
+if [ "${SECURE_INGRESS_ONLY_GENERATE}" = "true" ] && [ "${RENDER_HELM_TEMPLATE_ONLY}" != "true" ]; then
   kubectl get secret ${SELENIUM_TLS_SECRET_NAME} -n ${SELENIUM_NAMESPACE} -o jsonpath="{.data.tls\.crt}" | base64 -d > ./tests/tests/tls.crt
   CHART_CERT_PATH="./tests/tests/tls.crt"
 fi