diff options
Diffstat (limited to 'csit')
| -rw-r--r-- | csit/plans/sdnc/setup.sh | 9 | ||||
| -rwxr-xr-x | csit/plans/sdnr/setup.sh | 13 | ||||
| -rw-r--r-- | csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml | 2 | ||||
| -rw-r--r-- | csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml | 2 | ||||
| -rwxr-xr-x | csit/scripts/sdnr/sdnr-launch.sh | 10 |
5 files changed, 29 insertions, 7 deletions
diff --git a/csit/plans/sdnc/setup.sh b/csit/plans/sdnc/setup.sh index 2a418e6f..91783582 100644 --- a/csit/plans/sdnc/setup.sh +++ b/csit/plans/sdnc/setup.sh @@ -18,11 +18,18 @@ # Modifications copyright (c) 2021 AT&T Intellectual Property # -# Remove all dangling images +# Remove all dangling images and cleanup /w/workspace and /tmp docker image prune -f +echo "Remove onap repository artifacts" +rm -r /tmp/r/org/onap +echo "Remove all target folders from workspace" +rm -r $(find /w/workspace -name target) ###################### Netconf Simulator Setup ###################### +echo "Clean" +sudo apt clean + # Get integration/simulators if [ -d ${WORKSPACE}/archives/pnf-simulator ] then diff --git a/csit/plans/sdnr/setup.sh b/csit/plans/sdnr/setup.sh index 08babea5..e2942b37 100755 --- a/csit/plans/sdnr/setup.sh +++ b/csit/plans/sdnr/setup.sh @@ -18,6 +18,19 @@ # Modifications copyright (c) 2021 highstreet technologies GmbH Property # +# Remove all not needed images and clean workspace +sudo apt clean +docker rmi -f $(docker images onap/sdnc-dmaap-listener-image -a -q) +docker rmi -f $(docker images onap/sdnc-ueb-listener-image -a -q) +docker rmi -f $(docker images onap/onap/sdnc-web-image -a -q) +docker rmi -f $(docker images onap/sdnc-ansible-server-image -a -q) +docker rmi -f $(docker images onap/sdnc-aaf-image -a -q) +docker rmi -f $(docker images onap/ccsdk-ansible-server-image -a -q) +docker rmi -f $(docker images onap/ccsdk-odlsli-alpine-image -a -q) +docker images + +echo "Start plan sdnr" + source ${WORKSPACE}/scripts/sdnr/sdnr-launch.sh onap_dependent_components_launch nts_networkfunctions_launch ${WORKSPACE}/plans/sdnr/testdata/nts-networkfunctions.csv diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml index c8d1728a..5f3e8819 100644 --- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml +++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr-web.override.yaml @@ -20,7 +20,7 @@ services: integration: ipv4_address: ${TOPOLOGY_IP} sdnr-web: - image: ${NEXUS_DOCKER_REPO}/${NEXUS_DOCKER_WEB_IMAGE_NAME}:${NEXUS_DOCKER_IMAGE_TAG} + image: ${NEXUS_DOCKER_WEB_IMAGE_NAME}:${NEXUS_DOCKER_IMAGE_TAG} container_name: sdnr-web ports: - "${SDNC_WEB_PORT}:${SDNC_WEB_PORT}" diff --git a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml index 05724cff..b7c7e7b7 100644 --- a/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml +++ b/csit/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml @@ -1,7 +1,7 @@ version: "2.2" services: sdnr: - image: ${NEXUS_DOCKER_REPO}/${NEXUS_DOCKER_IMAGE_NAME}:${NEXUS_DOCKER_IMAGE_TAG} + image: ${NEXUS_DOCKER_IMAGE_NAME}:${NEXUS_DOCKER_IMAGE_TAG} container_name: sdnr ports: - "8181:8181" diff --git a/csit/scripts/sdnr/sdnr-launch.sh b/csit/scripts/sdnr/sdnr-launch.sh index e79a6ada..508feff3 100755 --- a/csit/scripts/sdnr/sdnr-launch.sh +++ b/csit/scripts/sdnr/sdnr-launch.sh @@ -28,8 +28,6 @@ sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose which docker-compose docker version docker-compose version -# WA: no space left on device. -docker system prune -f -a if [[ -z $WORKSPACE ]]; then CUR_PATH="`dirname \"$0\"`" # relative path @@ -101,8 +99,11 @@ function sdnr_launch() { function sdnr_launch_single_node() { - docker-compose $env_file -f ${WORKSPACE}/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml \ - -f ${WORKSPACE}/scripts/sdnr/docker-compose/$sdnrdb_compose_file \ + # Use locally build sdnr .. no need to pull + #docker-compose $env_file -f ${WORKSPACE}/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml \ + # -f ${WORKSPACE}/scripts/sdnr/docker-compose/$sdnrdb_compose_file \ + # pull + docker-compose $env_file -f ${WORKSPACE}/scripts/sdnr/docker-compose/$sdnrdb_compose_file \ pull docker-compose $env_file -f ${WORKSPACE}/scripts/sdnr/docker-compose/docker-compose-single-sdnr.yaml \ -f ${WORKSPACE}/scripts/sdnr/docker-compose/$sdnrdb_compose_file \ @@ -114,6 +115,7 @@ function sdnr_launch_single_node() { if [ $i == 50 ]; then echo "[ERROR] SDNC/R container not ready" docker ps -a + docker logs sdnr # exit 1 fi done |