Skip to content

Commit 542e6de

Browse files
committed
e2e-tests: fix kuttl timeout placement in migration-backup-s3
Per the kuttl TestStep schema, `timeout` is a per-command field nested under `commands[]`. These seven files placed it at the top level, where kuttl silently ignores it. Move each one onto the single command entry so the configured timeout actually takes effect.
1 parent dff32ac commit 542e6de

7 files changed

Lines changed: 8 additions & 8 deletions

e2e-tests/tests/migration-backup-s3/00-start-v1-operator.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 10
43
commands:
54
- script: |-
65
set -o errexit
@@ -24,3 +23,4 @@ commands:
2423
$sed -r 's/^( namespace:).*pgo.*$/\1 \"'$NAMESPACE'\"/g' |
2524
$sed -r 's/^( pgo_operator_namespace:).*pgo.*$/\1 \"'$OPNS'\"/g' |
2625
kubectl -n $NAMESPACE apply -f -
26+
timeout: 10

e2e-tests/tests/migration-backup-s3/01-remove-v1-deployer.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 10
43
commands:
54
- script: |-
65
set -o errexit
@@ -20,3 +19,4 @@ commands:
2019
sed -r 's/^( namespace:).*pgo.*$/\1 \"'$NAMESPACE'\"/g' |
2120
sed -r 's/^( pgo_operator_namespace:).*pgo.*$/\1 \"'$OPNS'\"/g' |
2221
kubectl -n $NAMESPACE delete -f -
22+
timeout: 10

e2e-tests/tests/migration-backup-s3/02-start-v1-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 10
43
commands:
54
- script: |-
65
set -o errexit
@@ -35,3 +34,4 @@ commands:
3534
' - |
3635
$sed -r 's/cluster1/'$V1_CLUSTER_NAME'/g' |
3736
kubectl -n $NAMESPACE apply -f -
37+
timeout: 10

e2e-tests/tests/migration-backup-s3/04-read-from-primary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 30
43
commands:
54
- script: |-
65
set -o errexit
@@ -14,3 +13,4 @@ commands:
1413
data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$POSTGRES_V1_PASS@$POSTGRES_V1_CLUSTER_NAME")
1514
1615
kubectl create configmap -n "$NAMESPACE" 04-read-from-primary --from-literal=data="$data"
16+
timeout: 30
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 10
43
commands:
54
- script: |-
65
set -o errexit
@@ -9,4 +8,5 @@ commands:
98
source ../../functions
109
1110
deploy_operator
12-
deploy_s3_secrets
11+
deploy_s3_secrets
12+
timeout: 10

e2e-tests/tests/migration-backup-s3/10-read-from-primary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 30
43
commands:
54
- script: |-
65
set -o errexit
@@ -11,3 +10,4 @@ commands:
1110
data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$(get_psql_user_pass migration-backup-s3-pguser-postgres)@$(get_psql_user_host migration-backup-s3-pguser-postgres)")
1211
1312
kubectl create configmap -n "${NAMESPACE}" 11-read-from-primary --from-literal=data="${data}"
13+
timeout: 30

e2e-tests/tests/migration-backup-s3/12-read-from-primary.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
apiVersion: kuttl.dev/v1beta1
22
kind: TestStep
3-
timeout: 30
43
commands:
54
- script: |-
65
set -o errexit
@@ -11,3 +10,4 @@ commands:
1110
data=$(run_psql '\c myapp \\\ SELECT * from myApp;' "postgres://postgres:$(get_psql_user_pass migration-backup-s3-pguser-postgres)@$(get_psql_user_host migration-backup-s3-pguser-postgres)")
1211
1312
kubectl create configmap -n "${NAMESPACE}" 12-read-from-primary --from-literal=data="${data}"
13+
timeout: 30

0 commit comments

Comments
 (0)