tcwg-update-llvmbot-containers.sh: Update bot worker names

... and delete obsolete entries.

Change-Id: I92f4923ccd2365f0942c8d08ba32c8610eaaf997

1 files changed, 25 insertions, 46 deletions

diff --git a/tcwg-update-llvmbot-containers.sh b/tcwg-update-llvmbot-containers.sh
index 5164249f..5959c8a2 100755
--- a/tcwg-update-llvmbot-containers.sh
+++ b/tcwg-update-llvmbot-containers.sh
@@ -24,22 +24,10 @@ else
 fi
 
 case "$NODE_NAME:$master" in
-    tcwg-amp-03:silent)
-	bots=(
-	    linaro-aarch64-full
-	    linaro-aarch64-global-isel
-	)
-	;;
-    tcwg-amp-04:silent)
-	bots=(
-	    linaro-armv7-selfhost
-	    linaro-armv7-global-isel
-	)
-	;;
     tcwg-amp-05:normal)
 	bots=(
-	    linaro-arm-lldb
-	    linaro-aarch64-lldb
+	    linaro-lldb-arm-ubuntu
+	    linaro-lldb-aarch64-ubuntu
 	)
 	;;
     tcwg-amp-05:buildkite)
@@ -63,42 +51,33 @@ case "$NODE_NAME:$master" in
 	    linaro-armv8-libcxx-04
 	)
 	;;
-    tcwg-jade-01:normal)
+    tcwg-fx-02:normal)
 	bots=(
-	    linaro-aarch64-full
-	    linaro-aarch64-global-isel
-	    linaro-armv7-selfhost
-	    linaro-armv7-global-isel
-	    linaro-aarch64-lld
-	    linaro-aarch64-quick
-	    linaro-aarch64-flang-oot
-	    linaro-aarch64-flang-dylib
-	    linaro-aarch64-flang-sharedlibs
-	    linaro-aarch64-flang-release
-	    linaro-aarch64-flang-rel-assert
-	    linaro-armv8-lld
-	    linaro-armv7-lnt
-	    linaro-armv7-quick
-            linaro-aarch64-flang-debug
-            linaro-aarch64-flang-latest-clang
-            linaro-aarch64-flang-latest-gcc
+	    linaro-clang-aarch64-sve-vls
+	    linaro-clang-aarch64-sve-vls-2stage
 	)
 	;;
-    tcwg-llvmbot_d05-01:silent)
+    tcwg-jade-01:normal)
 	bots=(
-	    linaro-aarch64-lld
-	    linaro-aarch64-quick
-	    linaro-aarch64-flang-oot
-	    linaro-aarch64-flang-dylib
-	    linaro-aarch64-flang-sharedlibs
-            linaro-aarch64-flang-release
-            linaro-aarch64-flang-rel-assert
-	    linaro-armv8-lld
-	    linaro-armv7-lnt
-	    linaro-armv7-quick
-            linaro-aarch64-flang-debug
-            linaro-aarch64-flang-latest-clang
-            linaro-aarch64-flang-latest-gcc
+	    # Bots in same order as in llvm-zorg/.../workers.py
+	    linaro-clang-armv7-lnt
+	    linaro-clang-armv7-2stage
+	    linaro-clang-armv7-quick
+	    linaro-clang-armv7-global-isel
+	    linaro-clang-armv7-vfpv3-2stage
+	    linaro-clang-armv8-lld-2stage
+	    linaro-clang-aarch64-quick
+	    linaro-clang-aarch64-lld-2stage
+	    linaro-clang-aarch64-global-isel
+	    linaro-clang-aarch64-full-2stage
+	    linaro-flang-aarch64-dylib
+	    linaro-flang-aarch64-sharedlibs
+	    linaro-flang-aarch64-out-of-tree
+	    linaro-flang-aarch64-debug
+	    linaro-flang-aarch64-latest-clang
+	    linaro-flang-aarch64-release
+	    linaro-flang-aarch64-rel-assert
+	    linaro-flang-aarch64-latest-gcc
 	)
 	;;
     tcwg-llvmbot_tk1-09:silent)