Merge pull request #213 from couchbase-partners/UpdateForSyncGateway3-2

Updates for Sync Gateway 3.2 and Server 7.6.3
couchbase-partners · Sep 23, 2024 · 1de49eb · 1de49eb
2 parents 714c87e + 60cd1db
commit 1de49eb
Show file tree

Hide file tree

Showing 15 changed files with 97 additions and 77 deletions.
diff --git a/.github/workflows/AWS-CreateVMRelease.yml b/.github/workflows/AWS-CreateVMRelease.yml
@@ -97,7 +97,7 @@ jobs:
                                                                 ${{ env.ARM  }}
 
       - name: Upload AMI details
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: ${{github.event.inputs.name}}.json
           path: build/aws/couchbase-ami-creation/${{github.event.inputs.name}}.json

diff --git a/.github/workflows/Azure-CreatePrivateOffer.yml b/.github/workflows/Azure-CreatePrivateOffer.yml
@@ -72,7 +72,7 @@ jobs:
                                                   -i $SYNC_GATEWAY_IMAGE_VERSION \
                                                   -u $SYNC_GATEWAY_SKU
       - name: Upload customer offer package
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: azure-cbs-archive-${{github.event.inputs.customer}}.zip
           path: build/azure/CouchBaseServerAndSyncGateway/azure-cbs-archive-${{github.event.inputs.customer}}.zip

diff --git a/.github/workflows/Azure-CreateVMRelease.yml b/.github/workflows/Azure-CreateVMRelease.yml
@@ -50,14 +50,14 @@ jobs:
         run: bash ${GITHUB_WORKSPACE}/azure/Couchbase-VirtualMachine/create.sh -l eastus -g cb-mkt-artifacts -s cbmktvm$(date +%Y)$(date +%m)$(date +%d)$(date +%H)$(date +%M) -v "$VERSION" -m        
       - name: Upload VM Configuration
         if: ${{ github.event.inputs.syncgateway == 'N' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with: 
           name: ServerTechnicalConfiguration.json
           path: build/azure/Couchbase-VirtualMachine/ServerTechnicalConfiguration.json
           retention-days: 14
       - name: Upload VM Configuration
         if: ${{ github.event.inputs.syncgateway == 'Y' }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with: 
           name: GatewayTechnicalConfiguration.json
           path: build/azure/Couchbase-VirtualMachine/GatewayTechnicalConfiguration.json

diff --git a/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template b/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template
@@ -91,7 +91,7 @@
         "ServerVersion": {
             "Description": "Couchbase Server Version",
             "Type": "String",
-            "Default": "7.6.2",
+            "Default": "7.6.3",
             "AllowedValues": [
                 "7.1.0",
                 "7.1.1",
@@ -105,7 +105,8 @@
                 "7.2.5",
                 "7.6.0",
                 "7.6.1",
-                "7.6.2"
+                "7.6.2",
+                "7.6.3"
             ]
         },
         "CoreInstanceType": {

diff --git a/aws/CouchbaseServer-Graviton/mappings.json b/aws/CouchbaseServer-Graviton/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-0e4ce205994303938"
+            "AMI": "ami-0bc97d9e8187fef5a"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0203fadde5e0025b9"
+            "AMI": "ami-085e98cdf8c606881"
         },
         "ap-south-1": {
-            "AMI": "ami-0a14a48599c3a37b6"
+            "AMI": "ami-0d4a16e44e9f88116"
         },
         "ap-southeast-1": {
-            "AMI": "ami-077d9f90dd629cdea"
+            "AMI": "ami-066fcc2129229a11c"
         },
         "ap-southeast-2": {
-            "AMI": "ami-09f084139d3bbb8ff"
+            "AMI": "ami-01fc1500eb9ef2727"
         },
         "ca-central-1": {
-            "AMI": "ami-0578d1ba4ec86f922"
+            "AMI": "ami-00a18832811383c26"
         },
         "eu-central-1": {
-            "AMI": "ami-02200fd62c698c4f0"
+            "AMI": "ami-04870eebe4475d3ca"
         },
         "eu-west-1": {
-            "AMI": "ami-05bfe3f1910432a5f"
+            "AMI": "ami-0fe82350bf38ee99d"
         },
         "eu-west-2": {
-            "AMI": "ami-024d543e8c29456bf"
+            "AMI": "ami-062271e322458c297"
         },
         "eu-west-3": {
-            "AMI": "ami-0d68fa15aef2dc0c7"
+            "AMI": "ami-04065a2ec7f6ee19c"
         },
         "sa-east-1": {
-            "AMI": "ami-0dc9842ee39b254e4"
+            "AMI": "ami-03ec3a55ebc441e02"
         },
         "us-east-1": {
-            "AMI": "ami-0261d2d79179fba1a"
+            "AMI": "ami-0c7071b2e9c52a32d"
         },
         "us-east-2": {
-            "AMI": "ami-0794bd7d46b096f20"
+            "AMI": "ami-0cdbf34e51a6bb2c8"
         },
         "us-west-1": {
-            "AMI": "ami-0f5a071079d0f3da2"
+            "AMI": "ami-0135aefedac0aba2c"
         },
         "us-west-2": {
-            "AMI": "ami-0c65fc214e53b3569"
+            "AMI": "ami-017cfd5bc53d721f6"
         }
     }
 }
diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template
@@ -91,7 +91,7 @@
         "ServerVersion": {
             "Description": "Couchbase Server Version",
             "Type": "String",
-            "Default": "7.6.0",
+            "Default": "7.6.3",
             "AllowedValues": [
                 "6.6.6",
                 "6.6.5",
@@ -125,7 +125,8 @@
                 "7.2.5",
                 "7.6.0",
                 "7.6.1",
-                "7.6.2"
+                "7.6.2",
+                "7.6.3"
             ]
         },
         "CoreInstanceType": {

diff --git a/aws/CouchbaseServer/mappings.json b/aws/CouchbaseServer/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseServer": {
         "ap-northeast-1": {
-            "AMI": "ami-0a92322f13d1f14dc"
+            "AMI": "ami-093134076831033cc"
         },
         "ap-northeast-2": {
-            "AMI": "ami-0114763298180e7cc"
+            "AMI": "ami-0fa9ad2c903e02e02"
         },
         "ap-south-1": {
-            "AMI": "ami-041602e7c2e0e09ab"
+            "AMI": "ami-0753ec5d1196e1d67"
         },
         "ap-southeast-1": {
-            "AMI": "ami-0e5e1ccdde95d5b1d"
+            "AMI": "ami-0f0fe30a6f8970394"
         },
         "ap-southeast-2": {
-            "AMI": "ami-032236b0ff86acfa5"
+            "AMI": "ami-0d9b18f0cea41e791"
         },
         "ca-central-1": {
-            "AMI": "ami-08f591a530c8e9d63"
+            "AMI": "ami-000401a0999c178c8"
         },
         "eu-central-1": {
-            "AMI": "ami-0be2de2c57076cb59"
+            "AMI": "ami-008f1f80ff3177235"
         },
         "eu-west-1": {
-            "AMI": "ami-09e1bbfd192c8d6e4"
+            "AMI": "ami-04d2eff39d5f3acde"
         },
         "eu-west-2": {
-            "AMI": "ami-05b74ad8be104f788"
+            "AMI": "ami-07c1886600f917870"
         },
         "eu-west-3": {
-            "AMI": "ami-01a91ce750365c323"
+            "AMI": "ami-0bea5232d86bf93ee"
         },
         "sa-east-1": {
-            "AMI": "ami-0d6ac9c63c9715b6c"
+            "AMI": "ami-0239ad24f801c6d58"
         },
         "us-east-1": {
-            "AMI": "ami-09a22a1cd1d9d46ce"
+            "AMI": "ami-080943bd6a9fb9e95"
         },
         "us-east-2": {
-            "AMI": "ami-06aafad0de559293c"
+            "AMI": "ami-09b0075393e03e793"
         },
         "us-west-1": {
-            "AMI": "ami-0dccfdb75daec4c66"
+            "AMI": "ami-05309e85e5faeb495"
         },
         "us-west-2": {
-            "AMI": "ami-03ba676b8ce3aa86e"
+            "AMI": "ami-0da80fdc6f6895a58"
         }
     }
-}
+}
diff --git a/aws/CouchbaseSyncGateway/arm_mappings.json b/aws/CouchbaseSyncGateway/arm_mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseSyncGateway": {
         "ap-northeast-1": {
-            "AMI": "ami-049e4171fc41b65a4"
+            "AMI": "ami-0b503d985c2ecbdd3"
         },
         "ap-northeast-2": {
-            "AMI": "ami-02ecc6970684ba805"
+            "AMI": "ami-0515951e968307b79"
         },
         "ap-south-1": {
-            "AMI": "ami-07a4545fe977a8954"
+            "AMI": "ami-045d8b88af7f0e98e"
         },
         "ap-southeast-1": {
-            "AMI": "ami-0b9c71adee54742da"
+            "AMI": "ami-02ee375fb7cb88de2"
         },
         "ap-southeast-2": {
-            "AMI": "ami-01a134e0fc1ef74c4"
+            "AMI": "ami-0086bdd4a168549fa"
         },
         "ca-central-1": {
-            "AMI": "ami-03e21db52a6ac65ce"
+            "AMI": "ami-0c317e5d5759d69f4"
         },
         "eu-central-1": {
-            "AMI": "ami-0b7dfb4de1a1b7b04"
+            "AMI": "ami-072ef83398f7cac08"
         },
         "eu-west-1": {
-            "AMI": "ami-0e83024f8d0098cc9"
+            "AMI": "ami-05e714f4b44b9c742"
         },
         "eu-west-2": {
-            "AMI": "ami-09644677411a2b1ec"
+            "AMI": "ami-0a0374dbc51b8b986"
         },
         "eu-west-3": {
-            "AMI": "ami-09622e2345bb69348"
+            "AMI": "ami-036a6e7a4cc821cc7"
         },
         "sa-east-1": {
-            "AMI": "ami-0f8dba6877031a196"
+            "AMI": "ami-09eddc69d92b50cb5"
         },
         "us-east-1": {
-            "AMI": "ami-0d5ce9feb5b28c043"
+            "AMI": "ami-09971637fb45c8a9b"
         },
         "us-east-2": {
-            "AMI": "ami-0474dd4f41087b407"
+            "AMI": "ami-0dd6a561d5c9aa815"
         },
         "us-west-1": {
-            "AMI": "ami-05a4face7ebb06bec"
+            "AMI": "ami-021f67e6af8e1cd4a"
         },
         "us-west-2": {
-            "AMI": "ami-02590b4b831ab2dbb"
+            "AMI": "ami-057c3566934e592cb"
         }
     }
 }
diff --git a/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseSyncGateway/couchbase-amzn-lnx2.template
@@ -76,8 +76,16 @@
         "SyncGatewayVersion": {
             "Description": "Couchbase Sync Gateway Version",
             "Type": "String",
-            "Default": "3.1.0",
+            "Default": "3.2.0",
             "AllowedValues": [
+                "3.2.0",
+                "3.1.11",
+                "3.1.8",
+                "3.1.6",
+                "3.1.5",
+                "3.1.3",
+                "3.1.2",
+                "3.1.1",
                 "3.1.0",
                 "3.0.8",
                 "3.0.7",

diff --git a/aws/CouchbaseSyncGateway/createServer.sh b/aws/CouchbaseSyncGateway/createServer.sh
@@ -11,7 +11,7 @@ function __generate_random_string() {
 
 REGION="us-east-1"
 INSTANCE_TYPE=m4.xlarge
-VERSION="7.1.1"
+VERSION="7.6.0"
 
 while getopts r:t:i:u:p:e:v: flag
 do

diff --git a/aws/CouchbaseSyncGateway/mappings.json b/aws/CouchbaseSyncGateway/mappings.json
@@ -1,49 +1,49 @@
 {
     "CouchbaseSyncGateway": {
         "ap-northeast-1": {
-            "AMI": "ami-098b61e872ec9c4a5"
+            "AMI": "ami-0f9e9d8f8c97039a9"
         },
         "ap-northeast-2": {
-            "AMI": "ami-05d81037e9e7e3469"
+            "AMI": "ami-05eadad643b348780"
         },
         "ap-south-1": {
-            "AMI": "ami-0d05c40dd35dbab22"
+            "AMI": "ami-0f29dee785f9deddb"
         },
         "ap-southeast-1": {
-            "AMI": "ami-0ffbe780887a527be"
+            "AMI": "ami-0450a999fb9bdc934"
         },
         "ap-southeast-2": {
-            "AMI": "ami-0d0aef0188c3500ee"
+            "AMI": "ami-0a73f436392aa9121"
         },
         "ca-central-1": {
-            "AMI": "ami-0bcf614070b977409"
+            "AMI": "ami-0d4514c615b707fdd"
         },
         "eu-central-1": {
-            "AMI": "ami-00a912a9071f8c8c2"
+            "AMI": "ami-06a473aa6a35d3ff8"
         },
         "eu-west-1": {
-            "AMI": "ami-0affd91c45636a91f"
+            "AMI": "ami-02997265f562f1b00"
         },
         "eu-west-2": {
-            "AMI": "ami-0f2fbd753144bed78"
+            "AMI": "ami-0f5f9be721c44c042"
         },
         "eu-west-3": {
-            "AMI": "ami-00d3a2fc678c3193e"
+            "AMI": "ami-061d90e3f554f9e13"
         },
         "sa-east-1": {
-            "AMI": "ami-092a972aa8afe2982"
+            "AMI": "ami-0c41aa333b4413695"
         },
         "us-east-1": {
-            "AMI": "ami-07c3349c35f179498"
+            "AMI": "ami-0b9b340071804f7d6"
         },
         "us-east-2": {
-            "AMI": "ami-038c73d98d4cd654d"
+            "AMI": "ami-00bb760a0b5b470f1"
         },
         "us-west-1": {
-            "AMI": "ami-07ec4dae6e4f68ac2"
+            "AMI": "ami-019d4a093d85967f1"
         },
         "us-west-2": {
-            "AMI": "ami-04f61679f6fc9eee9"
+            "AMI": "ami-03463b56db82525d8"
         }
     }
 }
diff --git a/gcp/couchbase-server/couchbase.py.schema b/gcp/couchbase-server/couchbase.py.schema
@@ -67,9 +67,13 @@ properties:
     default: 20
   serverVersion:
     type: string
-    default: 7.6.0
+    default: 7.6.3
     enum:
+      - 7.6.3
+      - 7.6.2
+      - 7.6.1
       - 7.6.0
+      - 7.2.5
       - 7.2.4
       - 7.2.3
       - 7.2.2

diff --git a/gcp/couchbase-server/resources/instance_template.py.schema b/gcp/couchbase-server/resources/instance_template.py.schema
@@ -18,9 +18,13 @@ properties:
     default: us-central1-f        
   serverVersion:
     type: string
-    default: 7.6.0
+    default: 7.6.3
     enum:
+      - 7.6.3
+      - 7.6.2
+      - 7.6.1
       - 7.6.0
+      - 7.2.5
       - 7.2.4
       - 7.2.3
       - 7.2.2