diff --git a/.github/scripts/e2e_tests.sh b/.github/scripts/e2e_tests.sh index 31b8b31f..3071e349 100755 --- a/.github/scripts/e2e_tests.sh +++ b/.github/scripts/e2e_tests.sh @@ -266,16 +266,14 @@ log_and_run kubectl delete -f cosi-examples/bucketclaim-deletion-policy.yaml log_and_run echo "Verifying bucket deletion with name '$BUCKET_TO_BE_DELETED'..." -BUCKET_HEAD_RESULT=$(aws --endpoint-url "$S3_ENDPOINT" s3api head-bucket --bucket "$BUCKET_TO_BE_DELETED" --retry-mode standard --max-attempts $ATTEMPTS --delay $DELAY 2>&1 || true) - # Check if the bucket has been deleted +log_and_run aws s3 ls --endpoint-url "$S3_ENDPOINT" +BUCKET_HEAD_RESULT=$(log_and_run AWS_MAX_ATTEMPTS=$ATTEMPTS AWS_RETRY_DELAY=$DELAY aws --endpoint-url "$S3_ENDPOINT" s3api head-bucket --bucket "$BUCKET_TO_BE_DELETED" --profile iam 2>&1 || true) + +# Check if the result contains the "Not Found" error message if [[ "$BUCKET_HEAD_RESULT" == *"Not Found"* ]]; then - log_and_run echo "Bucket with name '$BUCKET_TO_BE_DELETED' not found. Bucket deletion successful." + log_and_run echo "Bucket with name '$BUCKET_TO_BE_DELETED' was successfully deleted (Not Found error)." else log_and_run echo "Bucket with name '$BUCKET_TO_BE_DELETED' was not deleted after $ATTEMPTS attempts." exit 1 fi - -log_and_run echo "Bucket deletion verified successfully." - -log_and_run echo "All verifications for object-storage-access-secret passed successfully."