Skip to content

Commit 1d639fd

Browse files
committed
[tests] fix tests and add retry for monitoring hr tests
Signed-off-by: kklinch0 <[email protected]>
1 parent fa7c98b commit 1d639fd

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

‎hack/e2e.sh‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,12 @@ kubectl patch -n tenant-root tenants.apps.cozystack.io root --type=merge -p '{"s
318318
timeout 60 sh -c 'until kubectl get hr -n tenant-root etcd ingress monitoring tenant-root; do sleep 1; done'
319319

320320
# Wait for HelmReleases be installed
321-
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr etcd ingress monitoring tenant-root
321+
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr etcd ingress tenant-root
322+
323+
if ! kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr monitoring; then
324+
flux reconcile hr monitoring -n tenant-root --force
325+
kubectl wait --timeout=2m --for=condition=ready -n tenant-root hr monitoring
326+
fi
322327

323328
kubectl patch -n tenant-root ingresses.apps.cozystack.io ingress --type=merge -p '{"spec":{
324329
"dashboard": true
@@ -333,7 +338,7 @@ kubectl wait --timeout=5m --for=jsonpath=.status.readyReplicas=3 -n tenant-root
333338

334339
# Wait for Victoria metrics
335340
kubectl wait --timeout=5m --for=jsonpath=.status.updateStatus=operational -n tenant-root vmalert/vmalert-shortterm vmalertmanager/alertmanager
336-
kubectl wait --timeout=5m --for=jsonpath=.status.status=operational -n tenant-root vlogs/generic
341+
kubectl wait --timeout=5m --for=jsonpath=.status.updateStatus=operational -n tenant-root vlogs/generic
337342
kubectl wait --timeout=5m --for=jsonpath=.status.clusterStatus=operational -n tenant-root vmcluster/shortterm vmcluster/longterm
338343

339344
# Wait for grafana

‎packages/core/testing/images/e2e-sandbox/Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,4 @@ RUN curl -LO "https://dl.k8s.io/release/v${KUBECTL_VERSION}/bin/linux/amd64/kube
1414
&& mv kubectl /usr/local/bin/kubectl
1515
RUN curl -sSL https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash -s - --version "v${HELM_VERSION}"
1616
RUN wget https://github.com/mikefarah/yq/releases/download/v4.44.3/yq_linux_amd64 -O /usr/local/bin/yq && chmod +x /usr/local/bin/yq
17+
RUN curl -s https://fluxcd.io/install.sh | bash

‎packages/extra/monitoring/templates/vlogs/vlogs.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ kind: VLogs
44
metadata:
55
name: {{ .name }}
66
spec:
7+
image:
8+
tag: v1.17.0-victorialogs
79
storage:
810
resources:
911
requests:

0 commit comments

Comments
 (0)