Skip to content

Commit 5a2ced4

Browse files
authored
K8SPG-894: bring back major-upgrade test but remove restores from it (#1352)
* Restore ajor upgrade tests * Remove restore from major upgrade to make test more stable * K8SPG-894: bring back major upgrade tests * Fix repos and use sequential
1 parent d1c1bc0 commit 5a2ced4

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+117
-519
lines changed

e2e-tests/functions

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1114,7 +1114,11 @@ get_container_image() {
11141114
operatorVersion=main
11151115
fi
11161116

1117-
echo "${IMAGE_BASE}:${operatorVersion}-ppg${pgVersion}-${component}"
1117+
if [[ $component == 'pgbouncer' || $component == 'pgbackrest' ]]; then
1118+
echo "${IMAGE_BASE}:${operatorVersion}-${component}${pgVersion}"
1119+
else
1120+
echo "${IMAGE_BASE}:${operatorVersion}-ppg${pgVersion}-${component}"
1121+
fi
11181122
}
11191123

11201124
get_postgresql_logs() {

e2e-tests/run-release.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ database-init-sql
66
demand-backup
77
finalizers
88
init-deploy
9+
major-upgrade
910
monitoring
1011
monitoring-pmm3
1112
one-pod

e2e-tests/tests/major-upgrade/01-create-cluster.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ commands:
1010
1111
get_cr \
1212
| yq eval '
13-
.spec.postgresVersion = 12 |
14-
.spec.image = "perconalab/percona-postgresql-operator:main-ppg12-postgres" |
13+
.spec.postgresVersion = 13 |
14+
.spec.image = "perconalab/percona-postgresql-operator:main-ppg13-postgres" |
1515
.spec.instances[0].dataVolumeClaimSpec.resources.requests.storage = "3Gi" |
16-
.spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-ppg12-pgbouncer" |
17-
.spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-ppg12-pgbackrest" |
16+
.spec.proxy.pgBouncer.image = "perconalab/percona-postgresql-operator:main-pgbouncer13" |
17+
.spec.backups.pgbackrest.image = "perconalab/percona-postgresql-operator:main-pgbackrest13" |
1818
.spec.patroni.dynamicConfiguration.postgresql.parameters.shared_preload_libraries = "pg_cron" |
1919
.spec.extensions.custom += [{"name": "pg_cron", "version": "1.6.1"}]' \
2020
| kubectl -n "${NAMESPACE}" apply -f -
File renamed without changes.

e2e-tests/tests/major-upgrade/30-assert.yaml renamed to e2e-tests/tests/major-upgrade/04-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ kind: PerconaPGCluster
1111
metadata:
1212
name: major-upgrade
1313
spec:
14-
postgresVersion: 15
14+
postgresVersion: 14
1515
status:
1616
pgbouncer:
1717
ready: 3
@@ -32,7 +32,7 @@ metadata:
3232
postgres-operator.crunchydata.com/cluster: major-upgrade
3333
postgres-operator.crunchydata.com/pgbackrest: ''
3434
postgres-operator.crunchydata.com/pgbackrest-backup: replica-create
35-
postgres-operator.crunchydata.com/pgbackrest-repo: repo3
35+
postgres-operator.crunchydata.com/pgbackrest-repo: repo1
3636
ownerReferences:
3737
- apiVersion: pgv2.percona.com/v2
3838
kind: PerconaPGBackup

e2e-tests/tests/major-upgrade/46-assert.yaml renamed to e2e-tests/tests/major-upgrade/05-assert.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@ status:
1616
pgbackrest:
1717
repos:
1818
- bound: true
19-
name: repo1
19+
name: repo2
2020
replicaCreateBackupComplete: true
2121
stanzaCreated: true
File renamed without changes.

e2e-tests/tests/major-upgrade/22-assert.yaml renamed to e2e-tests/tests/major-upgrade/06-assert.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
postgres-operator.crunchydata.com/pgbackrest-backup: backup-after-13-to-14
1010
labels:
1111
postgres-operator.crunchydata.com/pgbackrest-backup: manual
12-
postgres-operator.crunchydata.com/pgbackrest-repo: repo3
12+
postgres-operator.crunchydata.com/pgbackrest-repo: repo2
1313
ownerReferences:
1414
- apiVersion: pgv2.percona.com/v2
1515
kind: PerconaPGBackup
@@ -24,7 +24,7 @@ metadata:
2424
name: backup-after-13-to-14
2525
spec:
2626
pgCluster: major-upgrade
27-
repoName: repo3
27+
repoName: repo2
2828
options:
2929
- --type=full
3030
status:

e2e-tests/tests/major-upgrade/22-run-backup.yaml renamed to e2e-tests/tests/major-upgrade/06-run-backup.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ metadata:
44
name: backup-after-13-to-14
55
spec:
66
pgCluster: major-upgrade
7-
repoName: repo3
7+
repoName: repo2
88
options:
99
- --type=full
File renamed without changes.

0 commit comments

Comments
 (0)