summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xci/02-maasdeploy.sh1
-rwxr-xr-xci/cleanvm.sh30
2 files changed, 16 insertions, 15 deletions
diff --git a/ci/02-maasdeploy.sh b/ci/02-maasdeploy.sh
index bc719f88..005419b6 100755
--- a/ci/02-maasdeploy.sh
+++ b/ci/02-maasdeploy.sh
@@ -38,6 +38,7 @@ echo "$USER ALL=(ALL) NOPASSWD:ALL" > 90-joid-init
if [ -e /etc/sudoers.d/90-joid-init ]; then
sudo cp /etc/sudoers.d/90-joid-init 91-joid-init
sudo chown $USER:$USER 91-joid-init
+ sudo chmod 660 91-joid-init
sudo cat 90-joid-init >> 91-joid-init
sudo chown root:root 91-joid-init
sudo mv 91-joid-init /etc/sudoers.d/
diff --git a/ci/cleanvm.sh b/ci/cleanvm.sh
index d3345172..5277bf40 100755
--- a/ci/cleanvm.sh
+++ b/ci/cleanvm.sh
@@ -8,20 +8,20 @@ set -ex
echo " Cleanup Started ..."
./clean.sh
- virsh destroy opnfv-maas || true
- virsh destroy bootstrap || true
- virsh destroy node1-control || true
- virsh destroy node3-control || true
- virsh destroy node4-control || true
- virsh destroy node2-compute || true
- virsh destroy node5-compute || true
- virsh undefine opnfv-maas || true
- virsh undefine bootstrap || true
- virsh undefine node1-control || true
- virsh undefine node3-control || true
- virsh undefine node4-control || true
- virsh undefine node2-compute || true
- virsh undefine node5-compute || true
- sudo rm -rf /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true
+sudo virsh destroy opnfv-maas || true
+sudo virsh destroy bootstrap || true
+sudo virsh destroy node1-control || true
+sudo virsh destroy node3-control || true
+sudo virsh destroy node4-control || true
+sudo virsh destroy node2-compute || true
+sudo virsh destroy node5-compute || true
+sudo virsh undefine opnfv-maas || true
+sudo virsh undefine bootstrap || true
+sudo virsh undefine node1-control || true
+sudo virsh undefine node3-control || true
+sudo virsh undefine node4-control || true
+sudo virsh undefine node2-compute || true
+sudo virsh undefine node5-compute || true
+sudo rm -rf /var/lib/libvirt/images/opnfv-maas.img /var/lib/libvirt/images/bootstrap.img /var/lib/libvirt/images/node1-control.img /var/lib/libvirt/images/node3-control.img /var/lib/libvirt/images/node4-control.img /var/lib/libvirt/images/node2-compute.img /var/lib/libvirt/images/node5-compute.img || true
echo " Cleanup Finished ..."