diff --git a/hack/e2e-apps/bucket.bats b/hack/e2e-apps/bucket.bats index a4a349d71..9fd127ee9 100644 --- a/hack/e2e-apps/bucket.bats +++ b/hack/e2e-apps/bucket.bats @@ -19,7 +19,7 @@ spec: EOF # Wait for the bucket to be ready - kubectl -n tenant-test wait hr bucket-${name} --timeout=100s --for=condition=ready + kubectl -n tenant-test wait hr bucket-${name} --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io bucket-${name} >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait bucketclaims.objectstorage.k8s.io bucket-${name} --timeout=300s --for=jsonpath='{.status.bucketReady}' timeout 60 sh -ec "until kubectl -n tenant-test get bucketaccesses.objectstorage.k8s.io bucket-${name}-admin >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/clickhouse.bats b/hack/e2e-apps/clickhouse.bats index 733da0fff..72400867a 100644 --- a/hack/e2e-apps/clickhouse.bats +++ b/hack/e2e-apps/clickhouse.bats @@ -38,7 +38,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr clickhouse-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr clickhouse-$name --timeout=20s --for=condition=ready + kubectl -n tenant-test wait hr clickhouse-$name --timeout=5m --for=condition=ready timeout 180 sh -ec "until kubectl -n tenant-test get svc chendpoint-clickhouse-$name -o jsonpath='{.spec.ports[*].port}' | grep -q '8123 9000'; do sleep 10; done" timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait statefulset.apps/chi-clickhouse-$name-clickhouse-0-0 --timeout=120s --for=jsonpath='{.status.replicas}'=1 diff --git a/hack/e2e-apps/etcd.bats b/hack/e2e-apps/etcd.bats index abc290dbb..7dcfd73fa 100644 --- a/hack/e2e-apps/etcd.bats +++ b/hack/e2e-apps/etcd.bats @@ -26,7 +26,7 @@ dump_diagnostics() { # resource, so poll for existence first. wait_etcd_hr_ready() { timeout 60 sh -ec 'until kubectl -n tenant-test get hr/etcd >/dev/null 2>&1; do sleep 2; done' - kubectl -n tenant-test wait hr/etcd --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr/etcd --timeout=5m --for=condition=ready } @test "Create Etcd" { diff --git a/hack/e2e-apps/external-dns.bats b/hack/e2e-apps/external-dns.bats index 5775927f3..b1bc71a57 100644 --- a/hack/e2e-apps/external-dns.bats +++ b/hack/e2e-apps/external-dns.bats @@ -21,8 +21,8 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name} >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr ${name} --timeout=120s --for=condition=ready - kubectl -n tenant-test wait hr ${name}-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr ${name} --timeout=5m --for=condition=ready + kubectl -n tenant-test wait hr ${name}-system --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get deploy -l app.kubernetes.io/instance=${name}-system -o jsonpath='{.items[0].status.readyReplicas}' | grep -q '1'; do sleep 5; done" kubectl -n tenant-test delete externaldns.apps.cozystack.io ${name} @@ -46,8 +46,8 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr ${name} >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr ${name} --timeout=120s --for=condition=ready - kubectl -n tenant-test wait hr ${name}-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr ${name} --timeout=5m --for=condition=ready + kubectl -n tenant-test wait hr ${name}-system --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get deploy -l app.kubernetes.io/instance=${name}-system -o jsonpath='{.items[0].status.readyReplicas}' | grep -q '1'; do sleep 5; done" kubectl -n tenant-test delete externaldns.apps.cozystack.io ${name} diff --git a/hack/e2e-apps/harbor.bats b/hack/e2e-apps/harbor.bats index 290fef425..10ad3c95c 100644 --- a/hack/e2e-apps/harbor.bats +++ b/hack/e2e-apps/harbor.bats @@ -41,7 +41,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr $release >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr $release --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr $release --timeout=5m --for=condition=ready # Wait for COSI to provision bucket timeout 60 sh -ec "until kubectl -n tenant-test get bucketclaims.objectstorage.k8s.io $release-registry >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/kafka.bats b/hack/e2e-apps/kafka.bats index ef4d9187c..d0a8266b9 100644 --- a/hack/e2e-apps/kafka.bats +++ b/hack/e2e-apps/kafka.bats @@ -42,7 +42,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr kafka-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr kafka-$name --timeout=30s --for=condition=ready + kubectl -n tenant-test wait hr kafka-$name --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get kafkas $name >/dev/null 2>&1; do sleep 2; done" kubectl wait kafkas -n tenant-test $name --timeout=300s --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0; do sleep 10; done" diff --git a/hack/e2e-apps/mariadb.bats b/hack/e2e-apps/mariadb.bats index 35559216e..0c1e3a5e8 100644 --- a/hack/e2e-apps/mariadb.bats +++ b/hack/e2e-apps/mariadb.bats @@ -38,7 +38,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr mariadb-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr mariadb-$name --timeout=30s --for=condition=ready + kubectl -n tenant-test wait hr mariadb-$name --timeout=5m --for=condition=ready timeout 80 sh -ec "until kubectl -n tenant-test get svc mariadb-$name -o jsonpath='{.spec.ports[0].port}' | grep -q '3306'; do sleep 10; done" timeout 80 sh -ec "until kubectl -n tenant-test get endpoints mariadb-$name -o jsonpath='{.subsets[*].addresses[*].ip}' | grep -q '[0-9]'; do sleep 10; done" timeout 60 sh -ec "until kubectl -n tenant-test get statefulset.apps/mariadb-$name >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/mongodb.bats b/hack/e2e-apps/mongodb.bats index bc83f7ab7..0750e4317 100644 --- a/hack/e2e-apps/mongodb.bats +++ b/hack/e2e-apps/mongodb.bats @@ -30,7 +30,7 @@ EOF # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr mongodb-$name >/dev/null 2>&1; do sleep 2; done" # Wait for HelmRelease - kubectl -n tenant-test wait hr mongodb-$name --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr mongodb-$name --timeout=5m --for=condition=ready # Wait for MongoDB service (port 27017) timeout 120 sh -ec "until kubectl -n tenant-test get svc mongodb-$name-rs0 -o jsonpath='{.spec.ports[0].port}' | grep -q '27017'; do sleep 10; done" # Wait for endpoints diff --git a/hack/e2e-apps/openbao.bats b/hack/e2e-apps/openbao.bats index 168440ade..81ca42b3e 100644 --- a/hack/e2e-apps/openbao.bats +++ b/hack/e2e-apps/openbao.bats @@ -21,8 +21,8 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr openbao-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr openbao-$name --timeout=60s --for=condition=ready - kubectl -n tenant-test wait hr openbao-$name-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr openbao-$name --timeout=5m --for=condition=ready + kubectl -n tenant-test wait hr openbao-$name-system --timeout=5m --for=condition=ready # Wait for container to be started (pod Running does not guarantee container is ready for exec on slow CI) if ! timeout 120 sh -ec "until kubectl -n tenant-test get pod openbao-$name-0 --output jsonpath='{.status.containerStatuses[0].started}' 2>/dev/null | grep -q true; do sleep 5; done"; then diff --git a/hack/e2e-apps/postgres.bats b/hack/e2e-apps/postgres.bats index bdd63c900..44c0c5bd7 100644 --- a/hack/e2e-apps/postgres.bats +++ b/hack/e2e-apps/postgres.bats @@ -43,7 +43,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr postgres-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr postgres-$name --timeout=100s --for=condition=ready + kubectl -n tenant-test wait hr postgres-$name --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get job.batch postgres-$name-init-job >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait job.batch postgres-$name-init-job --timeout=50s --for=condition=Complete timeout 40 sh -ec "until kubectl -n tenant-test get svc postgres-$name-r -o jsonpath='{.spec.ports[0].port}' | grep -q '5432'; do sleep 10; done" diff --git a/hack/e2e-apps/qdrant.bats b/hack/e2e-apps/qdrant.bats index 8a889e439..7d031a1d7 100755 --- a/hack/e2e-apps/qdrant.bats +++ b/hack/e2e-apps/qdrant.bats @@ -20,8 +20,8 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr qdrant-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr qdrant-$name --timeout=60s --for=condition=ready - kubectl -n tenant-test wait hr qdrant-$name-system --timeout=120s --for=condition=ready + kubectl -n tenant-test wait hr qdrant-$name --timeout=5m --for=condition=ready + kubectl -n tenant-test wait hr qdrant-$name-system --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get sts qdrant-$name >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait sts qdrant-$name --timeout=90s --for=jsonpath='{.status.readyReplicas}'=1 timeout 60 sh -ec "until kubectl -n tenant-test get pvc qdrant-storage-qdrant-$name-0 >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/redis.bats b/hack/e2e-apps/redis.bats index eb148701f..98eb4595e 100644 --- a/hack/e2e-apps/redis.bats +++ b/hack/e2e-apps/redis.bats @@ -21,7 +21,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr redis-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr redis-$name --timeout=20s --for=condition=ready + kubectl -n tenant-test wait hr redis-$name --timeout=5m --for=condition=ready timeout 60 sh -ec "until kubectl -n tenant-test get pvc redisfailover-persistent-data-rfr-redis-$name-0 >/dev/null 2>&1; do sleep 2; done" kubectl -n tenant-test wait pvc redisfailover-persistent-data-rfr-redis-$name-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound timeout 60 sh -ec "until kubectl -n tenant-test get deploy rfs-redis-$name >/dev/null 2>&1; do sleep 2; done" diff --git a/hack/e2e-apps/vminstance.bats b/hack/e2e-apps/vminstance.bats index 15148c473..b85c0ebf2 100644 --- a/hack/e2e-apps/vminstance.bats +++ b/hack/e2e-apps/vminstance.bats @@ -28,7 +28,7 @@ EOF # Wait for the operator to materialise the HelmRelease before kubectl wait # kicks in (kubectl wait errors immediately if the object does not exist yet). timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-disk-$name >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr vm-disk-$name --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr vm-disk-$name --timeout=5m --for=condition=ready kubectl -n tenant-test wait dv vm-disk-$name --timeout=250s --for=condition=ready kubectl -n tenant-test wait pvc vm-disk-$name --timeout=200s --for=jsonpath='{.status.phase}'=Bound # Drop the VMDisk so the next test starts from a clean slate. Each test @@ -63,7 +63,7 @@ spec: storageClass: replicated EOF timeout 60 sh -ec "until kubectl -n tenant-test get hr vm-disk-$diskName >/dev/null 2>&1; do sleep 2; done" - kubectl -n tenant-test wait hr vm-disk-$diskName --timeout=60s --for=condition=ready + kubectl -n tenant-test wait hr vm-disk-$diskName --timeout=5m --for=condition=ready kubectl -n tenant-test wait dv vm-disk-$diskName --timeout=250s --for=condition=ready kubectl -n tenant-test wait pvc vm-disk-$diskName --timeout=200s --for=jsonpath='{.status.phase}'=Bound kubectl apply -f - <