aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHuabing Zhao <zhaohuabing@gmail.com>2019-03-18 19:27:04 +0800
committerHuabing Zhao <zhaohuabing@gmail.com>2019-03-18 19:28:46 +0800
commit4286d83c395570501953180e9f77a51c29b991f5 (patch)
tree86b68dcaaa230daa21ec77b9a97319a64164eaae
parent7d6213520ba27cea3b0375a5b8aebfe8d8abc52c (diff)
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>
-rw-r--r--plans/msb/iag-redirect-discovery/setup.sh4
-rw-r--r--plans/msb/rest-service/setup.sh4
-rw-r--r--plans/msb/sanity-check/setup.sh2
-rw-r--r--plans/msb/tcp-service/setup.sh4
4 files changed, 7 insertions, 7 deletions
diff --git a/plans/msb/iag-redirect-discovery/setup.sh b/plans/msb/iag-redirect-discovery/setup.sh
index 70614c5c..8d2d20d8 100644
--- 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 8d344db8..9e77e64a 100644
--- 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 e44f4371..d6e38fbe 100644
--- 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 ea2bafdf..2ebb830f 100644
--- 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}"