diff options
Diffstat (limited to 'csit/scripts')
3 files changed, 8 insertions, 6 deletions
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 |