Merge pull request #545 from varshab1210/data-repopulate

Re-write timeout strategy for test 1-035_validate_argocd_secret_repopulate
redhat-developer · Jul 27, 2023 · e3dbee6 · e3dbee6
2 parents 9f471f3 + 76250ca
commit e3dbee6
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 13 deletions.
diff --git a/...-tests/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml b/...-tests/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml
diff --git a/...e_argocd_secret_repopulate/01-assert.yaml → ...e_argocd_secret_repopulate/01-assert.yaml b/...e_argocd_secret_repopulate/01-assert.yaml → ...e_argocd_secret_repopulate/01-assert.yaml
diff --git a/...ret_repopulate/02-remove_secret_data.yaml → ...ret_repopulate/02-remove_secret_data.yaml b/...ret_repopulate/02-remove_secret_data.yaml → ...ret_repopulate/02-remove_secret_data.yaml
diff --git a/...ft/e2e/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml b/...ft/e2e/sequential/1-035_validate_argocd_secret_repopulate/03-check_secret_repopulate.yaml
@@ -0,0 +1,21 @@
+# Check if the argocd-secret was repopulated
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+- script: |
+    until [[ $i -eq 20 ]]
+    do
+      secret_data=$(oc get secret/argocd-secret -n openshift-gitops -o custom-columns=SECRET:.data --no-headers)
+      echo -e "Secret: $secret_data\n"
+      if [[ $secret_data == "<none>" ]]
+      then
+        i=$((i+1))
+        sleep 6
+      else
+        echo "argocd-secret was repopulated"    
+        exit 0
+      fi
+    done
+
+    echo "argocd-secret was not repopulated"
+    exit 1
diff --git a/...ulate/04-check_controller_pod_status.yaml → ...ulate/04-check_controller_pod_status.yaml b/...ulate/04-check_controller_pod_status.yaml → ...ulate/04-check_controller_pod_status.yaml
diff --git a/...cd_secret_repopulate/05-argocd_login.yaml → ...cd_secret_repopulate/05-argocd_login.yaml b/...cd_secret_repopulate/05-argocd_login.yaml → ...cd_secret_repopulate/05-argocd_login.yaml