Merge pull request #186 from malscent/MB-54610-UpdatesForServer713

Fixes for non-defaults on graviton
couchbase-partners · Nov 22, 2022 · f766111 · f766111
2 parents e53b025 + d31eceb
commit f766111
Show file tree

Hide file tree

Showing 6 changed files with 107 additions and 33 deletions.
diff --git a/.github/workflows/AWSCouchbaseServer.yml b/.github/workflows/AWSCouchbaseServer.yml
@@ -113,4 +113,26 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
           AWS_DEFAULT_REGION: 'us-east-1'
-          AWS_REGION: 'us-east-1'          
+          AWS_REGION: 'us-east-1'
+      - name: Deploy To AWS (Graviton) Non-Defaults
+        timeout-minutes: 20
+        run: |
+            bash ${GITHUB_WORKSPACE}/aws/CouchbaseServer-Graviton/deploy.sh -n "cb-server-graviton-nondefaults-${GITHUB_SHA::6}" -v 7.1.0 
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: 'us-east-1'
+          AWS_REGION: 'us-east-1'
+      - name: Run Graviton Tests
+        run: |
+          DNS=$(aws ec2 describe-instances --region us-east-1 --filter "Name=tag:aws:cloudformation:stack-name,Values=cb-server-graviton-nondefaults-${GITHUB_SHA::6}" | jq -r '.Reservations[0].Instances[0].PublicDnsName')
+          CouchbaseVerifier verify --host http://${DNS}:8091 -u couchbase -p foo123! -d ${GITHUB_WORKSPACE}/aws/CouchbaseServer-Graviton/Tests/NonDefaults.json       
+      - name: Teardown From AWS (Graviton)
+        timeout-minutes: 20
+        run: |
+            bash ${GITHUB_WORKSPACE}/aws/backout.sh "cb-server-graviton-nondefaults-${GITHUB_SHA::6}"
+        env:
+          AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          AWS_DEFAULT_REGION: 'us-east-1'
+          AWS_REGION: 'us-east-1'                    
diff --git a/aws/CouchbaseServer-Graviton/Tests/Defaults.json b/aws/CouchbaseServer-Graviton/Tests/Defaults.json
@@ -46,7 +46,7 @@
     },
     {
       "Name": "VersionValidator",
-      "ExpectedResult": "7.1.2"
+      "ExpectedResult": "7.1.3"
     }
   ]
 }
diff --git a/aws/CouchbaseServer-Graviton/Tests/NonDefaults.json b/aws/CouchbaseServer-Graviton/Tests/NonDefaults.json
@@ -0,0 +1,52 @@
+{
+  "TestDefinitions": [
+    {
+      "Name": "IsNodeClustered",
+      "ExpectedResult": "True"
+    },
+    {
+      "Name": "NodeCount",
+      "ExpectedResult": "3"
+    },
+    {
+      "Name": "DataNodeCount",
+      "ExpectedResult": "3"
+    },
+    {
+      "Name": "QueryNodeCount",
+      "ExpectedResult": "3"
+    },
+    {
+      "Name": "IndexNodeCount",
+      "ExpectedResult": "3"
+    },
+    {
+      "Name": "SearchNodeCount",
+      "ExpectedResult": "0"
+    },
+    {
+      "Name": "BackupNodeCount",
+      "ExpectedResult": "0"
+    },
+    {
+      "Name": "AnalyticsNodeCount",
+      "ExpectedResult": "0"
+    },
+    {
+      "Name": "EventingNodeCount",
+      "ExpectedResult": "0"
+    },
+    {
+      "Name": "AvailableMemory",
+      "ExpectedResult": "45"
+    },
+    {
+      "Name": "DiskStorage",
+      "ExpectedResult": "294"
+    },
+    {
+      "Name": "VersionValidator",
+      "ExpectedResult": "7.1.0"
+    }
+  ]
+}
diff --git a/aws/CouchbaseServer-Graviton/mappings.json b/aws/CouchbaseServer-Graviton/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-0cb40a612833735b6"
+            "AMI": "ami-0d66e3bb716d67d4d"
         },
         "ap-northeast-2": {
-            "AMI": "ami-05c000044a987d07a"
+            "AMI": "ami-03d55a7ca9de7e4b2"
         },
         "ap-south-1": {
-            "AMI": "ami-0e29e494352e7ec86"
+            "AMI": "ami-06d01eb4cf3d6f63a"
         },
         "ap-southeast-1": {
-            "AMI": "ami-00f34518d671a67b3"
+            "AMI": "ami-0c2e67056cada855f"
         },
         "ap-southeast-2": {
-            "AMI": "ami-082c0c4ed51bc80f0"
+            "AMI": "ami-03bea6562d53429a4"
         },
         "ca-central-1": {
-            "AMI": "ami-0229bca33d3e7a596"
+            "AMI": "ami-00e9bd7da80888bef"
         },
         "eu-central-1": {
-            "AMI": "ami-0c826f63557104046"
+            "AMI": "ami-0018ab0115b9a2e8e"
         },
         "eu-west-1": {
-            "AMI": "ami-0ae15d3ae1b7e9578"
+            "AMI": "ami-0c4c6f33dc4e6e7ea"
         },
         "eu-west-2": {
-            "AMI": "ami-083e48c7d04b04f31"
+            "AMI": "ami-03adb067c2e35f077"
         },
         "eu-west-3": {
-            "AMI": "ami-05aab845d2c2760df"
+            "AMI": "ami-03980d8bc06debc05"
         },
         "sa-east-1": {
-            "AMI": "ami-02025a982f298ec52"
+            "AMI": "ami-087d366beaa4d1b1b"
         },
         "us-east-1": {
-            "AMI": "ami-00f78002e761c68bb"
+            "AMI": "ami-04d3a03b96b757dd5"
         },
         "us-east-2": {
-            "AMI": "ami-0a04e96e43019c071"
+            "AMI": "ami-04f65e81ce08a8809"
         },
         "us-west-1": {
-            "AMI": "ami-0519abf41fa460257"
+            "AMI": "ami-02626ef8f525eab2a"
         },
         "us-west-2": {
-            "AMI": "ami-0b5141c03822f5057"
+            "AMI": "ami-092ac89751401a558"
         }
     }
 }
diff --git a/aws/CouchbaseServer/mappings.json b/aws/CouchbaseServer/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-0a88b59d4d1d4c0f3"
+            "AMI": "ami-08dac45bb6354e49d"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0104643d53727b4be"
+            "AMI": "ami-0c330dea48c41c927"
         },
         "ap-south-1": {
-            "AMI": "ami-0b804462a40a9b5d9"
+            "AMI": "ami-050296fc5cf9870b5"
         },
         "ap-southeast-1": {
-            "AMI": "ami-04f4692c2b515100b"
+            "AMI": "ami-055c360a9fed00810"
         },
         "ap-southeast-2": {
-            "AMI": "ami-0ed1fcd782d7fde5a"
+            "AMI": "ami-09b27a59649e16057"
         },
         "ca-central-1": {
-            "AMI": "ami-08112048f7edbf0fd"
+            "AMI": "ami-0df9d646c7b24e9a6"
         },
         "eu-central-1": {
-            "AMI": "ami-0faf23189b01c0eb9"
+            "AMI": "ami-0ebc73ecd797668b4"
         },
         "eu-west-1": {
-            "AMI": "ami-0bdf41bc101441c7a"
+            "AMI": "ami-00712920277c662f1"
         },
         "eu-west-2": {
-            "AMI": "ami-01715f9663e8e06a1"
+            "AMI": "ami-0d015ae44a0f26dda"
         },
         "eu-west-3": {
-            "AMI": "ami-00922eed4d1d9bfe4"
+            "AMI": "ami-0c1205c04d70c2150"
         },
         "sa-east-1": {
-            "AMI": "ami-0737b53b1bb817a28"
+            "AMI": "ami-080e6a88ba1249ea2"
         },
         "us-east-1": {
-            "AMI": "ami-040089e13bfdbcef3"
+            "AMI": "ami-090e4d31f77cec3ba"
         },
         "us-east-2": {
-            "AMI": "ami-0968d2f6f7cd6d953"
+            "AMI": "ami-06c2699c3f615ac0d"
         },
         "us-west-1": {
-            "AMI": "ami-0fe40f4e5aa529d2c"
+            "AMI": "ami-03bd4ac55b7974f2d"
         },
         "us-west-2": {
-            "AMI": "ami-096ce5c00f07a0fdd"
+            "AMI": "ami-04531a6852a2f8f6f"
         }
     }
 }
diff --git a/script_url.txt b/script_url.txt
@@ -1 +1 @@
-https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.29/couchbase_installer.sh
+https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.30/couchbase_installer.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.29/couchbase_installer.sh
		https://github.com/couchbase-partners/marketplace-scripts/releases/download/v1.0.30/couchbase_installer.sh