From 73ca25a1ee65e3ac21f996cdb39ed012567035dc Mon Sep 17 00:00:00 2001 From: Jason Lubken Date: Mon, 25 Mar 2024 14:46:08 -0400 Subject: [PATCH 1/2] Keep old configs, and cleanup completed junk periodic jobs --- cloud.production/cleanup.nomad.periodic.sh | 1 + cloud.staging/cleanup.nomad.periodic.sh | 1 + share/cleanup.nomad.periodic.sh | 11 +++++++++++ share/lib.sh | 14 +++++++++++++- 4 files changed, 26 insertions(+), 1 deletion(-) create mode 120000 cloud.production/cleanup.nomad.periodic.sh create mode 120000 cloud.staging/cleanup.nomad.periodic.sh create mode 100755 share/cleanup.nomad.periodic.sh diff --git a/cloud.production/cleanup.nomad.periodic.sh b/cloud.production/cleanup.nomad.periodic.sh new file mode 120000 index 0000000..2c3f5e5 --- /dev/null +++ b/cloud.production/cleanup.nomad.periodic.sh @@ -0,0 +1 @@ +../share/cleanup.nomad.periodic.sh \ No newline at end of file diff --git a/cloud.staging/cleanup.nomad.periodic.sh b/cloud.staging/cleanup.nomad.periodic.sh new file mode 120000 index 0000000..2c3f5e5 --- /dev/null +++ b/cloud.staging/cleanup.nomad.periodic.sh @@ -0,0 +1 @@ +../share/cleanup.nomad.periodic.sh \ No newline at end of file diff --git a/share/cleanup.nomad.periodic.sh b/share/cleanup.nomad.periodic.sh new file mode 100755 index 0000000..2fb60ce --- /dev/null +++ b/share/cleanup.nomad.periodic.sh @@ -0,0 +1,11 @@ +#!/usr/bin/env bash +set -euxo pipefail + +source vars.sh + +ips=( "${jump_ips[@]}" ) +for N in "${!ips[@]}"; +do + ip="${C}.${ips[$N]}" + cleanup_nomad_periodic $ip +done; diff --git a/share/lib.sh b/share/lib.sh index 9458fa6..46c258a 100644 --- a/share/lib.sh +++ b/share/lib.sh @@ -101,7 +101,8 @@ function patch () { local ip=$1 ssh -T -i ${ssh_key} "${user}@${ip}" << EOF set -euxo pipefail -sudo apt-get update && \ +export DEBIAN_FRONTEND=noninteractive +sudo apt-get -y upgrade -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" && \ sudo apt-get -y upgrade && \ sudo apt-get -y autoremove EOF @@ -301,6 +302,17 @@ fi; EOF } +function cleanup_nomad_periodic () { + # can be run on jump box with access to nomad binary + local ip=$1 + ssh -T -i ${ssh_key} "${user}@${ip}" << EOF +set -euxo pipefail +sudo apt-get install parallel +nomad job status | grep 'periodic-' awk '{print $1}' > jobs.txt +cat jobs.txt | parllel -j32 nomad stop -detach -purge +EOF +} + function restart_nomad () { local ip=$1 ssh -T -i ${ssh_key} "${user}@${ip}" << EOF From c63ca0ec2dbf96dcca4054d9b530d4c23afcf29f Mon Sep 17 00:00:00 2001 From: Jason Lubken Date: Mon, 10 Jun 2024 13:31:04 -0400 Subject: [PATCH 2/2] Update lib.sh --- share/lib.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/share/lib.sh b/share/lib.sh index 46c258a..70f2e7c 100644 --- a/share/lib.sh +++ b/share/lib.sh @@ -310,6 +310,7 @@ set -euxo pipefail sudo apt-get install parallel nomad job status | grep 'periodic-' awk '{print $1}' > jobs.txt cat jobs.txt | parllel -j32 nomad stop -detach -purge +rm jobs.txt EOF }