Merge pull request #126 from graywolf-at-work/enable_etcd_3.3.x_in_tr…

…avis Enable etcd 3.3.x in travis
davissp14 · Jan 21, 2019 · 197d6f4 · 197d6f4
2 parents bbb2e33 + ed4b00c
commit 197d6f4
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,11 +5,9 @@ rvm:
   - 2.3.8
 
 env:
-  - ETCD_VERSION=v3.1.20
-  - ETCD_VERSION=v3.2.25
-# v3.3.10 is not working for whatever reason (at least in travis, spec passes
-# locally for me)
-#  - ETCD_VERSION=v3.3.10
+  - ETCD_VERSION_TO_TEST=v3.1.20
+  - ETCD_VERSION_TO_TEST=v3.2.25
+  - ETCD_VERSION_TO_TEST=v3.3.10
 
 install:
     - bundle install

diff --git a/Rakefile b/Rakefile
@@ -1,7 +1,8 @@
 # frozen_string_literal: true
 
-ETCD_VERSION = ENV["ETCD_VERSION"] || "v3.2.0"
-ETCD_URL = "https://github.com/coreos/etcd/releases/download/#{ETCD_VERSION}/etcd-#{ETCD_VERSION}-linux-amd64.tar.gz"
+ETCD_VERSION = ENV["ETCD_VERSION_TO_TEST"] || "v3.2.0"
+ETCD_URL = "https://github.com/coreos/etcd/releases/download/" \
+           "#{ETCD_VERSION}/etcd-#{ETCD_VERSION}-linux-amd64.tar.gz"
 
 require "tmpdir"