From d6f0c1e12211b70f7d470fd9ede6b7af753241ba Mon Sep 17 00:00:00 2001 From: Venkata Harish K Kajur Date: Wed, 27 Sep 2017 10:42:28 -0400 Subject: Setup a basic traveral suite for starting Issue-ID: AAI-156 AAI-330 Change-Id: Ic95b8dcc80c2fd54a9f90c920b29c4b1aac4b7e7 Signed-off-by: Venkata Harish K Kajur Signed-off-by: Singhsumalee, Pete (ps2418) --- test/csit/plans/aai/resources/docker-compose.yml | 2 +- test/csit/plans/aai/resources/setup.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'test/csit/plans/aai/resources') diff --git a/test/csit/plans/aai/resources/docker-compose.yml b/test/csit/plans/aai/resources/docker-compose.yml index ab7823630..923f24dea 100644 --- a/test/csit/plans/aai/resources/docker-compose.yml +++ b/test/csit/plans/aai/resources/docker-compose.yml @@ -48,7 +48,7 @@ services: max-size: "30m" max-file: "5" aai.hbase.simpledemo.openecomp.org: - image: ${HBASE_IMAGE} + image: ${HBASE_IMAGE}:${HBASE_VERSION} hostname: aai.hbase.simpledemo.openecomp.org ports: - 2181:2181 diff --git a/test/csit/plans/aai/resources/setup.sh b/test/csit/plans/aai/resources/setup.sh index 30b4b29b8..915536be2 100644 --- a/test/csit/plans/aai/resources/setup.sh +++ b/test/csit/plans/aai/resources/setup.sh @@ -54,7 +54,10 @@ DOCKER_COMPOSE_CMD="docker-compose"; export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1); export DOCKER_REGISTRY="nexus3.onap.org:10001"; export AAI_HAPROXY_IMAGE="${AAI_HAPROXY_IMAGE:-aaionap/haproxy}"; -export HBASE_IMAGE="${HBASE_IMAGE:-harisekhon/hbase}"; +export HBASE_IMAGE="${HBASE_IMAGE:-aaionap/hbase}"; +export HBASE_VERSION="${HBASE_VERSION:-1.2.0}"; + +docker pull ${HBASE_IMAGE}:${HBASE_VERSION}; docker pull ${DOCKER_REGISTRY}/openecomp/aai-resources:${DOCKER_IMAGE_VERSION}; docker tag ${DOCKER_REGISTRY}/openecomp/aai-resources:${DOCKER_IMAGE_VERSION} ${DOCKER_REGISTRY}/openecomp/aai-resources:latest; -- cgit 1.2.3-korg