diff --git a/aws/CouchbaseServer-Graviton/Tests/Defaults.json b/aws/CouchbaseServer-Graviton/Tests/Defaults.json index b8247da..6e9ce2a 100644 --- a/aws/CouchbaseServer-Graviton/Tests/Defaults.json +++ b/aws/CouchbaseServer-Graviton/Tests/Defaults.json @@ -46,7 +46,7 @@ }, { "Name": "VersionValidator", - "ExpectedResult": "7.1.0" + "ExpectedResult": "7.1.2" } ] } \ No newline at end of file diff --git a/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template b/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template index 735a864..a563ce0 100644 --- a/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServer-Graviton/couchbase-amzn-lnx2.template @@ -91,10 +91,11 @@ "ServerVersion": { "Description": "Couchbase Server Version", "Type": "String", - "Default": "7.1.1", + "Default": "7.1.2", "AllowedValues": [ "7.1.0", - "7.1.1" + "7.1.1", + "7.1.2" ] }, "CoreInstanceType": { diff --git a/aws/CouchbaseServer-Graviton/mappings.json b/aws/CouchbaseServer-Graviton/mappings.json index d35db6f..7162c24 100644 --- a/aws/CouchbaseServer-Graviton/mappings.json +++ b/aws/CouchbaseServer-Graviton/mappings.json @@ -1,49 +1,49 @@ { "CouchbaseServer": { "ap-northeast-1": { - "AMI": "ami-02f28dfcec26e97e6" + "AMI": "ami-0cb40a612833735b6" }, "ap-northeast-2": { - "AMI": "ami-0c029f901e4b6c6d4" + "AMI": "ami-05c000044a987d07a" }, "ap-south-1": { - "AMI": "ami-004248b8911b92664" + "AMI": "ami-0e29e494352e7ec86" }, "ap-southeast-1": { - "AMI": "ami-054757461a7e1268e" + "AMI": "ami-00f34518d671a67b3" }, "ap-southeast-2": { - "AMI": "ami-00e3dfdcb6a405eb4" + "AMI": "ami-082c0c4ed51bc80f0" }, "ca-central-1": { - "AMI": "ami-0ab6c42f8469cd9c1" + "AMI": "ami-0229bca33d3e7a596" }, "eu-central-1": { - "AMI": "ami-0f0bee8956b7327d4" + "AMI": "ami-0c826f63557104046" }, "eu-west-1": { - "AMI": "ami-0cf3290beb83815dd" + "AMI": "ami-0ae15d3ae1b7e9578" }, "eu-west-2": { - "AMI": "ami-01112ec17ce218711" + "AMI": "ami-083e48c7d04b04f31" }, "eu-west-3": { - "AMI": "ami-0cbbf1f7dcaaf3cf0" + "AMI": "ami-05aab845d2c2760df" }, "sa-east-1": { - "AMI": "ami-00cd9f541abbefa76" + "AMI": "ami-02025a982f298ec52" }, "us-east-1": { - "AMI": "ami-02ec614215c9a9810" + "AMI": "ami-00f78002e761c68bb" }, "us-east-2": { - "AMI": "ami-0329bbf3d08d172c7" + "AMI": "ami-0a04e96e43019c071" }, "us-west-1": { - "AMI": "ami-0bce7ffe17d4a2e38" + "AMI": "ami-0519abf41fa460257" }, "us-west-2": { - "AMI": "ami-0856f167e0d679f8c" + "AMI": "ami-0b5141c03822f5057" } } } diff --git a/aws/CouchbaseServer/Tests/Defaults.json b/aws/CouchbaseServer/Tests/Defaults.json index b8247da..6e9ce2a 100644 --- a/aws/CouchbaseServer/Tests/Defaults.json +++ b/aws/CouchbaseServer/Tests/Defaults.json @@ -46,7 +46,7 @@ }, { "Name": "VersionValidator", - "ExpectedResult": "7.1.0" + "ExpectedResult": "7.1.2" } ] } \ No newline at end of file diff --git a/aws/CouchbaseServer/couchbase-amzn-lnx2.template b/aws/CouchbaseServer/couchbase-amzn-lnx2.template index f64f452..f0c351b 100644 --- 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.1.1", + "Default": "7.1.2", "AllowedValues": [ "6.6.5", "6.6.4", @@ -110,7 +110,8 @@ "7.0.3", "7.0.4", "7.1.0", - "7.1.1" + "7.1.1", + "7.1.2" ] }, "CoreInstanceType": { diff --git a/aws/CouchbaseServer/mappings.json b/aws/CouchbaseServer/mappings.json index f6f7dfb..d890c18 100644 --- a/aws/CouchbaseServer/mappings.json +++ b/aws/CouchbaseServer/mappings.json @@ -1,49 +1,49 @@ { "CouchbaseServer": { "ap-northeast-1": { - "AMI": "ami-011f0b39eba384025" + "AMI": "ami-0a88b59d4d1d4c0f3" }, "ap-northeast-2": { - "AMI": "ami-03370cfaf2c2d4cab" + "AMI": "ami-0104643d53727b4be" }, "ap-south-1": { - "AMI": "ami-0a1e547f7b70d3137" + "AMI": "ami-0b804462a40a9b5d9" }, "ap-southeast-1": { - "AMI": "ami-0aa10737cf1945673" + "AMI": "ami-04f4692c2b515100b" }, "ap-southeast-2": { - "AMI": "ami-012796fa6d230d5d9" + "AMI": "ami-0ed1fcd782d7fde5a" }, "ca-central-1": { - "AMI": "ami-01b491671e0515459" + "AMI": "ami-08112048f7edbf0fd" }, "eu-central-1": { - "AMI": "ami-05ca2157b155ad790" + "AMI": "ami-0faf23189b01c0eb9" }, "eu-west-1": { - "AMI": "ami-07f25caef3b115277" + "AMI": "ami-0bdf41bc101441c7a" }, "eu-west-2": { - "AMI": "ami-02e5277b49c00062b" + "AMI": "ami-01715f9663e8e06a1" }, "eu-west-3": { - "AMI": "ami-03c96d1e97352da88" + "AMI": "ami-00922eed4d1d9bfe4" }, "sa-east-1": { - "AMI": "ami-0557fea1bfcfd5406" + "AMI": "ami-0737b53b1bb817a28" }, "us-east-1": { - "AMI": "ami-0029dad066d20afaa" + "AMI": "ami-040089e13bfdbcef3" }, "us-east-2": { - "AMI": "ami-05d74dfdf759c88fe" + "AMI": "ami-0968d2f6f7cd6d953" }, "us-west-1": { - "AMI": "ami-0ad6562fe438b2f57" + "AMI": "ami-0fe40f4e5aa529d2c" }, "us-west-2": { - "AMI": "ami-0cc18ca23a04165be" + "AMI": "ami-096ce5c00f07a0fdd" } } } diff --git a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template index a668e4b..dae3ae7 100644 --- a/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template +++ b/aws/CouchbaseServerAndSyncGateway/couchbase-amzn-lnx2.template @@ -39,8 +39,9 @@ "ServerVersion": { "Description": "Couchbase Server Version", "Type": "String", - "Default": "7.1.1", + "Default": "7.1.2", "AllowedValues": [ + "7.1.2", "7.1.1", "7.1.0", "7.0.4", diff --git a/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json b/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json index 2bed7f3..ffcf23d 100644 --- a/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json +++ b/azure/CouchbaseServer-Application/createUiDefinition.Unlicensed.json @@ -386,11 +386,15 @@ "type": "Microsoft.Common.DropDown", "label": "Server Version", "toolTip": "What version of Couchbase Server is to be installed", - "defaultValue": "7.1.1 (recommended)", + "defaultValue": "7.1.2 (recommended)", "constraints": { "allowedValues": [ { - "label": "7.1.1 (recommended)", + "label": "7.1.2 (recommended)", + "value": "7.1.2" + }, + { + "label": "7.1.1", "value": "7.1.1" }, { diff --git a/azure/CouchbaseServer-Application/createUiDefinition.json b/azure/CouchbaseServer-Application/createUiDefinition.json index 9bc44a7..685915f 100644 --- a/azure/CouchbaseServer-Application/createUiDefinition.json +++ b/azure/CouchbaseServer-Application/createUiDefinition.json @@ -367,11 +367,15 @@ "type": "Microsoft.Common.DropDown", "label": "Server Version", "toolTip": "What version of Couchbase Server is to be installed", - "defaultValue": "7.1.1 (recommended)", + "defaultValue": "7.1.2 (recommended)", "constraints": { "allowedValues": [ { - "label": "7.1.1 (recommended)", + "label": "7.1.2 (recommended)", + "value": "7.1.2" + }, + { + "label": "7.1.1", "value": "7.1.1" }, { diff --git a/azure/CouchbaseServer-Application/mainTemplate.json b/azure/CouchbaseServer-Application/mainTemplate.json index 2060719..25d97f4 100644 --- a/azure/CouchbaseServer-Application/mainTemplate.json +++ b/azure/CouchbaseServer-Application/mainTemplate.json @@ -25,7 +25,7 @@ }, "serverVersion": { "type": "string", - "defaultValue": "7.0.2" + "defaultValue": "7.1.2" }, "vmSize": { "type": "string", diff --git a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json index 40b2831..6dc7e27 100644 --- a/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json +++ b/azure/CouchbaseServerAndSyncGateway-Application/createUiDefinition.json @@ -316,10 +316,14 @@ "name": "serverVersion", "type": "Microsoft.Common.DropDown", "label": "Server Version", - "defaultValue": "7.1.1 (recommended)", + "defaultValue": "7.1.2 (recommended)", "toolTip": "Server Version", "constraints": { "allowedValues": [ + { + "label": "7.1.2", + "value": "7.1.2" + }, { "label": "7.1.1 (recommended)", "value": "7.1.1" diff --git a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema index 7bc9d89..88d4864 100755 --- a/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema +++ b/gcp/couchbase-enterprise-edition-byol/couchbase.py.schema @@ -111,8 +111,9 @@ properties: default: 20 serverVersion: type: string - default: 7.1.1 + default: 7.1.2 enum: + - 7.1.2 - 7.1.1 - 7.1.0 - 7.0.4 diff --git a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema index 8629acb..e56fdd6 100755 --- a/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema +++ b/gcp/couchbase-enterprise-edition-hourly-pricing/couchbase.py.schema @@ -111,8 +111,11 @@ properties: default: 20 serverVersion: type: string - default: 7.0.3 + default: 7.1.2 enum: + - 7.1.2 + - 7.1.1 + - 7.1.0 - 7.0.4 - 7.0.3 - 7.0.2 diff --git a/gcp/couchbase-server/couchbase.py.schema b/gcp/couchbase-server/couchbase.py.schema index abc5e83..96219cb 100755 --- a/gcp/couchbase-server/couchbase.py.schema +++ b/gcp/couchbase-server/couchbase.py.schema @@ -67,8 +67,9 @@ properties: default: 20 serverVersion: type: string - default: 7.1.1 + default: 7.1.2 enum: + - 7.1.2 - 7.1.1 - 7.1.0 - 7.0.4 diff --git a/gcp/couchbase-server/resources/instance_template.py.schema b/gcp/couchbase-server/resources/instance_template.py.schema index f50d1a5..c639a06 100644 --- a/gcp/couchbase-server/resources/instance_template.py.schema +++ b/gcp/couchbase-server/resources/instance_template.py.schema @@ -9,8 +9,9 @@ properties: default: default serverVersion: type: string - default: 7.1.1 + default: 7.1.2 enum: + - 7.1.2 - 7.1.1 - 7.1.0 - 7.0.4 diff --git a/gcp/couchbase-server/test_config.local.yaml b/gcp/couchbase-server/test_config.local.yaml index 55ba1e3..77918aa 100644 --- a/gcp/couchbase-server/test_config.local.yaml +++ b/gcp/couchbase-server/test_config.local.yaml @@ -10,7 +10,7 @@ resources: serverNodeCount: 3 serverNodeType: n1-standard-4 serverDiskSize: 20 - serverVersion: 7.1.1 + serverVersion: 7.1.2 username: couchbase password: foo123! accessCIDR: 0.0.0.0/0 diff --git a/gcp/couchbase-server/test_config.yaml b/gcp/couchbase-server/test_config.yaml index 76e0ad8..8d976b2 100644 --- a/gcp/couchbase-server/test_config.yaml +++ b/gcp/couchbase-server/test_config.yaml @@ -10,7 +10,7 @@ resources: serverNodeCount: 3 serverNodeType: n1-standard-4 serverDiskSize: 20 - serverVersion: 7.1.1 + serverVersion: 7.1.2 username: couchbase password: foo123! accessCIDR: 0.0.0.0/0 diff --git a/gcp/couchbase-server/test_definitions/defaults.json b/gcp/couchbase-server/test_definitions/defaults.json index 9e7617d..6d7f182 100644 --- a/gcp/couchbase-server/test_definitions/defaults.json +++ b/gcp/couchbase-server/test_definitions/defaults.json @@ -46,7 +46,7 @@ }, { "Name": "VersionValidator", - "ExpectedResult": "7.1.1" + "ExpectedResult": "7.1.2" } ] } \ No newline at end of file diff --git a/gcp/shared/group.py.schema b/gcp/shared/group.py.schema index 4b5fbfb..8b6ebf1 100644 --- a/gcp/shared/group.py.schema +++ b/gcp/shared/group.py.schema @@ -22,8 +22,9 @@ properties: description: Type of Couchbase license to be supported by the deployment. serverVersion: type: string - default: 7.1.1 + default: 7.1.2 enum: + - 7.1.2 - 7.1.1 - 7.1.0 - 7.0.4