fix tests

Author: jvpasinatto

e2e-tests/demand-backup-eks-credentials/run

@@ -71,7 +71,7 @@ compare_mongo_cmd "find" "myApp:myPass@$cluster-2.$cluster.$namespace"
 
 desc 'delete backup and check if it is removed from bucket -- aws-s3'
 kubectl_bin delete psmdb-backup --all
-check_backup_deletion_aws "$backup_dest_aws"
+check_backup_deletion_aws "$backup_dest_aws" "/rs0/myApp.test.gz"
 
 destroy $namespace
 

e2e-tests/demand-backup-sharded/run

@@ -137,9 +137,9 @@ if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
 	desc 'check backup and restore -- azure-blob'
 	backup_dest_azure=$(get_backup_dest "$backup_name_azure")
 	setup_azure_credentials
-	check_backup_existence_azure "$backup_dest_azure" "/rs0/myApp.test.gz" | gunzip >/dev/null
-	check_backup_existence_azure "$backup_dest_azure" "/rs1/myApp1.test.gz" | gunzip >/dev/null
-	check_backup_existence_azure "$backup_dest_azure" "/rs2/myApp2.test.gz" | gunzip >/dev/null
+	check_backup_existence_azure "$backup_dest_azure" "/rs0/myApp.test.gz"
+	check_backup_existence_azure "$backup_dest_azure" "/rs1/myApp1.test.gz"
+	check_backup_existence_azure "$backup_dest_azure" "/rs2/myApp2.test.gz"
 	insert_data_mongos "100501" "myApp" "" "$custom_port"
 	insert_data_mongos "100501" "myApp1" "" "$custom_port"
 	insert_data_mongos "100501" "myApp2" "" "$custom_port"
@@ -172,9 +172,9 @@ if [[ $backup_exists -eq 1 ]]; then
 fi
 
 if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
-	check_backup_deletion_aws "$backup_dest_aws"
-	check_backup_deletion_gcs "$backup_dest_gcp"
-	check_backup_deletion_azure "$backup_dest_azure"
+	check_backup_deletion_aws "$backup_dest_aws" "/rs0/myApp.test.gz"
+	check_backup_deletion_gcs "$backup_dest_gcp" "/rs0/myApp.test.gz"
+	check_backup_deletion_azure "$backup_dest_azure" "/rs0/myApp.test.gz"
 fi
 
 # Temporarily skipping this check
@@ -183,3 +183,4 @@ fi
 
 kubectl_bin delete -f "$conf_dir/container-rc.yaml"
 destroy "$namespace"
+desc 'test passed'

e2e-tests/demand-backup/run

@@ -188,7 +188,7 @@ wait_backup_agent $cluster-1
 wait_backup_agent $cluster-2
 
 if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
-	desc 'Check GCS pfofiles'
+	desc 'Check GCS profiles'
 	compare_pbm_profile_setup "some-name" "gcp-cs-s3"
 	compare_pbm_profile_setup "some-name" "gcp-cs-sa"
 fi
@@ -224,24 +224,24 @@ if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
 	desc 'check backup and restore -- aws-s3'
 	backup_dest_aws=$(get_backup_dest "$backup_name_aws")
 	setup_aws_credentials
-	check_backup_existence_aws ${backup_name_aws} '/rs0/myApp.test.gz'
+	check_backup_existence_aws ${backup_dest_aws} '/rs0/myApp.test.gz'
 	run_recovery_check "$backup_name_aws" "$cluster"
 
 	desc 'check backup and restore -- gcp-cs-s3'
 	backup_dest_gcp_s3=$(get_backup_dest "$backup_name_gcp_s3")
 	setup_gcs_credentials
-	check_backup_existence_gcs ${backup_name_gcp_s3} '/rs0/myApp.test.gz'
+	check_backup_existence_gcs ${backup_dest_gcp_s3} '/rs0/myApp.test.gz'
 	run_recovery_check "$backup_name_gcp_s3" "$cluster"
 
 	desc 'check backup and restore -- gcp-cs-sa'
 	backup_dest_gcp_sa=$(get_backup_dest "$backup_name_gcp_sa")
-	check_backup_existence_gcs ${backup_name_gcp_sa} '/rs0/myApp.test.gz'
+	check_backup_existence_gcs ${backup_dest_gcp_sa} '/rs0/myApp.test.gz'
 	run_recovery_check "$backup_name_gcp_sa" "$cluster"
 
 	desc 'check backup and restore -- azure-blob'
 	backup_dest_azure=$(get_backup_dest "$backup_name_azure")
 	setup_azure_credentials
-	check_backup_in_azure ${backup_name_azure} '/rs0/myApp.test.gz'
+	check_backup_existence_azure ${backup_dest_azure} '/rs0/myApp.test.gz'
 	run_recovery_check "$backup_name_azure" "$cluster"
 fi
 
@@ -288,10 +288,10 @@ if [[ $backup_exists -eq 1 ]]; then
 fi
 
 if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
-	check_backup_deletion_aws "$backup_dest_aws"
-	check_backup_deletion_gcs "$backup_dest_gcp_s3"
-	check_backup_deletion_gcs "$backup_dest_gcp_sa"
-	check_backup_deletion_azure "$backup_dest_azure"
+	check_backup_deletion_aws "$backup_dest_aws" "/rs0/myApp.test.gz"
+	check_backup_deletion_gcs "$backup_dest_gcp_s3" "/rs0/myApp.test.gz"
+	check_backup_deletion_gcs "$backup_dest_gcp_sa" "/rs0/myApp.test.gz"
+	check_backup_deletion_azure "$backup_dest_azure" "/rs0/myApp.test.gz"
 fi
 
 desc 'checking backup deletion without cr'
@@ -330,10 +330,10 @@ if [[ $backup_exists -eq 1 ]]; then
 fi
 
 if [ -z "$SKIP_BACKUPS_TO_AWS_GCP_AZURE" ]; then
-	check_backup_deletion_aws "$backup_dest_aws"
-	check_backup_deletion_gcs "$backup_dest_gcp_s3"
-	check_backup_deletion_gcs "$backup_dest_gcp_sa"
-	check_backup_deletion_azure "$backup_dest_azure"
+	check_backup_deletion_aws "$backup_dest_aws" "/rs0/myApp.test.gz"
+	check_backup_deletion_gcs "$backup_dest_gcp_s3" "/rs0/myApp.test.gz"
+	check_backup_deletion_gcs "$backup_dest_gcp_sa" "/rs0/myApp.test.gz"
+	check_backup_deletion_azure "$backup_dest_azure" "/rs0/myApp.test.gz"
 fi
 
 # Temporarily skipping this check

e2e-tests/functions

@@ -2341,12 +2341,12 @@ function check_backup_existence_aws() {
 			echo "Backup was not found in bucket -- $storage_name"
 			exit 1
 		fi
-		echo "waiting for backup in $storage_name"
+		echo "waiting for backup $bucket/$key_prefix/$key in $storage_name"
 		sleep 10
 		((retry += 1))
 	done
 
-	echo "Backup ${key_prefix}${key} found in bucket $bucket in $storage_name"
+	echo "Backup $bucket/$key_prefix/$key found in $storage_name"
 }
 
 function check_backup_existence_gcs() {
@@ -2363,17 +2363,19 @@ function check_backup_existence_gcs() {
 			echo "Backup was not found in bucket -- $storage_name"
 			exit 1
 		fi
-		echo "Waiting for backup in $storage_name ($gcs_path)..."
+		echo "Waiting for backup $gcs_path in $storage_name"
 		sleep 10
 		((retry += 1))
 	done
 
-	echo "Backup found in $storage_name: $gcs_path"
+	echo "Backup $gcs_path found in $storage_name"
 }
 
 function check_backup_existence_azure() {
-	container=$(echo "$1" | cut -d'/' -f1)
-	blob_prefix=$(echo "$1" | cut -d'/' -f2-)
+	url_path=$(echo "$1" | sed 's|https://[^/]*\.blob\.core\.windows\.net/||')
+	container=$(echo "$url_path" | cut -d'/' -f1)
+	blob_prefix=$(echo "$url_path" | cut -d'/' -f2-)
+
 	blob=$2
 	storage_name="azure-blob"
 	retry=0
@@ -2385,12 +2387,12 @@ function check_backup_existence_azure() {
 			echo "Backup was not found in container -- $storage_name"
 			exit 1
 		fi
-		echo "waiting for backup in $storage_name"
+		echo "waiting for backup $blob_path in $storage_name"
 		sleep 10
 		((retry += 1))
 	done
 
-	echo "Backup ${blob_path} found in container $container in $storage_name"
+	echo "Backup $blob_path found in $storage_name"
 }
 
 check_backup_in_storage() {