From 942693a659f51cbb0308ee5cf7924b233a72ec27 Mon Sep 17 00:00:00 2001 From: Anna Schumaker Date: Tue, 7 Dec 2021 11:36:10 -0500 Subject: [PATCH] Create an install-scripts.zsh script To copy over the things we need on remote machines. I also update cthon.zsh to copy over a setup script. Signed-off-by: Anna Schumaker --- completions/_install-scripts.zsh | 8 ++++++++ cthon.zsh | 13 ++++--------- install-scripts.zsh | 17 +++++++++++++++++ setup-cthon.zsh | 19 +++++++++++++++++++ 4 files changed, 48 insertions(+), 9 deletions(-) create mode 100644 completions/_install-scripts.zsh create mode 100755 install-scripts.zsh create mode 100755 setup-cthon.zsh diff --git a/completions/_install-scripts.zsh b/completions/_install-scripts.zsh new file mode 100644 index 0000000..7c63557 --- /dev/null +++ b/completions/_install-scripts.zsh @@ -0,0 +1,8 @@ +#compdef install-scripts.zsh + +function _install_scripts.zsh() { + _arguments \ + '*:remote host: _alternative + "hosts:hosts: _ssh_hosts" + "domains:domains:($(virsh list --all --name))"' +} diff --git a/cthon.zsh b/cthon.zsh index 5096161..b4f48e5 100755 --- a/cthon.zsh +++ b/cthon.zsh @@ -32,18 +32,13 @@ fi if [ ${#KRB5} -gt 0 ]; then RUN_CTHON="$RUN_CTHON --dokrb5" fi -echo -ssh ${CLIENT[-1]} "sudo mkdir -p ${MOUNTPOINT[-1]}" -ssh ${CLIENT[-1]} "sudo mount -o sec=sys ${SERVER[-1]}:${EXPORT[-1]} ${MOUNTPOINT[-1]}" -TRAPEXIT() { ssh ${CLIENT[-1]} "sudo umount ${MOUNTPOINT[-1]}" } -ssh ${CLIENT[-1]} "$RUN_CTHON --mkdirs ${MOUNTPOINT[-1]}/$USER/ 2>&1" | python -u $COLOR -ssh ${CLIENT[-1]} "sudo chmod -R 777 ${MOUNTPOINT[-1]}/$USER/" -TRAPEXIT() { ; } -ssh ${CLIENT[-1]} "sudo umount ${MOUNTPOINT[-1]}" +echo +$BIN/install-scripts.zsh ${CLIENT[-1]} +ssh ${CLIENT[-1]} "sudo setup-cthon.zsh ${SERVER[-1]} ${EXPORT[-1]} ${MOUNTPOINT[-1]} $USER" | python -u $COLOR echo # # Run tests # -ssh client "$RUN_CTHON --server ${SERVER[-1]} --serverdir ${EXPORT[-1]}/$USER 2>&1" | python -u $COLOR +ssh ${CLIENT[-1]} "$RUN_CTHON --server ${SERVER[-1]} --serverdir ${EXPORT[-1]}/$USER 2>&1" | python -u $COLOR diff --git a/install-scripts.zsh b/install-scripts.zsh new file mode 100755 index 0000000..6aa2dd9 --- /dev/null +++ b/install-scripts.zsh @@ -0,0 +1,17 @@ +#!/bin/zsh +BIN=$HOME/bin +SCRIPTS=(grub-list.zsh setup-cthon.zsh) + +function install_script() { + ssh $1 mkdir -p bin/ + echo -n "$2 Copying files ..." + for script in $SCRIPTS; do + scp -q $BIN/$script $1:bin/ + done + echo " done" +} + +tags=($(python $BIN/colors/vm.py $*)) +for ((i=1; i<=${#@}; i++)); do + install_script ${@[i]} ${tags[i]} +done diff --git a/setup-cthon.zsh b/setup-cthon.zsh new file mode 100755 index 0000000..3955732 --- /dev/null +++ b/setup-cthon.zsh @@ -0,0 +1,19 @@ +#!/bin/zsh +SERVER=$1 +EXPORT=$2 +MOUNTPOINT=$3 +USER=$4 + +if [ "$#" -lt 4 ]; then + echo "Usage: $0 {server} {export} {mountpoint} {user}" + exit 1 +fi + +TRAPEXIT() { + umount $MOUNTPOINT +} + +mkdir -p $MOUNTPOINT +mount -o sec=sys $SERVER:$EXPORT $MOUNTPOINT +cd /home/$USER/cthon04 && ./runcthon --rdma --mkdirs $MOUNTPOINT/$USER +chmod 777 $MOUNTPOINT/$USER