summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ansible/hosts2
-rw-r--r--ansible/riki-dev.yml (renamed from ansible/rikiwiki-dev.yml)2
-rwxr-xr-xansible/stamina-recreate-and-provision-all.sh11
-rwxr-xr-xansible/stamina-vms.sh13
4 files changed, 16 insertions, 12 deletions
diff --git a/ansible/hosts b/ansible/hosts
index 4348c29..6b71257 100644
--- a/ansible/hosts
+++ b/ansible/hosts
@@ -33,7 +33,7 @@ obnam-dev
openpgp-ca-dev
openpgp-card-dev
python-mess
-rikiwiki-dev
+riki-dev
roadmap-dev
rust-dev
sequoia-dev
diff --git a/ansible/rikiwiki-dev.yml b/ansible/riki-dev.yml
index 79c7139..92dc64b 100644
--- a/ansible/rikiwiki-dev.yml
+++ b/ansible/riki-dev.yml
@@ -1,4 +1,4 @@
-- hosts: rikiwiki-dev
+- hosts: riki-dev
remote_user: debian
become: yes
roles:
diff --git a/ansible/stamina-recreate-and-provision-all.sh b/ansible/stamina-recreate-and-provision-all.sh
new file mode 100755
index 0000000..b2e83cb
--- /dev/null
+++ b/ansible/stamina-recreate-and-provision-all.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -euo pipefail
+
+echo "vmadm recreate all VMs"
+chronic ssh stamina 'vmadm recreate ansibleness/vmadm/stamina/*.yaml'
+echo "waiting to see if all VMs stay up"
+sleep 3m
+ssh stamina virsh list --all | grep -v running >/dev/null
+echo "provision all VMs"
+chronic ./stamina-vms.sh
diff --git a/ansible/stamina-vms.sh b/ansible/stamina-vms.sh
index 30fe486..21a856b 100755
--- a/ansible/stamina-vms.sh
+++ b/ansible/stamina-vms.sh
@@ -3,20 +3,13 @@
set -eu
playbooks="
-clab-dev.yml
debian-ansible-dev.yml
-ewww-dev.yml
-ewww-test.yml
icktool.yml
-jt-dev.yml
obnam-bench.yml
obnam-dev.yml
openpgp-ca-dev.yml
openpgp-card-dev.yml
-python-mess.yml
-rikiwiki-dev.yml
-roadmap-dev.yml
-rust-dev.yml
+riki-dev.yml
sequoia-dev.yml
sequoia-web.yml
sshca-dev.yml
@@ -29,5 +22,5 @@ web.yml
parallel chronic ./run-playbook -- $playbooks
-#cd "$HOME/pers/ick/ick2-ansible"
-#chronic ./run-workers.sh ci-prod-controller.vm.liw.fi
+cd "$HOME/pers/ick/ick2-ansible"
+chronic ./run-workers.sh ci-prod-controller.vm.liw.fi