diff --git a/scripts/test/fixture.sh b/scripts/test/fixture.sh index 8c568ff2dc1ae36294af8484850bf3d79da9decd..872f89a54ddd4e6a4d3cc0d16c160a3570944fe7 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}"