test-configs: update etcd, consul versions

etcd-io · Feb 21, 2017 · 1f6ff5f · 1f6ff5f
1 parent c9a133d
commit 1f6ff5f
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/test-configs/01-write-1M-keys-client-variable.yaml b/test-configs/01-write-1M-keys-client-variable.yaml
@@ -1,15 +1,15 @@
 test_title: Write 1M keys, 256-byte key, 1KB value value, clients 1 to 1,000
 test_description: |
   - Google Cloud Compute Engine
-  - 4 machines of 16 vCPUs + 30 GB Memory + 300 GB SSD (1 for client)
+  - 4 machines of 16 vCPUs + 60 GB Memory + 300 GB SSD (1 for client)
   - Ubuntu 16.10
-  - etcd v3.1 (Go 1.7.5)
+  - etcd v3.1.1 (Go 1.7.5)
   - Zookeeper r3.4.9
     - Java 8
     - javac 1.8.0_121
     - Java(TM) SE Runtime Environment (build 1.8.0_121-b13)
     - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode)
-  - Consul v0.7.4 (Go 1.7.5)
+  - Consul v0.7.5 (Go 1.7.5)
 
 # common control options for all client machines
 control:
@@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul]
 
 datatbase_id_to_test_group:
   etcdv3:
-    database_description: etcd v3.1 (Go 1.7.5)
+    database_description: etcd v3.1.1 (Go 1.7.5)
     peer_ips:
     - 10.240.0.20
     - 10.240.0.21
@@ -131,7 +131,7 @@ datatbase_id_to_test_group:
       step4_upload_logs: true
 
   consul:
-    database_description: Consul v0.7.4 (Go 1.7.5)
+    database_description: Consul v0.7.5 (Go 1.7.5)
     peer_ips:
     - 10.240.0.30
     - 10.240.0.31
@@ -167,7 +167,7 @@ datatbase_id_to_test_group:
 datatbase_id_to_test_data:
   etcdv3:
     # if not empty, all test data paths are prefixed
-    path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1-go1.7.5
+    path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/etcd-v3.1.1-go1.7.5
     client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv
     client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv
     client_latency_distribution_all_path: client-latency-distribution-all.csv
@@ -205,7 +205,7 @@ datatbase_id_to_test_data:
 
   consul:
     # if not empty, all test data paths are prefixed
-    path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.4-go1.7.5
+    path_prefix: 2017Q1-00-etcd-zookeeper-consul/01-write-1M-keys-client-variable/consul-v0.7.5-go1.7.5
     client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv
     client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv
     client_latency_distribution_all_path: client-latency-distribution-all.csv

diff --git a/test-configs/02-write-1M-keys-best-throughput.yaml b/test-configs/02-write-1M-keys-best-throughput.yaml
@@ -1,15 +1,15 @@
 test_title: Write 1M keys, 256-byte key, 1KB value, Best Throughput (etcd 1,000, Zookeeper 500, Consul 500 clients)
 test_description: |
   - Google Cloud Compute Engine
-  - 4 machines of 16 vCPUs + 30 GB Memory + 300 GB SSD (1 for client)
+  - 4 machines of 16 vCPUs + 60 GB Memory + 300 GB SSD (1 for client)
   - Ubuntu 16.10
-  - etcd v3.1 (Go 1.7.5)
+  - etcd v3.1.1 (Go 1.7.5)
   - Zookeeper r3.4.9
     - Java 8
     - javac 1.8.0_121
     - Java(TM) SE Runtime Environment (build 1.8.0_121-b13)
     - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode)
-  - Consul v0.7.4 (Go 1.7.5)
+  - Consul v0.7.5 (Go 1.7.5)
 
 # common control options for all client machines
 control:
@@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul]
 
 datatbase_id_to_test_group:
   etcdv3:
-    database_description: etcd v3.1 (Go 1.7.5)
+    database_description: etcd v3.1.1 (Go 1.7.5)
     peer_ips:
     - 10.240.0.20
     - 10.240.0.21
@@ -131,7 +131,7 @@ datatbase_id_to_test_group:
       step4_upload_logs: true
 
   consul:
-    database_description: Consul v0.7.4 (Go 1.7.5)
+    database_description: Consul v0.7.5 (Go 1.7.5)
     peer_ips:
     - 10.240.0.30
     - 10.240.0.31
@@ -167,7 +167,7 @@ datatbase_id_to_test_group:
 datatbase_id_to_test_data:
   etcdv3:
     # if not empty, all test data paths are prefixed
-    path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/etcd-v3.1-go1.7.5
+    path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/etcd-v3.1.1-go1.7.5
     client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv
     client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv
     client_latency_distribution_all_path: client-latency-distribution-all.csv
@@ -201,7 +201,7 @@ datatbase_id_to_test_data:
 
   consul:
     # if not empty, all test data paths are prefixed
-    path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/consul-v0.7.4-go1.7.5
+    path_prefix: 2017Q1-00-etcd-zookeeper-consul/02-write-1M-keys-best-throughput/consul-v0.7.5-go1.7.5
     client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv
     client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv
     client_latency_distribution_all_path: client-latency-distribution-all.csv

diff --git a/test-configs/03-write-too-many-keys.yaml b/test-configs/03-write-too-many-keys.yaml
@@ -1,15 +1,15 @@
 test_title: Write 3-million keys, 256-byte key, 1KB value, Best Throughput (etcd 1,000, Zookeeper 500, Consul 500 clients)
 test_description: |
   - Google Cloud Compute Engine
-  - 4 machines of 16 vCPUs + 30 GB Memory + 300 GB SSD (1 for client)
+  - 4 machines of 16 vCPUs + 60 GB Memory + 300 GB SSD (1 for client)
   - Ubuntu 16.10
-  - etcd v3.1 (Go 1.7.5)
+  - etcd v3.1.1 (Go 1.7.5)
   - Zookeeper r3.4.9
     - Java 8
     - javac 1.8.0_121
     - Java(TM) SE Runtime Environment (build 1.8.0_121-b13)
     - Java HotSpot(TM) 64-Bit Server VM (build 25.121-b13, mixed mode)
-  - Consul v0.7.4 (Go 1.7.5)
+  - Consul v0.7.5 (Go 1.7.5)
 
 # common control options for all client machines
 control:
@@ -36,7 +36,7 @@ all_database_id_list: [etcdv3, zookeeper, consul]
 
 datatbase_id_to_test_group:
   etcdv3:
-    database_description: etcd v3.1 (Go 1.7.5)
+    database_description: etcd v3.1.1 (Go 1.7.5)
     peer_ips:
     - 10.240.0.20
     - 10.240.0.21
@@ -131,7 +131,7 @@ datatbase_id_to_test_group:
       step4_upload_logs: true
 
   consul:
-    database_description: Consul v0.7.4 (Go 1.7.5)
+    database_description: Consul v0.7.5 (Go 1.7.5)
     peer_ips:
     - 10.240.0.30
     - 10.240.0.31
@@ -167,7 +167,7 @@ datatbase_id_to_test_group:
 datatbase_id_to_test_data:
   etcdv3:
     # if not empty, all test data paths are prefixed
-    path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-too-many-keys/etcd-v3.1-go1.7.5
+    path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-too-many-keys/etcd-v3.1.1-go1.7.5
     client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv
     client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv
     client_latency_distribution_all_path: client-latency-distribution-all.csv
@@ -201,7 +201,7 @@ datatbase_id_to_test_data:
 
   consul:
     # if not empty, all test data paths are prefixed
-    path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-too-many-keys/consul-v0.7.4-go1.7.5
+    path_prefix: 2017Q1-00-etcd-zookeeper-consul/03-write-too-many-keys/consul-v0.7.5-go1.7.5
     client_system_metrics_interpolated_path: client-system-metrics-interpolated.csv
     client_latency_throughput_timeseries_path: client-latency-throughput-timeseries.csv
     client_latency_distribution_all_path: client-latency-distribution-all.csv

diff --git a/test-configs/install-consul.sh b/test-configs/install-consul.sh
@@ -2,7 +2,7 @@
 set -e
 
 rm -f /tmp/consul.zip
-curl -sf -o /tmp/consul.zip https://releases.hashicorp.com/consul/0.7.4/consul_0.7.4_linux_amd64.zip
+curl -sf -o /tmp/consul.zip https://releases.hashicorp.com/consul/0.7.5/consul_0.7.5_linux_amd64.zip
 
 rm -f ${GOPATH}/bin/consul
 unzip /tmp/consul.zip -d ${GOPATH}/bin

diff --git a/test-configs/install-etcd.sh b/test-configs/install-etcd.sh
@@ -33,7 +33,7 @@ cp ${GOPATH}/src/${GIT_PATH}/bin/etcdctl ${GOPATH}/bin/etcdctl
 sudo cp ${GOPATH}/src/${GIT_PATH}/bin/etcdctl /etcdctl
 COMMENT
 
-ETCD_VER=v3.1.0
+ETCD_VER=v3.1.1
 
 GOOGLE_URL=https://storage.googleapis.com/etcd
 GITHUB_URL=https://github.com/coreos/etcd/releases/download