From 5793f455bcfce3e557cb04d186c406368c71840b Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Sat, 2 Jun 2018 23:32:43 +0100
Subject: [PATCH] updated repo root directory to be different on container to
host
---
scripts/test/fixture.sh | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/scripts/test/fixture.sh b/scripts/test/fixture.sh
index acc239e..f0a5e97 100755
--- a/scripts/test/fixture.sh
+++ b/scripts/test/fixture.sh
@@ -23,7 +23,7 @@ create() {
# copy flame clmc files into the root container
echo "Copying files to rootfs"
container_dir="/var/lib/lxc/"${service_name}"/rootfs"
- container_vagrant_dir=${container_dir}"${repo_root}"
+ container_vagrant_dir=${container_dir}"/vagrant"
mkdir -p ${container_vagrant_dir}
cp -f ${repo_root}/reporc "${container_vagrant_dir}"
cp -rf ${repo_root}/scripts ${container_vagrant_dir}
@@ -43,11 +43,11 @@ create() {
influxdb_url=$(echo $SERVICE | jq -r '.influxdb_url')
database_name=$(echo $SERVICE | jq -r '.database_name')
report_period=$(echo $SERVICE | jq -r '.report_period')
- cmd="${repo_root}/scripts/clmc-service/install.sh ${influxdb_url} ${database_name} ${report_period}"
- lxc-attach -n ${service_name} -v REPO_ROOT=${repo_root} -- ${cmd}
+ cmd="/vagrant/scripts/clmc-service/install.sh ${influxdb_url} ${database_name} ${report_period}"
+ lxc-attach -n ${service_name} -v REPO_ROOT="/vagrant" -- ${cmd}
elif [ ${service_name} == "test-runner" ]
then
- cmd=${repo_root}/src/test/clmctest/services/pytest/install.sh
+ cmd=/vagrant/src/test/clmctest/services/pytest/install.sh
lxc-attach -n ${service_name} -- ${cmd}
else
# get container parameters
@@ -62,12 +62,12 @@ create() {
database_name=$(echo $SERVICE | jq -r '.database_name')
# install service function specific software
- cmd=${repo_root}/src/test/clmctest/services/${sf_id}/install.sh
- lxc-attach -n ${service_name} -v REPO_ROOT=${repo_root} -- ${cmd}
+ cmd=/vagrant/src/test/clmctest/services/${sf_id}/install.sh
+ lxc-attach -n ${service_name} -v REPO_ROOT="/vagrant" -- ${cmd}
# install telegraf
- cmd=${repo_root}/scripts/clmc-agent/install.sh
- lxc-attach -n ${service_name} -v REPO_ROOT=${repo_root} -- ${cmd}
+ cmd=/vagrant/scripts/clmc-agent/install.sh
+ lxc-attach -n ${service_name} -v REPO_ROOT="/vagrant" -- ${cmd}
# copy telegraf configuration templates
cp -f ${repo_root}/scripts/clmc-agent/telegraf.conf ${container_dir}/etc/telegraf/
@@ -76,9 +76,9 @@ create() {
# replace telegraf template with container parameters
# @todo do we really need both scripts to do this?
- cmd=${repo_root}/scripts/clmc-agent/configure_template.sh
+ cmd=/vagrant/scripts/clmc-agent/configure_template.sh
lxc-attach -n ${service_name} -- ${cmd}
- cmd="${repo_root}/scripts/clmc-agent/configure.sh ${location} ${sfc_id} ${sfc_id_instance} ${sf_id} ${sf_id_instance} ${ipendpoint_id} ${sr_id} ${influxdb_url} ${database_name}"
+ cmd="/vagrant/scripts/clmc-agent/configure.sh ${location} ${sfc_id} ${sfc_id_instance} ${sf_id} ${sf_id_instance} ${ipendpoint_id} ${sr_id} ${influxdb_url} ${database_name}"
lxc-attach -n ${service_name} -- ${cmd}
# start telegraf
--
GitLab