From 73583ac875eab64220c538ce189a0cface05fdcb Mon Sep 17 00:00:00 2001
From: Brendan Creane <brendan@tigera.io>
Date: Thu, 30 Nov 2017 10:26:08 -0800
Subject: [PATCH] Pull the route reflector version indicated in versions.yml

---
 calico_node/Makefile                          | 1 +
 calico_node/tests/st/utils/route_reflector.py | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/calico_node/Makefile b/calico_node/Makefile
index 6b175606093..e535729a785 100644
--- a/calico_node/Makefile
+++ b/calico_node/Makefile
@@ -401,6 +401,7 @@ st: dist/calicoctl dist/calicoctl-v1.0.2 busybox.tar routereflector.tar calico-n
 	           -e DEBUG_FAILURES=$(DEBUG_FAILURES) \
 	           -e MY_IP=$(LOCAL_IP_ENV) \
 	           -e NODE_CONTAINER_NAME=$(NODE_CONTAINER_NAME) \
+	           -e RR_VER=$(RR_VER) \
 	           --rm -ti \
 	           -v /var/run/docker.sock:/var/run/docker.sock \
 	           -v $(SOURCE_DIR):/code \
diff --git a/calico_node/tests/st/utils/route_reflector.py b/calico_node/tests/st/utils/route_reflector.py
index 8d6f5f2563a..b3486399b01 100644
--- a/calico_node/tests/st/utils/route_reflector.py
+++ b/calico_node/tests/st/utils/route_reflector.py
@@ -50,6 +50,7 @@ def __enter__(self):
                 #
                 # See https://github.com/projectcalico/calico-bird/tree/feature-ipinip/build_routereflector
                 # for details.
+                rr_ver = os.getenv("RR_VER", "latest")
                 if os.getenv("ETCD_SCHEME", None) == "https":
                     # Etcd is running with SSL/TLS, pass the key values
                     rr.execute("docker run --privileged --net=host -d "
@@ -59,9 +60,9 @@ def __enter__(self):
                                "-e ETCD_CERT_FILE=%s "
                                "-e ETCD_KEY_FILE=%s "
                                "-v %s/certs:%s/certs "
-                               "calico/routereflector" %
+                               "calico/routereflector:%s" %
                                (ip_env, ETCD_HOSTNAME_SSL, ETCD_CA, ETCD_CERT,
-                                ETCD_KEY, CHECKOUT_DIR,CHECKOUT_DIR))
+                                ETCD_KEY, CHECKOUT_DIR, CHECKOUT_DIR, rr_ver))
                     rr.execute(r'curl --cacert %s --cert %s --key %s '
                                r'-L https://%s:2379/v2/keys/calico/bgp/v1/rr_v4/%s '
                                r'-XPUT -d value="{'
@@ -75,7 +76,7 @@ def __enter__(self):
                     rr.execute("docker run --privileged --net=host -d "
                            "--name rr %s "
                            "-e ETCD_ENDPOINTS=http://%s:2379 "
-                           "calico/routereflector" % (ip_env, get_ip()))
+                           "calico/routereflector:%s" % (ip_env, get_ip(), rr_ver))
                     rr.execute(r'curl -L http://%s:2379/v2/keys/calico/bgp/v1/rr_v4/%s '
                                r'-XPUT -d value="{'
                                  r'\"ip\":\"%s\",'