Increase ginkgo timeout for default serial shoot suite (gardener#5428)

* Increase ginkgo timeout for default serial shoot suite With the update to ginkgov2 the default for the timeout is reduced to 1h and is applied to the whole test suite. On slower cloud providers we see test times of over one hour and consequently running into the suite timeout. * adapt activeDeadlineSeconds for shoot default serial * increase the minimal activeDeadlineSeconds to 1h10m * unify formatting * set ginkgo timeout for shootdefault suite to 2h
krgostev · Jul 5, 2022 · 650f95f · 650f95f
1 parent bac1a2d
commit 650f95f
Show file tree

Hide file tree

Showing 12 changed files with 19 additions and 8 deletions.
diff --git a/.test-defs/CreateManagedSeed.yaml b/.test-defs/CreateManagedSeed.yaml
@@ -4,6 +4,7 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the creation of a managed seed.
+
   activeDeadlineSeconds: 7200
 
   command: [bash, -c]

diff --git a/.test-defs/CreateShoot.yaml b/.test-defs/CreateShoot.yaml
@@ -4,6 +4,7 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the creation of a shoot.
+
   activeDeadlineSeconds: 7200
 
   command: [bash, -c]

diff --git a/.test-defs/DeleteManagedSeed.yaml b/.test-defs/DeleteManagedSeed.yaml
@@ -4,6 +4,7 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the deletion of a managed seed.
+
   activeDeadlineSeconds: 4200
 
   command: [bash, -c]

diff --git a/.test-defs/DeleteShoot.yaml b/.test-defs/DeleteShoot.yaml
@@ -4,7 +4,8 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the deletion of a shoot.
-  activeDeadlineSeconds: 3600
+
+  activeDeadlineSeconds: 4200
 
   command: [bash, -c]
   args:

diff --git a/.test-defs/GardenletLandscaper.yaml b/.test-defs/GardenletLandscaper.yaml
@@ -4,6 +4,7 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the Gardenlet landscaper
+
   activeDeadlineSeconds: 7200
 
   command: [bash, -c]

diff --git a/.test-defs/HibernateShoot.yaml b/.test-defs/HibernateShoot.yaml
@@ -4,7 +4,8 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the hibernation of a shoot.
-  activeDeadlineSeconds: 3600
+
+  activeDeadlineSeconds: 4200
 
   command: [bash, -c]
   args:

diff --git a/.test-defs/MigrateShoot.yaml b/.test-defs/MigrateShoot.yaml
@@ -4,7 +4,8 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the migration of a shoot.
-  activeDeadlineSeconds: 3600
+
+  activeDeadlineSeconds: 4200
 
   command: [bash, -c]
   args:

diff --git a/.test-defs/ReconcileShoots.yaml b/.test-defs/ReconcileShoots.yaml
@@ -5,7 +5,7 @@ spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests to wait and check if all shoots are successfully reconciled
 
-  activeDeadlineSeconds: 3600
+  activeDeadlineSeconds: 4200
 
   command: [bash, -c]
   args:

diff --git a/.test-defs/ShootKubernetesUpdateTest.yaml b/.test-defs/ShootKubernetesUpdateTest.yaml
@@ -4,7 +4,8 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the kubernetes update of a shoot.
-  activeDeadlineSeconds: 3600
+
+  activeDeadlineSeconds: 4200
 
   labels: ["shoot"]
 

diff --git a/.test-defs/TestSuiteShootDefault.yaml b/.test-defs/TestSuiteShootDefault.yaml
@@ -5,7 +5,7 @@ spec:
   owner: gardener-oq@listserv.sap.com
   description: shoot test suites that includes all default tests
 
-  activeDeadlineSeconds: 7200
+  activeDeadlineSeconds: 8100
   labels: ["shoot", "default"]
 
   command: [bash, -c]
@@ -20,5 +20,6 @@ spec:
       -fenced=$FENCED
       -ginkgo.focus="\[DEFAULT\]"
       -ginkgo.skip="\[SERIAL\]|\[DISRUPTIVE\]"
+      -ginkgo.timeout=2h
 
   image: eu.gcr.io/gardener-project/3rd/golang:1.17.6
diff --git a/.test-defs/TestSuiteShootDefaultSerial.yaml b/.test-defs/TestSuiteShootDefaultSerial.yaml
@@ -5,7 +5,7 @@ spec:
   owner: gardener-oq@listserv.sap.com
   description: shoot test suites that includes all serial default tests
 
-  activeDeadlineSeconds: 7200
+  activeDeadlineSeconds: 8100
   labels: ["shoot", "default"]
   behavior:
   - serial
@@ -22,5 +22,6 @@ spec:
       -fenced=$FENCED
       -ginkgo.focus="\[DEFAULT\].*\[SERIAL\]"
       -ginkgo.skip="\[DISRUPTIVE\]"
+      -ginkgo.timeout=2h
 
   image: eu.gcr.io/gardener-project/3rd/golang:1.17.6
diff --git a/.test-defs/WakeUpShoot.yaml b/.test-defs/WakeUpShoot.yaml
@@ -4,7 +4,8 @@ metadata:
 spec:
   owner: gardener-oq@listserv.sap.com
   description: Tests the wake-up of a shoot.
-  activeDeadlineSeconds: 3600
+
+  activeDeadlineSeconds: 4200
 
   command: [bash, -c]
   args: