tcwg-update-llvmbot-containers.sh: Rework after adding jenkins job

Change-Id: Iab1d61be6884ce7fd355f2f43839980d99052b0f

1 files changed, 26 insertions, 33 deletions

diff --git a/tcwg-update-llvmbot-containers.sh b/tcwg-update-llvmbot-containers.sh
index 6fc05781..a67da34f 100755
--- a/tcwg-update-llvmbot-containers.sh
+++ b/tcwg-update-llvmbot-containers.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -ef -o pipefail
+set -euf -o pipefail
 
 scripts=$(dirname $0)
 . $scripts/jenkins-helpers.sh
@@ -8,15 +8,14 @@ convert_args_to_variables "$@"
 
 obligatory_variables NODE_NAME password
 
-distro_ver="${distro_ver-xenial}"
+distro="${distro-xenial}"
+master="${master-silent}"
 verbose="${verbose-true}"
 
-set -u
-
 if $verbose; then set -x; fi
 
-case "$NODE_NAME" in
-    tcwg-llvmbot-d05-01)
+case "$NODE_NAME:$master" in
+    tcwg-llvmbot-d05-01:normal)
 	bot_prefix=linaro-armv8-01-
 	bots=(
 	    aarch64-full
@@ -35,39 +34,33 @@ case "$NODE_NAME" in
 	    arm-quick
 	    arm-selfhost-neon
 	)
-	masters=(normal)
 	;;
-    tcwg-llvmbot-tk1-*)
+    tcwg-llvmbot-thx1-01:silent)
+	bot_prefix=linaro-thx1-01-
+	bots=(
+	    aarch64-full
+	    aarch64-quick
+	)
+	;;
+    tcwg-llvmbot-tk1-*:normal)
 	bot_prefix=""
 	bots=("$(echo "$NODE_NAME" | sed -e "s/tcwg-llvmbot-/linaro-/")")
-	masters=(normal)
-	;;
-    *)
-	echo "ERROR: Unknown NODE_NAME: $NODE_NAME"
-	exit 1
 	;;
 esac
 
-for master in "${masters[@]}"; do
-    case "$master" in
-	normal) distro="$distro_ver-tcwg-llvmprod" ;;
-	silent) distro="$distro_ver-tcwg-staging" ;;
+for bot in "${bots[@]}"; do
+    case "$bot" in
+	aarch64-*) arch="arm64" ;;
+	arm-*|linaro-tk1-*) arch="armhf" ;;
+	*) echo "ERROR: Unknown bot: $bot"; exit 1 ;;
     esac
+    image="linaro/ci-$arch-tcwg-llvmbot-ubuntu:$distro"
 
-    for bot in "${bots[@]}"; do
-	case "$bot" in
-	    aarch64-*) arch="arm64" ;;
-	    arm-*|linaro-tk1-*) arch="armhf" ;;
-	    *) echo "ERROR: Unknown bot: $bot"; exit 1 ;;
-	esac
-	image="linaro/ci-$arch-tcwg-llvmbot-ubuntu:$distro"
-
-	$scripts/tcwg-start-container.sh \
-	    --container "$master-${bot_prefix}$bot" \
-	    --image "$image" \
-	    --keep_existing "true" \
-	    --verbose "$verbose" \
-	    -- \
-	    $image $master ${bot_prefix}$bot $password
-    done
+    $scripts/tcwg-start-container.sh \
+	--container "$master-${bot_prefix}$bot" \
+	--image "$image" \
+	--keep_existing "true" \
+	--verbose "$verbose" \
+	-- \
+	$image $master ${bot_prefix}$bot $password
 done