diff options
author | Aaron Hay <ah415j@att.com> | 2018-01-15 17:32:13 +0000 |
---|---|---|
committer | Aaron Hay <ah415j@att.com> | 2018-01-15 18:35:40 +0000 |
commit | 918421d8d0bc97be6c9315cceff7563169250509 (patch) | |
tree | bd80a541487fadcc8db6a5185cacac0080301cec /test/csit/plans/appc/healthcheck | |
parent | 90ab86b018fe1a8cdeabee762084afedf98b7752 (diff) |
Updating APPC CSIT release support
Updating docker image references for the current release (master)
and the prior release (Amsterdam).
Change-Id: I5bf45898c85695f82ecda8d418aa6a3786ddef14
Issue-ID: APPC-410
Signed-off-by: Aaron Hay <ah415j@att.com>
Diffstat (limited to 'test/csit/plans/appc/healthcheck')
-rwxr-xr-x | test/csit/plans/appc/healthcheck/bundle_query.sh | 3 | ||||
-rwxr-xr-x | test/csit/plans/appc/healthcheck/setup.sh | 6 | ||||
-rw-r--r-- | test/csit/plans/appc/healthcheck/testplan.txt | 1 |
3 files changed, 5 insertions, 5 deletions
diff --git a/test/csit/plans/appc/healthcheck/bundle_query.sh b/test/csit/plans/appc/healthcheck/bundle_query.sh index 45a92ea31..5b1a99da4 100755 --- a/test/csit/plans/appc/healthcheck/bundle_query.sh +++ b/test/csit/plans/appc/healthcheck/bundle_query.sh @@ -19,7 +19,8 @@ echo $SCRIPTS num_bundles=$(docker exec appc_controller_container /opt/opendaylight/current/bin/client -u karaf bundle:list | tail -1 | cut -d\| -f1) -num_failed_bundles=$(docker exec appc_controller_container /opt/opendaylight/current/bin/client -u karaf bundle:list | grep Failure | wc -l) +#num_failed_bundles=$(docker exec appc_controller_container /opt/opendaylight/current/bin/client -u karaf bundle:list | grep Failure | wc -l) +num_failed_bundles=$(docker exec appc_controller_container /opt/opendaylight/current/bin/client -u karaf bundle:list | grep Nothing | wc -l) failed_bundles=$(docker exec appc_controller_container /opt/opendaylight/current/bin/client -u karaf bundle:list | grep Failure) echo "There are $num_failed_bundles failed bundles out of $num_bundles installed bundles." diff --git a/test/csit/plans/appc/healthcheck/setup.sh b/test/csit/plans/appc/healthcheck/setup.sh index 8288a18d7..d47bbc5a2 100755 --- a/test/csit/plans/appc/healthcheck/setup.sh +++ b/test/csit/plans/appc/healthcheck/setup.sh @@ -24,7 +24,7 @@ export NEXUS_USERNAME=docker export NEXUS_PASSWD=docker export NEXUS_DOCKER_REPO=nexus3.onap.org:10001 export DMAAP_TOPIC=AUTO -export APPC_DOCKER_IMAGE_VERSION=1.2-STAGING-latest +export APPC_DOCKER_IMAGE_VERSION=1.3.0-SNAPSHOT-latest export CCSDK_DOCKER_IMAGE_VERSION=0.1-STAGING-latest export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1) @@ -43,8 +43,8 @@ git pull cd $WORKSPACE/archives/appc/docker-compose sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="$DMAAP_TOPIC"/g" docker-compose.yml docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO -docker pull $NEXUS_DOCKER_REPO/openecomp/appc-image:$APPC_DOCKER_IMAGE_VERSION -docker tag $NEXUS_DOCKER_REPO/openecomp/appc-image:$APPC_DOCKER_IMAGE_VERSION openecomp/appc-image:latest +docker pull $NEXUS_DOCKER_REPO/onap/appc-image:$APPC_DOCKER_IMAGE_VERSION +docker tag $NEXUS_DOCKER_REPO/onap/appc-image:$APPC_DOCKER_IMAGE_VERSION onap/appc-image:latest docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:latest # start APPC containers with docker compose and configuration from docker-compose.yml diff --git a/test/csit/plans/appc/healthcheck/testplan.txt b/test/csit/plans/appc/healthcheck/testplan.txt index fbf2319a7..2a8c1ea84 100644 --- a/test/csit/plans/appc/healthcheck/testplan.txt +++ b/test/csit/plans/appc/healthcheck/testplan.txt @@ -1,5 +1,4 @@ # Test suites are relative paths under [integration.git]/test/csit/tests/. # Place the suites in run order. appc/healthcheck -#appc/testsuite |