diff options
| author |   highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2021-08-10 16:53:05 +0200 |
|---|---|---|
| committer | highstreetherbert <herbert.eiselt@highstreet-technologies.com> | 2021-08-17 17:59:56 +0200 |
| commit | 063addc2cdac841d2646e8f87fff86f48c33e655 (patch) | |
| tree | c369b0cf445a3c0ea2507482a46d0f5387fcedeb /csit/scripts/sdnr | |
| parent | 96225a9516e146223c3ce10e1181f56ee672a865 (diff) | |
Fix root pom version definition
Change version range to version number
Issue-ID: SDNC-1587
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Change-Id: I3553270aa378c718e7e3ddd4564845d2cfc6e9a6
Signed-off-by: highstreetherbert <herbert.eiselt@highstreet-technologies.com>
Former-commit-id: e81e7ae9a71a33fd27904849929ffbc0c7269ce0
Diffstat (limited to 'csit/scripts/sdnr')
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 |