Merge pull request #617 from anandrkskd/test/hypershift

updating tests to work with mac

Author: iam-veeramalla

scripts/e2e-common.sh

@@ -25,14 +25,14 @@ function unexpectedError() {
   echo "Unexpected error occured!!"
   failed=1
 
-  (( failed )) && fail_test
+  ((failed)) && fail_test
   success
-} 
+}
 
 function make_banner() {
-    local msg="$1$1$1$1 $2 $1$1$1$1"
-    local border="${msg//[-0-9A-Za-z _.,\/()]/$1}"
-    echo -e "${border}\n${msg}\n${border}"
+  local msg="$1$1$1$1 $2 $1$1$1$1"
+  local border="${msg//[-0-9A-Za-z _.,\/()]/$1}"
+  echo -e "${border}\n${msg}\n${border}"
 }
 
 # Simple header for logging purposes.
@@ -43,22 +43,26 @@ function header() {
 
 function wait_until_pods_running() {
   echo -n "Waiting until all pods in namespace $1 are up"
-  for i in {1..150}; do  # timeout after 5 minutes
+  for i in {1..150}; do # timeout after 5 minutes
     local pods="$(oc get pods --no-headers -n $1 2>/dev/null)"
+    # write it to tempfile
+    TempFile=$(mktemp)
+    oc get pods --no-headers -n $1 2>/dev/null >$TempFile
+
     # All pods must be running
     local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l)
     if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then
       local all_ready=1
-      while read pod ; do
-        local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)
+      while read pod; do
+        local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' '))
         # All containers must be ready
         [[ -z ${status[0]} ]] && all_ready=0 && break
         [[ -z ${status[1]} ]] && all_ready=0 && break
         [[ ${status[0]} -lt 1 ]] && all_ready=0 && break
         [[ ${status[1]} -lt 1 ]] && all_ready=0 && break
         [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break
-      done <<< $(echo "${pods}" | grep -v Completed)
-      if (( all_ready )); then
+      done <${TempFile}
+      if ((all_ready)); then
         echo -e "\nAll pods are up:\n${pods}"
         return 0
       fi
@@ -79,8 +83,8 @@ function wait_until_object_exist() {
     DESCRIPTION="$1 $3/$2"
   fi
   echo -n "Waiting until ${DESCRIPTION} exist"
-  for i in {1..150}; do  # timeout after 5 minutes
-    if oc ${oc_ARGS} > /dev/null 2>&1; then
+  for i in {1..150}; do # timeout after 5 minutes
+    if oc ${oc_ARGS} >/dev/null 2>&1; then
       echo -e "\n${DESCRIPTION} exist"
       return 0
     fi
@@ -101,8 +105,8 @@ function wait_until_object_doesnt_exist() {
     DESCRIPTION="$1 $3/$2"
   fi
   echo -n "Waiting until ${DESCRIPTION} doesn't exist"
-  for i in {1..150}; do  # timeout after 5 minutes
-    if ! kubectl ${KUBECTL_ARGS} > /dev/null 2>&1; then
+  for i in {1..150}; do # timeout after 5 minutes
+    if ! kubectl ${KUBECTL_ARGS} >/dev/null 2>&1; then
       echo -e "\n${DESCRIPTION} dosen't exist"
       return 0
     fi
@@ -137,7 +141,6 @@ function dump_extra_cluster_state() {
   kubectl -n openshift-gitops-operator logs $(get_app_pod argocd-operator openshift-gitops-operator) --all-containers=true
 }
 
-
 # Returns the name of the first pod of the given app.
 # Parameters: $1 - app name.
 #             $2 - namespace (optional).
@@ -161,7 +164,6 @@ function fail_test() {
   exit 1
 }
 
-
 function set_test_return_code() {
   echo -n "$1"
 }
@@ -176,13 +178,13 @@ function success() {
   exit 0
 }
 
-function build_and_push_catalog_image(){
-  
+function build_and_push_catalog_image() {
+
   if [ "$E2E_SKIP_BUILD_TOOL_INSTALLATION" = false ]; then
-     echo ">> Install operator-sdk & opm"
-     make operator-sdk opm
+    echo ">> Install operator-sdk & opm"
+    make operator-sdk opm
   else
-     echo ">> skipping operator-sdk & olm installation"   
+    echo ">> skipping operator-sdk & olm installation"
   fi
 
   echo ">> Building and pushing operator images"
@@ -199,15 +201,15 @@ function build_and_push_catalog_image(){
 
 }
 
-function configure_operator(){
+function configure_operator() {
   header "Configuring OpenShift Gitops operator"
 
   echo -e "Disabling default catalog sources"
   kubectl patch operatorhub.config.openshift.io/cluster -p='{"spec":{"disableAllDefaultSources":true}}' --type=merge
   sleep 5
 
   # echo -e "Copying artifacts [catalog source, image content source policy, mapping.txt]..."
-  cat <<EOF > $TMP_DIR/catalog-source.yaml
+  cat <<EOF >$TMP_DIR/catalog-source.yaml
 apiVersion: operators.coreos.com/v1alpha1
 kind: CatalogSource
 metadata:
@@ -222,18 +224,17 @@ spec:
       interval: 30m
 EOF
 
-
   echo -e "Creating custom catalog source"
   kubectl apply -f $TMP_DIR/catalog-source.yaml
 
   echo "Waiting for pods in namespace openshift-marketplace to be ready"
   # filtering out old catalog source pod that will be removed shortly
-  pods=$(kubectl get pods -n openshift-marketplace --sort-by={metadata.creationTimestamp} -o name | \
-  grep gitops-operator | tail -1)
+  pods=$(kubectl get pods -n openshift-marketplace --sort-by={metadata.creationTimestamp} -o name |
+    grep gitops-operator | tail -1)
 
   for pod in ${pods}; do
-      echo "Waiting for pod $pod in openshift-marketplace to be in ready state"
-      kubectl wait --for=condition=Ready -n openshift-marketplace $pod --timeout=5m
+    echo "Waiting for pod $pod in openshift-marketplace to be in ready state"
+    kubectl wait --for=condition=Ready -n openshift-marketplace $pod --timeout=5m
   done
 }
 
@@ -251,29 +252,29 @@ function uninstall_operator_resources() {
     oc wait --for=delete $deployment -n openshift-gitops --timeout=5m || fail_test "Failed to delete deployment: $deployment in openshift-gitops namespace"
   done
 
-  oc delete $(oc get csv  -n openshift-gitops-operator -o name|grep gitops) -n openshift-gitops-operator || fail_test "Unable to delete CSV"
+  oc delete $(oc get csv -n openshift-gitops-operator -o name | grep gitops) -n openshift-gitops-operator || fail_test "Unable to delete CSV"
 
   oc delete -n openshift-gitops-operator installplan $(oc get subscription gitops-operator -n openshift-gitops-operator -o jsonpath='{.status.installplan.name}') || fail_test "Unable to delete installplan"
 
   oc delete subscription gitops-operator -n openshift-gitops-operator --cascade=background || fail_test "Unable to delete subscription"
 
   echo -e ">> Delete arogo resources accross all namespaces"
   for res in applications applicationsets appprojects argocds; do
-      oc delete --ignore-not-found=true ${res}.argoproj.io --all 
+    oc delete --ignore-not-found=true ${res}.argoproj.io --all
   done
 
   echo -e ">> Cleanup existing crds"
   for res in applications applicationsets appprojects argocds; do
-      oc delete --ignore-not-found=true crds ${res}.argoproj.io 
+    oc delete --ignore-not-found=true crds ${res}.argoproj.io
   done
 
   echo -e ">> Delete \"openshift-gitops\" project"
   oc delete --ignore-not-found=true project openshift-gitops
 }
 
 function install_operator_resources() {
-    echo -e ">>Ensure Gitops subscription exists"
-    oc get subscription gitops-operator -n openshift-gitops-operator 2>/dev/null || \
+  echo -e ">>Ensure Gitops subscription exists"
+  oc get subscription gitops-operator -n openshift-gitops-operator 2>/dev/null ||
     cat <<EOF | oc apply -f -
 apiVersion: operators.coreos.com/v1alpha1
 kind: Subscription
@@ -287,24 +288,23 @@ spec:
   source: $CATALOG_SOURCE
   sourceNamespace: openshift-marketplace
 EOF
-    
-    wait_until_pods_running "openshift-gitops-operator" || fail_test "openshift gitops Operator controller did not come up"
 
-    echo ">> Wait for GitopsService creation"
-    wait_until_object_exist "gitopsservices.pipelines.openshift.io" "cluster" "openshift-gitops" || fail_test "gitops service haven't created yet"
+  wait_until_pods_running "openshift-gitops-operator" || fail_test "openshift gitops Operator controller did not come up"
+
+  echo ">> Wait for GitopsService creation"
+  wait_until_object_exist "gitopsservices.pipelines.openshift.io" "cluster" "openshift-gitops" || fail_test "gitops service haven't created yet"
 
-    wait_until_pods_running "openshift-gitops" || fail_test "argocd controller did not come up"
+  wait_until_pods_running "openshift-gitops" || fail_test "argocd controller did not come up"
 
-    
-    #Make sure that everything is cleaned up in the current namespace.
-    for res in applications applicationsets appprojects appprojects; do
-        oc delete --ignore-not-found=true ${res}.argoproj.io --all
-    done
+  #Make sure that everything is cleaned up in the current namespace.
+  for res in applications applicationsets appprojects appprojects; do
+    oc delete --ignore-not-found=true ${res}.argoproj.io --all
+  done
 }
 
 function get_operator_namespace() {
   # TODO: parameterize namespace, operator can run in a namespace different from the namespace where tektonpipelines is installed
   local operator_namespace="argocd-operator"
   [[ "${TARGET}" == "openshift" ]] && operator_namespace="openshift-gitops"
   echo ${operator_namespace}
-}
+}

test/openshift/e2e/ignore-tests/sequential/1-064_validate_tcp_reset_error/03-wait.yaml

@@ -5,22 +5,26 @@ commands:
 - script: |
     function wait_until_pods_running() {
       echo -n "Waiting until all pods in namespace $1 are up"
-      for i in {1..150}; do  # timeout after 5 minutes
+      for i in {1..150}; do # timeout after 5 minutes
         local pods="$(oc get pods --no-headers -n $1 2>/dev/null)"
+        # write it to tempfile
+        TempFile=$(mktemp)
+        oc get pods --no-headers -n $1 2>/dev/null >$TempFile
+
         # All pods must be running
         local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l)
         if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then
           local all_ready=1
-          while read pod ; do
-            local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)
+          while read pod; do
+            local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' '))
             # All containers must be ready
             [[ -z ${status[0]} ]] && all_ready=0 && break
             [[ -z ${status[1]} ]] && all_ready=0 && break
             [[ ${status[0]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[1]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break
-          done <<< $(echo "${pods}" | grep -v Completed)
-          if (( all_ready )); then
+          done <${TempFile}
+          if ((all_ready)); then
             echo -e "\nAll pods are up:\n${pods}"
             return 0
           fi

test/openshift/e2e/parallel/1-008_validate-custom-argocd-namespace/02-wait.yaml

@@ -5,22 +5,26 @@ commands:
 - script: |
     function wait_until_pods_running() {
       echo -n "Waiting until all pods in namespace $1 are up"
-      for i in {1..150}; do  # timeout after 5 minutes
+      for i in {1..150}; do # timeout after 5 minutes
         local pods="$(oc get pods --no-headers -n $1 2>/dev/null)"
+        # write it to tempfile
+        TempFile=$(mktemp)
+        oc get pods --no-headers -n $1 2>/dev/null >$TempFile
+
         # All pods must be running
         local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l)
         if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then
           local all_ready=1
-          while read pod ; do
-            local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)
+          while read pod; do
+            local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' '))
             # All containers must be ready
             [[ -z ${status[0]} ]] && all_ready=0 && break
             [[ -z ${status[1]} ]] && all_ready=0 && break
             [[ ${status[0]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[1]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break
-          done <<< $(echo "${pods}" | grep -v Completed)
-          if (( all_ready )); then
+          done <${TempFile}
+          if ((all_ready)); then
             echo -e "\nAll pods are up:\n${pods}"
             return 0
           fi

test/openshift/e2e/parallel/1-025-validate-managed-by-change/02-wait.yaml

@@ -4,22 +4,26 @@ commands:
 - script: |
     function wait_until_pods_running() {
       echo -n "Waiting until all pods in namespace $1 are up"
-      for i in {1..150}; do  # timeout after 5 minutes
+      for i in {1..150}; do # timeout after 5 minutes
         local pods="$(oc get pods --no-headers -n $1 2>/dev/null)"
+        # write it to tempfile
+        TempFile=$(mktemp)
+        oc get pods --no-headers -n $1 2>/dev/null >$TempFile
+
         # All pods must be running
         local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l)
         if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then
           local all_ready=1
-          while read pod ; do
-            local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)
+          while read pod; do
+            local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' '))
             # All containers must be ready
             [[ -z ${status[0]} ]] && all_ready=0 && break
             [[ -z ${status[1]} ]] && all_ready=0 && break
             [[ ${status[0]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[1]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break
-          done <<< $(echo "${pods}" | grep -v Completed)
-          if (( all_ready )); then
+          done <${TempFile}
+          if ((all_ready)); then
             echo -e "\nAll pods are up:\n${pods}"
             return 0
           fi
@@ -30,6 +34,6 @@ commands:
       echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}"
       return 1
     }
-    
+        
     wait_until_pods_running "test-1-25-argo1"
     wait_until_pods_running "test-1-25-argo2"

test/openshift/e2e/parallel/1-030_validate_reencrypt/02-wait.yaml

@@ -4,22 +4,26 @@ commands:
 - script: |
     function wait_until_pods_running() {
       echo -n "Waiting until all pods in namespace $1 are up"
-      for i in {1..150}; do  # timeout after 5 minutes
+      for i in {1..150}; do # timeout after 5 minutes
         local pods="$(oc get pods --no-headers -n $1 2>/dev/null)"
+        # write it to tempfile
+        TempFile=$(mktemp)
+        oc get pods --no-headers -n $1 2>/dev/null >$TempFile
+
         # All pods must be running
         local not_running=$(echo "${pods}" | grep -v Running | grep -v Completed | wc -l)
         if [[ -n "${pods}" && ${not_running} -eq 0 ]]; then
           local all_ready=1
-          while read pod ; do
-            local status=(`echo -n ${pod} | cut -f2 -d' ' | tr '/' ' '`)
+          while read pod; do
+            local status=($(echo ${pod} | cut -f2 -d' ' | tr '/' ' '))
             # All containers must be ready
             [[ -z ${status[0]} ]] && all_ready=0 && break
             [[ -z ${status[1]} ]] && all_ready=0 && break
             [[ ${status[0]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[1]} -lt 1 ]] && all_ready=0 && break
             [[ ${status[0]} -ne ${status[1]} ]] && all_ready=0 && break
-          done <<< $(echo "${pods}" | grep -v Completed)
-          if (( all_ready )); then
+          done <${TempFile}
+          if ((all_ready)); then
             echo -e "\nAll pods are up:\n${pods}"
             return 0
           fi
@@ -30,5 +34,5 @@ commands:
       echo -e "\n\nERROR: timeout waiting for pods to come up\n${pods}"
       return 1
     }
-    
+       
     wait_until_pods_running "test-1-30-argo1"

test/openshift/e2e/parallel/1-043_validate_log_level_format/03-check-loglevel.yaml

@@ -6,15 +6,15 @@ commands:
     set -e
     set -o pipefail
     for wl in deployment/argocd-server deployment/argocd-repo-server statefulset/argocd-application-controller; do
-      wlCommand=$(oc get -n $NAMESPACE $wl -o jsonpath='{.spec.template.spec.containers[0].command}'| jq -r '.[]' )
+      wlCommand=$(oc get -n $NAMESPACE $wl -o jsonpath='{.spec.template.spec.containers[0].command}')
       level="debug"
       format="json"
-      if ! echo "$wlCommand" | grep -qPz -- "--loglevel\\n$level(\$|\\n)"; then
+      if ! echo "$wlCommand" | grep -e "\"--loglevel\",\"${level}\""; then
         echo "logLevel was not set correctly for $wl"
         echo "CWD: $wlCommand"
         exit 1
       fi
-      if ! echo "$wlCommand" | grep -qPz -- "--logformat\\n$format(\$|\\n)"; then
+      if ! echo "$wlCommand" | grep -e "\"--logformat\",\"${format}\""; then
         echo "logFormat was not set correctly for $wl"
         echo "CWD: $wlCommand"
         exit 1

test/openshift/e2e/parallel/1-049_validate_parallelism_limit/02-check-deployment.yaml

@@ -5,8 +5,8 @@ commands:
     set -e
     set -o pipefail
     expected=10
-    wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}'| jq -r '.[]' )
-    if ! echo "$wlCommand" | grep -qPz -- "--kubectl-parallelism-limit\\n${expected}(\$|\\n)"; then
+    wlCommand=$(oc get -n $NAMESPACE statefulset/argocd-application-controller -o jsonpath='{.spec.template.spec.containers[0].command}')
+    if ! echo "$wlCommand" | grep -e "\"--kubectl-parallelism-limit\",\"${expected}\""; then
       echo "Incorrect or missing --kubectl-parallelism-limit detected."
       echo "$wlCommand"
       exit 1