Skip to content

Fix failing of 1-040_validate_quoted_RBAC_group_names test #801

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jgwest merged 1 commit into from
Nov 5, 2024
Merged

Fix failing of 1-040_validate_quoted_RBAC_group_names test #801

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion test/openshift/e2e/sequential/1-034_validate_custom_roles/06-revert-patch.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,19 @@ commands:
else
oc patch subscription/openshift-gitops-operator -n openshift-gitops-operator --type json --patch='[ { "op": "remove", "path": "/spec/config" } ]'
fi
- script: sleep 10
- script: |
# Loop to wait until SERVER_CLUSTER_ROLE is removed from the Argo CD server Deployment
for i in {1..30}; do
if oc get deployment openshift-gitops-argocd-server -n openshift-gitops -o jsonpath='{.spec.template.spec.containers[0].env}' | grep -q 'SERVER_CLUSTER_ROLE=custom-argocd-role'; then
echo "Waiting for SERVER_CLUSTER_ROLE to be removed..."
sleep 5
else
echo "SERVER_CLUSTER_ROLE has been removed."
break
fi
done
# If after the loop the variable is still set, fail the step
if oc get deployment openshift-gitops-argocd-server -n openshift-gitops -o jsonpath='{.spec.template.spec.containers[0].env}' | grep -q 'SERVER_CLUSTER_ROLE=custom-argocd-role'; then
echo "ERROR: SERVER_CLUSTER_ROLE was not removed after waiting."
exit 1
fi