Update consul version to 1.4.3

This commit depends on https://gerrit.onap.org/r/#/c/82566/
The csit jobs will fail until 82566 is merged

Change-Id: Ieea79b8f8e5fc78aa1249e4ae4aa2d631c98f551
Issue-ID: MSB-325
Signed-off-by: Huabing Zhao <zhaohuabing@gmail.com>

diff --git a/plans/msb/iag-redirect-discovery/setup.sh b/plans/msb/iag-redirect-discovery/setup.sh
index 70614c5..8d2d20d 100644 (file)
--- a/plans/msb/iag-redirect-discovery/setup.sh
+++ b/plans/msb/iag-redirect-discovery/setup.sh
@@ -18,7 +18,7 @@
 source ${SCRIPTS}/common_functions.sh
 
 #start msb
-docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
+docker run -d -p 8500:8500  --name msb_consul consul:1.4.3
 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
 echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
 
@@ -52,4 +52,4 @@ curl -X POST \
   "http://${MSB_IAG_IP}:80/api/microservices/v1/services"
 
 # Pass any variables required by Robot  suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}"
\ No newline at end of file
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}"

diff --git a/plans/msb/rest-service/setup.sh b/plans/msb/rest-service/setup.sh
index 8d344db..9e77e64 100644 (file)
--- a/plans/msb/rest-service/setup.sh
+++ b/plans/msb/rest-service/setup.sh
@@ -18,7 +18,7 @@
 source ${SCRIPTS}/common_functions.sh
 
 #start msb
-docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
+docker run -d -p 8500:8500  --name msb_consul consul:1.4.3
 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
 echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
 
@@ -52,4 +52,4 @@ curl -X POST \
   "http://${MSB_DISCOVERY_IP}:10081/api/microservices/v1/services"
 
 # Pass any variables required by Robot  suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}"
\ No newline at end of file
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v REST_EXAMPLE_IP:${REST_EXAMPLE_IP}"

diff --git a/plans/msb/sanity-check/setup.sh b/plans/msb/sanity-check/setup.sh
index e44f437..d6e38fb 100644 (file)
--- a/plans/msb/sanity-check/setup.sh
+++ b/plans/msb/sanity-check/setup.sh
@@ -18,7 +18,7 @@
 source ${SCRIPTS}/common_functions.sh
 
 #start msb
-docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
+docker run -d -p 8500:8500  --name msb_consul consul:1.4.3
 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
 echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
 

diff --git a/plans/msb/tcp-service/setup.sh b/plans/msb/tcp-service/setup.sh
index ea2bafd..2ebb830 100644 (file)
--- a/plans/msb/tcp-service/setup.sh
+++ b/plans/msb/tcp-service/setup.sh
@@ -18,7 +18,7 @@
 source ${SCRIPTS}/common_functions.sh
 
 #start msb
-docker run -d -p 8500:8500  --name msb_consul consul:0.9.3
+docker run -d -p 8500:8500  --name msb_consul consul:1.4.3
 MSB_CONSUL_IP=`get-instance-ip.sh msb_consul`
 echo MSB_CONSUL_IP=${MSB_CONSUL_IP}
 
@@ -50,4 +50,4 @@ curl -H "Content-Type: application/json" -X POST -d '{"serviceName": "ActiveMQ",
 
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v ACTIVEMQ_IP:${ACTIVEMQ_IP}"
\ No newline at end of file
+ROBOT_VARIABLES="-v MSB_IAG_IP:${MSB_IAG_IP} -v MSB_DISCOVERY_IP:${MSB_DISCOVERY_IP} -v ACTIVEMQ_IP:${ACTIVEMQ_IP}"