aboutsummaryrefslogtreecommitdiffstats
path: root/plans
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2020-04-08 12:24:50 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-08 12:24:50 +0000
commit295b9221b5cd7f3fe160e5048d607e82675f321d (patch)
tree9722bbf23eaf48c54c354b761954bd6dbdd1f6b1 /plans
parent8f511c00515f70ae548fae14e84178f5c674fced (diff)
parent02ddc74730b76c6c76e0ff9a93f1a316a9ebd73f (diff)
Merge "Update CSIT to use Frankfurt images"
Diffstat (limited to 'plans')
-rwxr-xr-xplans/sdnc/healthcheck/setup.sh15
-rw-r--r--plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh35
-rw-r--r--plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh11
3 files changed, 32 insertions, 29 deletions
diff --git a/plans/sdnc/healthcheck/setup.sh b/plans/sdnc/healthcheck/setup.sh
index 2614bea3..a11a3aa5 100755
--- a/plans/sdnc/healthcheck/setup.sh
+++ b/plans/sdnc/healthcheck/setup.sh
@@ -24,8 +24,8 @@ export NEXUS_USERNAME=docker
export NEXUS_PASSWD=docker
export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.7-STAGING-latest
-export CCSDK_DOCKER_IMAGE_VERSION=0.6-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.8-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.7-STAGING-latest
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
@@ -96,12 +96,9 @@ TIME_OUT=1500
INTERVAL=60
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
+ response=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-
- if [ "$response" == "Level 100" ] ; then
+ if grep -q 'Level 100' <<< ${response}; then
echo SDNC karaf started in $TIME seconds
break;
fi
@@ -115,9 +112,9 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then
echo TIME OUT: karaf session not started in $TIME_OUT seconds... Could cause problems for testing activities...
fi
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
+response=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
- if [ "$response" == "Level 100" ] ; then
+if grep -q 'Level 100' <<< ${response} ; then
num_failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l)
failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure)
echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.
diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh b/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh
index 1bf40149..f77b5632 100644
--- a/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh
+++ b/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh
@@ -19,13 +19,15 @@
# Place the scripts in run order:
SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source ${WORKSPACE}/scripts/sdnc/script1.sh
-export DOCKER_SDNC_TAG=1.5.2
+export DOCKER_SDNC_TAG=1.8-STAGING-latest
export NEXUS_USERNAME=docker
export NEXUS_PASSWD=docker
export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.5.2
-export CCSDK_DOCKER_IMAGE_VERSION=0.4-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.8-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.7-STAGING-latest
+export SDNC_GERRIT_BRANCH=frankfurt
+export INTEGRATION_GERRIT_BRANCH=master
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
@@ -36,20 +38,20 @@ fi
# Clone SDNC repo to get docker-compose for SDNC
mkdir -p $WORKSPACE/archives/integration
cd $WORKSPACE/archives
-git clone -b dublin --single-branch --depth=1 http://gerrit.onap.org/r/integration.git integration
+git clone -b ${INTEGRATION_GERRIT_BRANCH} --single-branch --depth=1 http://gerrit.onap.org/r/integration.git integration
cd $WORKSPACE/archives/integration
git pull
HOST_IP_ADDR=localhost
# Clone SDNC repo to get docker-compose for SDNC
mkdir -p $WORKSPACE/archives/sdnc
cd $WORKSPACE/archives
-git clone -b master --single-branch --depth=1 http://gerrit.onap.org/r/sdnc/oam.git sdnc
+git clone -b ${SDNC_GERRIT_BRANCH} --single-branch --depth=1 http://gerrit.onap.org/r/sdnc/oam.git sdnc
cd $WORKSPACE/archives/sdnc
git pull
unset http_proxy https_proxy
cd $WORKSPACE/archives/sdnc/installation/src/main/yaml
-sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml
+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/sdnc-image:$DOCKER_SDNC_TAG
@@ -72,13 +74,16 @@ docker pull $NEXUS_DOCKER_REPO/onap/sdnc-dmaap-listener-image:$DOCKER_IMAGE_VERS
docker tag $NEXUS_DOCKER_REPO/onap/sdnc-dmaap-listener-image:$DOCKER_IMAGE_VERSION onap/sdnc-dmaap-listener-image:latest
CERT_SUBPATH=plans/sdnc/sdnc_netconf_tls_post_deploy/certs
+
export SDNC_CERT_PATH=${WORKSPACE}/${CERT_SUBPATH}
sed -i 's/sdnc_controller_container/sdnc_controller_container\n volumes: \n - $SDNC_CERT_PATH:\/opt\/opendaylight\/current\/certs/' docker-compose.yml
# start SDNC containers with docker compose and configuration from docker-compose.yml
docker-compose up -d
-cd $WORKSPACE/archives/integration/test/mocks/pnfsimulator
-./simulator.sh start&
+# PNF simulator has permission problems - creates files as root, which causes build to be unstable
+# Commenting it out for now, since netconf mount is not working anyway.
+# cd $WORKSPACE/archives/integration/test/mocks/pnfsimulator/pnfsimulator
+# docker-compose up -d
# WAIT 10 minutes maximum and test every 5 seconds if SDNC is up using HealthCheck API
TIME_OUT=1000
@@ -110,11 +115,9 @@ TIME_OUT=1500
INTERVAL=60
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
-docker exec sdnc_controller_container rm -f /opt/opendaylight/current/etc/host.key
+ response=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
- if [ "$response" == "Level 100" ] ; then
+ if grep -q 'Level 100' <<< ${response}; then
echo SDNC karaf started in $TIME seconds
break;
fi
@@ -128,11 +131,11 @@ if [ "$TIME" -ge "$TIME_OUT" ]; then
echo TIME OUT: karaf session not started in $TIME_OUT seconds... Could cause problems for testing activities...
fi
-response=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
+response=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client system:start-level)
- if [ "$response" == "Level 100" ] ; then
- num_failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l)
- failed_bundles=$(docker exec sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure)
+ if grep -q 'Level 100' <<< ${response}; then
+ num_failed_bundles=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure | wc -l)
+ failed_bundles=$(docker exec -ti sdnc_controller_container /opt/opendaylight/current/bin/client bundle:list | grep Failure)
echo There is/are $num_failed_bundles failed bundles out of $num_bundles installed bundles.
fi
diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh b/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh
index 97696ace..43294df5 100644
--- a/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh
+++ b/plans/sdnc/sdnc_netconf_tls_post_deploy/teardown.sh
@@ -17,6 +17,8 @@
# Modifications copyright (c) 2017 AT&T Intellectual Property
#
+docker cp sdnc_controller_container:/opt/opendaylight/data/log/karaf.log $WORKSPACE/archives/karaf.log
+docker cp sdnc_controller_container:/opt/opendaylight/data/log/installCerts.log $WORKSPACE/archives/installCerts.log
kill-instance.sh sdnc_controller_container
kill-instance.sh sdnc_dgbuilder_container
kill-instance.sh sdnc_portal_container
@@ -24,9 +26,10 @@ kill-instance.sh sdnc_db_container
kill-instance.sh sdnc_ueblistener_container
kill-instance.sh sdnc_dmaaplistener_container
kill-instance.sh sdnc_ansible_container
-kill-instance.sh netopeer
-kill-instance.sh sftp-server
-kill-instance.sh ftpes-server-vsftpd
-kill-instance.sh ftpes-server-pure-ftpd
+# Commented out startup of PNF simulator due to permission issues. Following lines can be uncommented
+# when/if that problem is resolved.
+#kill-instance.sh pnfsimulator_pnf-simulator_1
+#kill-instance.sh pnfsimulator_mongo-express_1
+#ill-instance.sh pnfsimulator_mongo_1
# $WORKSPACE/archives/appc deleted with archives folder when tests starts so we keep it at the end for debugging