CI/CD Fixes

couchbase-partners · Jul 7, 2023 · 03424f7 · 03424f7
1 parent 0877038
commit 03424f7
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/aws/CouchbaseServer-Graviton/deploy.sh b/aws/CouchbaseServer-Graviton/deploy.sh
@@ -62,7 +62,7 @@ SUBNET_ID=$(aws ec2 describe-subnets --filter "Name=vpc-id,Values=${VPC_NAME}" -
 
 # Create Bucket
 BUCKET="mp-test-templates$(__generate_random_string)"
-aws s3api create-bucket --acl public-read --bucket "$BUCKET" --region "$REGION"
+aws s3api create-bucket --acl public-read --bucket "$BUCKET" --object-ownership BucketOwnerPreferred --region "$REGION"
 KEY="aws-cb-server$(__generate_random_string).template"
 aws s3api put-object --bucket "$BUCKET" --key "$KEY" --body "$TEMPLATE_BODY_FILE" --region "$REGION"
 

diff --git a/aws/CouchbaseServer/deploy.sh b/aws/CouchbaseServer/deploy.sh
@@ -63,7 +63,7 @@ SUBNET_ID=$(aws ec2 describe-subnets --filter "Name=vpc-id,Values=${VPC_NAME}" -
 
 # Create Bucket
 BUCKET="mp-test-templates$(__generate_random_string)"
-aws s3api create-bucket --acl public-read --bucket "$BUCKET" --region "$REGION"
+aws s3api create-bucket --acl public-read --bucket "$BUCKET" --object-ownership BucketOwnerPreferred --region "$REGION"
 KEY="aws-cb-server$(__generate_random_string).template"
 aws s3api put-object --bucket "$BUCKET" --key "$KEY" --body "$TEMPLATE_BODY_FILE"
 

diff --git a/aws/CouchbaseServerAndSyncGateway/deploy.sh b/aws/CouchbaseServerAndSyncGateway/deploy.sh
@@ -34,7 +34,7 @@ TEMPLATE_BODY_FILE="${SCRIPT_SOURCE}/../../build/aws/CouchbaseServerAndSyncGatew
 echo "$TEMPLATE_BODY_FILE"
 
 BUCKET="mp-test-templates$(__generate_random_string)"
-aws s3api create-bucket --acl public-read --bucket "$BUCKET" --region "$REGION"
+aws s3api create-bucket --acl public-read --bucket "$BUCKET"  --object-ownership BucketOwnerPreferred --region "$REGION"
 KEY="aws-cb-server$(__generate_random_string).template"
 aws s3api put-object --bucket "$BUCKET" --key "$KEY" --body "$TEMPLATE_BODY_FILE"
 

diff --git a/azure/CouchbaseServer-Application/test/verifier_tests/Defaults.json b/azure/CouchbaseServer-Application/test/verifier_tests/Defaults.json
@@ -42,7 +42,7 @@
     },
     {
       "Name": "DiskStorage",
-      "ExpectedResult": "93"
+      "ExpectedResult": "86"
     },
     {
       "Name": "VersionValidator",

diff --git a/azure/CouchbaseServer-Application/test/verifier_tests/mds_tests.json b/azure/CouchbaseServer-Application/test/verifier_tests/mds_tests.json
@@ -42,7 +42,7 @@
     },
     {
       "Name": "DiskStorage",
-      "ExpectedResult": "93"
+      "ExpectedResult": "86"
     },
     {
       "Name": "VersionValidator",

diff --git a/azure/CouchbaseSyncGateway-Application/test/createServer.sh b/azure/CouchbaseSyncGateway-Application/test/createServer.sh
@@ -73,7 +73,7 @@ SERVER_STARTUP=$(sed -e "s~__USERNAME__~$USERNAME~g" "$SCRIPT_SOURCE/serverStart
 SECURITY_GROUP=$(az network nsg create --name "$VM_NAME-nsg" -g "$RESOURCE_GROUP" --location "$LOCATION")
 SEC_GROUP_NAME=$(echo "$SECURITY_GROUP" | jq -r '.NewNSG.name')
 export RULE=""
-RULE=$(az network nsg rule create --name "Couchbase Admin Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_Admin_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "100" \
                            -g "$RESOURCE_GROUP" \
@@ -86,7 +86,7 @@ RULE=$(az network nsg rule create --name "Couchbase Admin Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")
 
-RULE=$(az network nsg rule create --name "Couchbase Index Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_Index_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "101" \
                            -g "$RESOURCE_GROUP" \
@@ -99,7 +99,7 @@ RULE=$(az network nsg rule create --name "Couchbase Index Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")                     
 
-RULE=$(az network nsg rule create --name "Couchbase Analytics Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_Analytics_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "102" \
                            -g "$RESOURCE_GROUP" \
@@ -112,7 +112,7 @@ RULE=$(az network nsg rule create --name "Couchbase Analytics Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")
 
-RULE=$(az network nsg rule create --name "Couchbase FTS Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_FTS_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "103" \
                            -g "$RESOURCE_GROUP" \
@@ -125,7 +125,7 @@ RULE=$(az network nsg rule create --name "Couchbase FTS Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")
 
-RULE=$(az network nsg rule create --name "Couchbase Internal Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_Internal_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "104" \
                            -g "$RESOURCE_GROUP" \
@@ -138,7 +138,7 @@ RULE=$(az network nsg rule create --name "Couchbase Internal Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")
 
-RULE=$(az network nsg rule create --name "Couchbase XDCR Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_XDCR_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "105" \
                            -g "$RESOURCE_GROUP" \
@@ -151,7 +151,7 @@ RULE=$(az network nsg rule create --name "Couchbase XDCR Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")                           
 
-RULE=$(az network nsg rule create --name "Couchbase SSL Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_SSL_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "106" \
                            -g "$RESOURCE_GROUP" \
@@ -164,7 +164,7 @@ RULE=$(az network nsg rule create --name "Couchbase SSL Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")
 
-RULE=$(az network nsg rule create --name "Couchbase NDX Ports" \
+RULE=$(az network nsg rule create --name "Couchbase_NDX_Ports" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "107" \
                            -g "$RESOURCE_GROUP" \
@@ -177,7 +177,7 @@ RULE=$(az network nsg rule create --name "Couchbase NDX Ports" \
                            --source-address-prefixes "*" \
                            --destination-address-prefixes "*")                           
 
-RULE=$(az network nsg rule create --name "SSH Inbound" \
+RULE=$(az network nsg rule create --name "SSH_Inbound" \
                            --nsg-name "$SEC_GROUP_NAME" \
                            --priority "108" \
                            -g "$RESOURCE_GROUP" \