diff options
| author |   Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-01-15 17:20:00 +0200 |
|---|---|---|
| committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-01-21 13:16:48 +0200 |
| commit | 133593ad30f5eaa8bddca89c191e334b5d7e8bbd (patch) | |
| tree | 7516fca99360c957015486545346ee2742ab0b66 /csit/plans/healthcheck | |
| parent | 9a44c20511157eb6bb35254712020c82cf786211 (diff) | |
Adjust CSIT for unified review verification
- enable use of locally built images (without nexus repo prefix)
in docker-compose.yaml
- use local docker images in CSIT by default
- remove forced docker image push of odlsli-alpine and dgbuilder
- remove unique docker tag usage
- this change requires https://gerrit.onap.org/r/c/ci-management/+/116920
to be merged to work correctly
Issue-ID: INT-1823
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Ibc391ef4fc9412665a26486af6fcc8c26096cc64
Diffstat (limited to 'csit/plans/healthcheck')
| -rw-r--r-- | csit/plans/healthcheck/setup.sh | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/csit/plans/healthcheck/setup.sh b/csit/plans/healthcheck/setup.sh index a34c44ab..327aba21 100644 --- a/csit/plans/healthcheck/setup.sh +++ b/csit/plans/healthcheck/setup.sh @@ -15,21 +15,14 @@ # limitations under the License. # # Modifications copyright (c) 2017 AT&T Intellectual Property -# Modifications copyright (c) 2020 Samsung Electronics Co., Ltd. +# Modifications copyright (c) 2020-2021 Samsung Electronics Co., Ltd. # export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) -export NEXUS_DOCKER_REPO="nexus3.onap.org:10001" -export NEXUS_USERNAME=docker -export NEXUS_PASSWD=docker export DMAAP_TOPIC=AUTO -if [ "$UNIQUE_DOCKER_TAG" == "" ]; then - export CCSDK_DOCKER_IMAGE_VERSION=latest -else - source "${WORKSPACE}/../version.properties" - export CCSDK_DOCKER_IMAGE_VERSION=${snapshot_version}-${UNIQUE_DOCKER_TAG} -fi +# TODO: any reason to ever read the version from version.properties? +export CCSDK_DOCKER_IMAGE_VERSION=latest if [ "$MTU" == "" ]; then export MTU="1450" @@ -42,11 +35,18 @@ cd $WORKSPACE/archives/yaml unset http_proxy https_proxy sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml -docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-alpine-image:$CCSDK_DOCKER_IMAGE_VERSION +# TODO: is there ever need to pull the images from Nexus? +# run-csit.sh already logins to nexus3.onap.org:10001 so this now works only if +# NEXUS_DOCKER_REPO is not defined at all (in which case the images must be available +# locally without any repository prefix) or if its value is nexus3.onap.org:10001 -docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION +if [ "$NEXUS_DOCKER_REPO" != "" ]; then + docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-alpine-image:$CCSDK_DOCKER_IMAGE_VERSION + docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION + # Add trailing slash for docker-compose + export NEXUS_DOCKER_REPO=$NEXUS_DOCKER_REPO/ +fi # start CCSDK containers with docker compose and configuration from docker-compose.yml curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose |