aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorYuli Shlosberg <ys9693@att.com>2017-10-29 10:20:33 +0200
committerYuli Shlosberg <ys9693@att.com>2017-10-29 15:51:03 +0200
commitcb5dca2aa106df5ed106a02465c30883ae9003fb (patch)
treec23b10bd181ba4b6e384c8e0298c764744edaebe /test
parentd948fb209159ef9def00161d45d353b181373412 (diff)
fix nightly setup script
Change-Id: I0543a822735c984a232de695cb3251ce9dfc8ac1 Issue-Id: SDC-521 Signed-off-by: Yuli Shlosberg <ys9693@att.com>
Diffstat (limited to 'test')
-rw-r--r--test/csit/plans/sdc/nightly/setup.sh3
-rw-r--r--test/csit/scripts/sdc/clone_and_setup_sdc_data.sh2
-rw-r--r--test/csit/scripts/sdc/clone_and_setup_sdc_data.sh.orig67
3 files changed, 4 insertions, 68 deletions
diff --git a/test/csit/plans/sdc/nightly/setup.sh b/test/csit/plans/sdc/nightly/setup.sh
index 3e4e66024..ac7a7f3f4 100644
--- a/test/csit/plans/sdc/nightly/setup.sh
+++ b/test/csit/plans/sdc/nightly/setup.sh
@@ -19,6 +19,9 @@
# Place the scripts in run order:
+mkdir ${WORKSPACE}/archives
+chmod -R 777 ${WORKSPACE}/archives
+
source ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh
source ${WORKSPACE}/test/csit/scripts/sdc/start_sdc_containers.sh
diff --git a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh
index c78ffe37c..5dbfb5fc2 100644
--- a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh
+++ b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh
@@ -34,7 +34,7 @@ ls -lR ${WORKSPACE}/data/logs/
cd ${WORKSPACE}/data/clone
-git clone --depth 1 http://gerrit.onap.org/r/sdc -b master
+git clone --depth 1 http://gerrit.onap.org/r/sdc -b ${GERRIT_BRANCH}
chmod -R 777 ${WORKSPACE}/data/clone
diff --git a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh.orig b/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh.orig
deleted file mode 100644
index d54d513a8..000000000
--- a/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh.orig
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-#
-# ============LICENSE_START=======================================================
-# ONAP CLAMP
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights
-# reserved.
-# ================================================================================
-# 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.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END============================================
-# ===================================================================
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
-
-echo "This is ${WORKSPACE}/test/csit/scripts/sdc/clone_and_setup_sdc_data.sh"
-
-# Clone sdc enviroment template
-mkdir -p ${WORKSPACE}/data/environments/
-mkdir -p ${WORKSPACE}/data/clone/
-mkdir -p ${WORKSPACE}/data/logs/BE/SDC/SDC-BE
-mkdir -p ${WORKSPACE}/data/logs/FE/SDC/SDC-FE
-chmod -R 777 ${WORKSPACE}/data/logs
-<<<<<<< HEAD
-=======
-ls -lR ${WORKSPACE}/data/logs/
->>>>>>> debug csit sanity failure
-
-
-cd ${WORKSPACE}/data/clone
-git clone --depth 1 http://gerrit.onap.org/r/sdc -b master
-
-chmod -R 775 ${WORKSPACE}/data/
-
-# set enviroment variables
-
-export ENV_NAME='CSIT'
-export MR_IP_ADDR='10.0.0.1'
-
-ifconfig
-
-#if [ -e /opt/config/public_ip.txt ]
-# then
-# IP_ADDRESS=$(cat /opt/config/public_ip.txt)
-# else
-# IP_ADDRESS=$(ifconfig ens3 | grep "inet addr" | tr -s ' ' | cut -d' ' -f3 | cut -d':' -f2)
-# fi
-
-IP_ADDRESS=`ip route get 8.8.8.8 | awk '/src/{ print $7 }'`
-export HOST_IP=$IP_ADDRESS
-
-
- cat ${WORKSPACE}/data/clone/sdc/sdc-os-chef/environments/Template.json | sed "s/yyy/"$IP_ADDRESS"/g" > ${WORKSPACE}/data/environments/$ENV_NAME.json
- sed -i "s/xxx/"$ENV_NAME"/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
- sed -i "s/\"ueb_url_list\":.*/\"ueb_url_list\": \""$MR_IP_ADDR","$MR_IP_ADDR"\",/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
- sed -i "s/\"fqdn\":.*/\"fqdn\": [\""$MR_IP_ADDR"\", \""$MR_IP_ADDR"\"]/g" ${WORKSPACE}/data/environments/$ENV_NAME.json
-
-