Merge branch 'main' into CLOUD-869

percona · Dec 20, 2024 · bd5e9ee · bd5e9ee
2 parents e7a587a + 216d384
commit bd5e9ee
Show file tree

Hide file tree

Showing 7 changed files with 1,248 additions and 4 deletions.
diff --git a/e2e-tests/functions b/e2e-tests/functions
@@ -8,10 +8,10 @@ IMAGE=${IMAGE:-"perconalab/percona-server-mongodb-operator:${GIT_BRANCH}"}
 IMAGE_MONGOD=${IMAGE_MONGOD:-"perconalab/percona-server-mongodb-operator:main-mongod7.0"}
 IMAGE_MONGOD_CHAIN=${IMAGE_MONGOD_CHAIN:-$'
 perconalab/percona-server-mongodb-operator:main-mongod5.0
-
 perconalab/percona-server-mongodb-operator:main-mongod6.0
-perconalab/percona-server-mongodb-operator:main-mongod7.0'}
-IMAGE_BACKUP=${IMAGE_BACKUP:-"perconalab/percona-backup-mongodb:2.7.0"}
+perconalab/percona-server-mongodb-operator:main-mongod7.0
+perconalab/percona-server-mongodb-operator:main-mongod8.0'}
+IMAGE_BACKUP=${IMAGE_BACKUP:-"perconalab/percona-server-mongodb-operator:main-backup"}
 SKIP_BACKUPS_TO_AWS_GCP_AZURE=${SKIP_BACKUPS_TO_AWS_GCP_AZURE:-1}
 PMM_SERVER_VER=${PMM_SERVER_VER:-"9.9.9"}
 IMAGE_PMM_CLIENT=${IMAGE_PMM_CLIENT:-"perconalab/pmm-client:dev-latest"}
@@ -903,6 +903,9 @@ compare_mongo_user() {
 	if [[ $IMAGE_MONGOD =~ 7\.0 ]] && [ -f ${test_dir}/compare/$user-70.json ]; then
 		expected_result=${test_dir}/compare/$user-70.json
 	fi
+	if [[ $IMAGE_MONGOD =~ 8\.0 ]] && [ -f ${test_dir}/compare/$user-80.json ]; then
+		expected_result=${test_dir}/compare/$user-80.json
+	fi
 
 	run_mongo 'db.runCommand({connectionStatus:1,showPrivileges:true})' "$uri" \
 		| egrep -v "Time|Percona Server for MongoDB|bye|BinData|NumberLong|connecting to|Error saving history file|I NETWORK|W NETWORK|Implicit session:|versions do not match" \