Skip to content

Commit 43dfd29

Browse files
committed
kuttl rerun fix
Signed-off-by: Raghavi Shirur <rshirur@redhat.com>
1 parent 3ed2801 commit 43dfd29

File tree

2 files changed

+26
-19
lines changed

2 files changed

+26
-19
lines changed

test/openshift/e2e/sequential/1-105_validate_label_selector/01-add-label-selector.yaml

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,22 @@ apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
33
commands:
44
# patches the subscription to add label selector in argocd-operator
5+
56
- script: |
6-
if ! [ -z $NON_OLM ]; then
77
oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager
8+
- script: sleep 30
9+
# - script: |
10+
# if ! [ -z $NON_OLM ]; then
11+
# oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR=foo=bar -c manager
812

9-
elif [ -z $CI ]; then
13+
# elif [ -z $CI ]; then
1014

11-
oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
12-
--type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
15+
# oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
16+
# --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
1317

14-
else
18+
# else
1519

16-
oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
17-
--type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
18-
fi
19-
- script: sleep 120
20+
# oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
21+
# --type merge --patch '{"spec": {"config": {"env": [{"name": "ARGOCD_LABEL_SELECTOR", "value": "foo=bar"}]}}}'
22+
# fi
23+
# - script: sleep 120

test/openshift/e2e/sequential/1-105_validate_label_selector/07-remove-label-selector.yaml

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ kind: TestStep
33
commands:
44
# patches the subscription to remove label-selector from argocd-operator
55
- script: |
6-
if ! [ -z $NON_OLM ]; then
7-
86
oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager
7+
- script: sleep 30
8+
# - script: |
9+
# if ! [ -z $NON_OLM ]; then
10+
11+
# oc set env deployment openshift-gitops-operator-controller-manager -n openshift-gitops-operator ARGOCD_LABEL_SELECTOR- -c manager
912

10-
elif [ -z $CI ]; then
13+
# elif [ -z $CI ]; then
1114

12-
oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
13-
--type json --patch '[{"op": "remove", "path": "/spec/config"}]'
14-
else
15+
# oc patch -n openshift-gitops-operator subscription openshift-gitops-operator \
16+
# --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
17+
# else
1518

16-
oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
17-
--type json --patch '[{"op": "remove", "path": "/spec/config"}]'
18-
fi
19-
- script: sleep 120
19+
# oc patch -n openshift-gitops-operator subscription `subscription=gitops-operator- && oc get subscription --all-namespaces | grep $subscription | head -1 | awk '{print $2}'` \
20+
# --type json --patch '[{"op": "remove", "path": "/spec/config"}]'
21+
# fi
22+
# - script: sleep 120

0 commit comments

Comments
 (0)