Skip to content
Snippets Groups Projects
Commit 5793f455 authored by Michael Boniface's avatar Michael Boniface
Browse files

updated repo root directory to be different on container to host

parent 84b9be0d
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 10 additions and 10 deletions
scripts/test/fixture.sh
+ 10
− 10
View file @ 5793f455
...@@ -23,7 +23,7 @@ create() { ...@@ -23,7 +23,7 @@ create() {
# copy flame clmc files into the root container # copy flame clmc files into the root container
echo "Copying files to rootfs" echo "Copying files to rootfs"
container_dir="/var/lib/lxc/"${service_name}"/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} mkdir -p ${container_vagrant_dir}
cp -f ${repo_root}/reporc "${container_vagrant_dir}" cp -f ${repo_root}/reporc "${container_vagrant_dir}"
cp -rf ${repo_root}/scripts ${container_vagrant_dir} cp -rf ${repo_root}/scripts ${container_vagrant_dir}
...@@ -43,11 +43,11 @@ create() { ...@@ -43,11 +43,11 @@ create() {
influxdb_url=$(echo $SERVICE | jq -r '.influxdb_url') influxdb_url=$(echo $SERVICE | jq -r '.influxdb_url')
database_name=$(echo $SERVICE | jq -r '.database_name') database_name=$(echo $SERVICE | jq -r '.database_name')
report_period=$(echo $SERVICE | jq -r '.report_period') report_period=$(echo $SERVICE | jq -r '.report_period')
cmd="${repo_root}/scripts/clmc-service/install.sh ${influxdb_url} ${database_name} ${report_period}" cmd="/vagrant/scripts/clmc-service/install.sh ${influxdb_url} ${database_name} ${report_period}"
lxc-attach -n ${service_name} -v REPO_ROOT=${repo_root} -- ${cmd} lxc-attach -n ${service_name} -v REPO_ROOT="/vagrant" -- ${cmd}
elif [ ${service_name} == "test-runner" ] elif [ ${service_name} == "test-runner" ]
then 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} lxc-attach -n ${service_name} -- ${cmd}
else else
# get container parameters # get container parameters
...@@ -62,12 +62,12 @@ create() { ...@@ -62,12 +62,12 @@ create() {
database_name=$(echo $SERVICE | jq -r '.database_name') database_name=$(echo $SERVICE | jq -r '.database_name')
# install service function specific software # install service function specific software
cmd=${repo_root}/src/test/clmctest/services/${sf_id}/install.sh cmd=/vagrant/src/test/clmctest/services/${sf_id}/install.sh
lxc-attach -n ${service_name} -v REPO_ROOT=${repo_root} -- ${cmd} lxc-attach -n ${service_name} -v REPO_ROOT="/vagrant" -- ${cmd}
# install telegraf # install telegraf
cmd=${repo_root}/scripts/clmc-agent/install.sh cmd=/vagrant/scripts/clmc-agent/install.sh
lxc-attach -n ${service_name} -v REPO_ROOT=${repo_root} -- ${cmd} lxc-attach -n ${service_name} -v REPO_ROOT="/vagrant" -- ${cmd}
# copy telegraf configuration templates # copy telegraf configuration templates
cp -f ${repo_root}/scripts/clmc-agent/telegraf.conf ${container_dir}/etc/telegraf/ cp -f ${repo_root}/scripts/clmc-agent/telegraf.conf ${container_dir}/etc/telegraf/
...@@ -76,9 +76,9 @@ create() { ...@@ -76,9 +76,9 @@ create() {
# replace telegraf template with container parameters # replace telegraf template with container parameters
# @todo do we really need both scripts to do this? # @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} 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} lxc-attach -n ${service_name} -- ${cmd}
# start telegraf # start telegraf
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment