From a1ca634c6301c0e9b612f8d7fc5809ce9cee6575 Mon Sep 17 00:00:00 2001
From: Michael Boniface <mjb@it-innovation.soton.ac.uk>
Date: Tue, 9 Oct 2018 18:48:18 +0100
Subject: [PATCH] fixing fixtures so that it is consitent with openstack
deployment
---
scripts/test/fixture.sh | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/scripts/test/fixture.sh b/scripts/test/fixture.sh
index 8c568ff..872f89a 100755
--- a/scripts/test/fixture.sh
+++ b/scripts/test/fixture.sh
@@ -31,12 +31,12 @@ create() {
# copy flame clmc files into the root container
echo "Copying files to rootfs"
container_dir="/var/lib/lxd/containers/"${service_name}"/rootfs"
- 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}
- cp -rf ${repo_root}/src ${container_vagrant_dir}
- chown -R 100000:100000 ${container_vagrant_dir}
+ container_repo_root=${container_dir}"/opt/clmc"
+ mkdir -p ${container_repo_root}
+ cp -f ${repo_root}/reporc ${container_repo_root}
+ cp -rf ${repo_root}/scripts ${container_repo_root}
+ cp -rf ${repo_root}/src ${container_repo_root}
+ chown -R 100000:100000 ${container_repo_root}
# start the container
echo "Starting: ${service_name}"
@@ -50,9 +50,9 @@ create() {
# provision software into each container
echo "Provisioning: ${service_name}"
if [ ${service_name} == "clmc-service" ]; then
- cmd="/vagrant/scripts/clmc-service/install.sh"
+ cmd="/opt/clmc/scripts/clmc-service/install.sh"
echo "Provisioning command ${cmd}"
- lxc exec ${service_name} --env REPO_ROOT="/vagrant" --env SFEMC_FQDN="sfemc.localhost" -- ${cmd}
+ lxc exec ${service_name} --env REPO_ROOT="/opt/clmc" --env SFEMC_FQDN="sfemc.localhost" -- ${cmd}
exit_code=$?
if [ $exit_code != 0 ]; then
echo "clmc-service installation failed with exit code ${exit_code}"
--
GitLab