diff options
| author |   Fu Jinhua <fu.jinhua@zte.com.cn> | 2017-09-29 01:10:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-09-29 01:10:23 +0000 |
| commit | 065d88d2ef8d7cfa7b38d2a6e53329524a198591 (patch) | |
| tree | 13cda9fc143c784618477671cd214fba7b4aa444 /test/csit/plans/aai/resources | |
| parent | 35921f6c42432336777607d1b2ff53191adaf420 (diff) | |
| parent | d6f0c1e12211b70f7d470fd9ede6b7af753241ba (diff) | |
Merge "Setup a basic traveral suite for starting"
Diffstat (limited to 'test/csit/plans/aai/resources')
| -rw-r--r-- | test/csit/plans/aai/resources/docker-compose.yml | 2 | ||||
| -rw-r--r-- | test/csit/plans/aai/resources/setup.sh | 5 |
2 files changed, 5 insertions, 2 deletions
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; |