summaryrefslogtreecommitdiffstats
path: root/ocata
diff options
context:
space:
mode:
authorGuo Ruijing <ruijing.guo@intel.com>2017-09-21 03:11:27 -0700
committerGuo Ruijing <ruijing.guo@intel.com>2017-09-21 04:21:57 -0700
commitcecc352b211aa4d93751067b063bf9ea90021ca5 (patch)
tree1361e72f921ed916ca63267f49ea933fd14a1e55 /ocata
parent0e5ad74ecea89ffad16b9fa00558b863e4573ed2 (diff)
remove docker build workaroud in function test
Change-Id: I4167b423319a1b6c66f232951c5084b7f854d577 Issue-Id: MULTICLOUD-95 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com>
Diffstat (limited to 'ocata')
-rw-r--r--ocata/vagrant/test/Dockerfile2
-rw-r--r--ocata/vagrant/test/run.sh32
-rw-r--r--ocata/vagrant/test/test_multicloud.sh1
3 files changed, 0 insertions, 35 deletions
diff --git a/ocata/vagrant/test/Dockerfile b/ocata/vagrant/test/Dockerfile
index f956b566..33d1a18a 100644
--- a/ocata/vagrant/test/Dockerfile
+++ b/ocata/vagrant/test/Dockerfile
@@ -3,5 +3,3 @@ FROM multicloud-ocata:latest
RUN apt-get update && \
apt-get install -y vim
ADD extsys.py /opt/ocata/lib/newton/newton/pub/msapi/extsys.py
-ADD run.sh /opt/ocata/run.sh
-RUN chmod 755 /opt/ocata/run.sh
diff --git a/ocata/vagrant/test/run.sh b/ocata/vagrant/test/run.sh
deleted file mode 100644
index 446172b4..00000000
--- a/ocata/vagrant/test/run.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2017 Wind River Systems, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at:
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-
-#!/bin/bash
-
-sed -i "s/MSB_SERVICE_ADDR =.*/MSB_SERVICE_ADDR = \"${MSB_ADDR}\"/g" ocata/pub/config/config.py
-sed -i "s/MSB_SERVICE_PORT =.*/MSB_SERVICE_PORT = \"${MSB_PORT}\"/g" ocata/pub/config/config.py
-sed -i "s/AAI_ADDR =.*/AAI_ADDR = \"${AAI_ADDR}\"/g" ocata/pub/config/config.py
-sed -i "s/AAI_PORT =.*/AAI_PORT = \"${AAI_PORT}\"/g" ocata/pub/config/config.py
-sed -i "s/AAI_SCHEMA_VERSION =.*/AAI_SCHEMA_VERSION = \"${AAI_SCHEMA_VERSION}\"/g" ocata/pub/config/config.py
-sed -i "s/AAI_USERNAME =.*/AAI_USERNAME = \"${AAI_USERNAME}\"/g" ocata/pub/config/config.py
-sed -i "s/AAI_PASSWORD =.*/AAI_PASSWORD = \"${AAI_PASSWORD}\"/g" ocata/pub/config/config.py
-
-memcached -d -m 2048 -u root -c 1024 -p 11211 -P /tmp/memcached1.pid
-export PYTHONPATH=lib/newton
-nohup python manage.py runserver 0.0.0.0:9006 2>&1 &
-
-while [ ! -f logs/runtime_ocata.log ]; do
- sleep 1
-done
-
-tail -F logs/runtime_ocata.log
-
diff --git a/ocata/vagrant/test/test_multicloud.sh b/ocata/vagrant/test/test_multicloud.sh
index 24661554..9206f310 100644
--- a/ocata/vagrant/test/test_multicloud.sh
+++ b/ocata/vagrant/test/test_multicloud.sh
@@ -7,7 +7,6 @@ sudo apt-get install -y docker.io
cd /openstack/ocata/docker
sudo docker build -t multicloud-ocata:latest .
cd /vagrant/test
-cp /openstack/ocata/run.sh .
sudo docker build -t multicloud-ocata-test:latest .
sudo docker network create --subnet=172.16.77.0/24 onap
sudo docker run -d -t --name ocata-test --network onap --ip 172.16.77.40 -e MSB_ADDR=172.16.77.40 -e MSB_PORT=9006 multicloud-ocata-test