From 2a93cfac8ce1dd5b58254025860cc5581f7eaad3 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Fri, 9 Feb 2018 19:08:35 +0200 Subject: [PATCH] fix big and big15 templates --- BUILD/mdbci/README.md | 4 + .../mdbci/templates/big.json.template | 64 +++++----- .../mdbci/templates/big15.json.template | 116 +++++++++--------- 3 files changed, 94 insertions(+), 90 deletions(-) diff --git a/BUILD/mdbci/README.md b/BUILD/mdbci/README.md index 58d034017..75858ff8a 100644 --- a/BUILD/mdbci/README.md +++ b/BUILD/mdbci/README.md @@ -4,6 +4,10 @@ MDBCI is a tool to manage virtual machines (VM). VM can be described in the simple JSON format. JSON templates can be found in [BUILD/mdbci/templates](templates) +MDBCI_VM_PATH have to be set before executing any MDBCI commands. +This variable points to the directory to store 'Vagrantfile's +for all VMs as well as all additional files (e.g. *network_config) + libvirt/qemu and AWS VMs are supported. See [MDBCI README](https://github.com/mariadb-corporation/mdbci#mariadb-continuous-integration-infrastructure-mdbci) for details. diff --git a/maxscale-system-test/mdbci/templates/big.json.template b/maxscale-system-test/mdbci/templates/big.json.template index 9592c5647..56c0330ee 100644 --- a/maxscale-system-test/mdbci/templates/big.json.template +++ b/maxscale-system-test/mdbci/templates/big.json.template @@ -4,10 +4,10 @@ "hostname" : "node000", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server1.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -17,10 +17,10 @@ "hostname" : "node001", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server2.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -29,10 +29,10 @@ "hostname" : "node002", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server3.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -41,10 +41,10 @@ "hostname" : "node003", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server4.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_004" : @@ -52,10 +52,10 @@ "hostname" : "node004", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server5.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_005" : @@ -63,10 +63,10 @@ "hostname" : "node005", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server6.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_006" : @@ -74,10 +74,10 @@ "hostname" : "node006", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server7.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_007" : @@ -85,10 +85,10 @@ "hostname" : "node007", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server8.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -98,9 +98,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server1.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -110,9 +110,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server2.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -122,9 +122,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server3.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -134,9 +134,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server4.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, diff --git a/maxscale-system-test/mdbci/templates/big15.json.template b/maxscale-system-test/mdbci/templates/big15.json.template index 5d50432d7..1297ea96a 100644 --- a/maxscale-system-test/mdbci/templates/big15.json.template +++ b/maxscale-system-test/mdbci/templates/big15.json.template @@ -4,10 +4,10 @@ "hostname" : "node_000", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server1.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -17,10 +17,10 @@ "hostname" : "node_001", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server2.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -29,10 +29,10 @@ "hostname" : "node_002", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server3.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -41,10 +41,10 @@ "hostname" : "node_003", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server4.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_004" : @@ -52,10 +52,10 @@ "hostname" : "node_004", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server5.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_005" : @@ -63,10 +63,10 @@ "hostname" : "node_005", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server6.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_006" : @@ -74,10 +74,10 @@ "hostname" : "node_006", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server7.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_007" : @@ -85,10 +85,10 @@ "hostname" : "node_007", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server8.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_008" : @@ -96,10 +96,10 @@ "hostname" : "node_008", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server9.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, "node_009" : @@ -107,65 +107,65 @@ "hostname" : "node_009", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server10.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, - "node_0010" : + "node_010" : { "hostname" : "node_0010", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server11.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, - "node_0011" : + "node_011" : { "hostname" : "node_0011", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server12.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, - "node_0012" : + "node_012" : { "hostname" : "node_0012", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server13.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, - "node_0013" : + "node_013" : { "hostname" : "node_0013", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server14.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, - "node_0014" : + "node_014" : { "hostname" : "node_0014", "box" : "centos_7_aws_large", "product" : { - "name": "###product###", - "version": "###version###", + "name": "${product}", + "version": "${version}", "cnf_template" : "server15.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -175,9 +175,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server1.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -187,9 +187,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server2.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -199,9 +199,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server3.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } }, @@ -211,9 +211,9 @@ "box" : "centos_7_aws", "product" : { "name": "galera", - "version": "###galera_version###", + "version": "${galera_version}", "cnf_template" : "galera_server4.cnf", - "cnf_template_path": "~/build-scripts/test-setup-scripts/cnf" + "cnf_template_path": "${cnf_path}" } },