Azure: Squash a number of jobs and re-order slightlyTEST/azure-updates

To reduce overall job time, move a number of smaller jobs together.
These should still be safely under 1 hour total time, but reducing the
overall number of jobs should help with the queue slightly.

Signed-off-by: Tom Rini <trini@konsulko.com>

1 files changed, 15 insertions, 31 deletions

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 81913bc..b0ee542 100644
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -475,8 +475,8 @@ stages:
       # Use almost the same target division in .travis.yml, only merged
       # 3 small build jobs (arc/microblaze/xtensa) into one.
       matrix:
-        arc_microblaze_xtensa:
-          BUILDMAN: "arc microblaze xtensa"
+        arc_nios2_m68k_microblaze_xtensa:
+          BUILDMAN: "arc nios2 microblaze m68k xtensa"
         amlogic:
           BUILDMAN: "amlogic"
         arm11_arm7_arm920t_arm946es:
@@ -511,10 +511,10 @@ stages:
           BUILDMAN: "mx -x mx6,imx8,freescale,technexion,toradex"
         imx8_imx9:
           BUILDMAN: "imx8 imx9 -x engicam,technexion,toradex"
-        keymile:
-          BUILDMAN: "keymile"
+        keymiles_siemens_technexion:
+          BUILDMAN: "keymile siemens technexion"
         keystone2_keystone3:
-          BUILDMAN: "k2 k3"
+          BUILDMAN: "k2 k3 -x siemens,toradex"
         sandbox_asan:
           BUILDMAN: "sandbox"
           OVERRIDE: "-a ASAN"
@@ -525,16 +525,12 @@ stages:
           BUILDMAN: "samsung socfpga"
         sun4i:
           BUILDMAN: "sun4i"
-        sun5i:
-          BUILDMAN: "sun5i"
-        sun6i:
-          BUILDMAN: "sun6i"
+        sun5i_sun6i:
+          BUILDMAN: "sun5i sun6i"
         sun7i:
           BUILDMAN: "sun7i"
-        sun8i_32bit:
-          BUILDMAN: "sun8i&armv7"
-        sun8i_64bit:
-          BUILDMAN: "sun8i&aarch64"
+        sun8i:
+          BUILDMAN: "sun8i"
         sun9i:
           BUILDMAN: "sun9i"
         sun50i:
@@ -543,26 +539,16 @@ stages:
           BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,renesas,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,toradex,socfpga,k2,k3,zynq"
         sandbox_x86:
           BUILDMAN: "sandbox x86"
-        technexion:
-          BUILDMAN: "technexion"
-        kirkwood:
-          BUILDMAN: "kirkwood"
-        mvebu:
-          BUILDMAN: "mvebu"
-        m68k:
-          BUILDMAN: "m68k"
+        kirkwood_mvebu:
+          BUILDMAN: "kirkwood mvebu"
         mips:
           BUILDMAN: "mips"
         powerpc:
           BUILDMAN: "powerpc -x keymile"
-        siemens:
-          BUILDMAN: "siemens"
         tegra:
           BUILDMAN: "tegra -x toradex"
-        am33xx_no_siemens:
-          BUILDMAN: "am33xx -x siemens"
-        omap:
-          BUILDMAN: "omap"
+        am33xx_omap:
+          BUILDMAN: "am33xx omap -x siemens"
         uniphier:
           BUILDMAN: "uniphier"
         aarch64_catch_all:
@@ -573,10 +559,8 @@ stages:
           BUILDMAN: "rk&aarch64&rockchip"
         renesas:
           BUILDMAN: "renesas"
-        zynq:
-          BUILDMAN: "zynq&armv7"
-        zynqmp_versal:
-          BUILDMAN: "versal|zynqmp&aarch64"
+        zynq_zynqmp_versal:
+          BUILDMAN: "zynq&armv7 versal zynqmp&aarch64"
         riscv:
           BUILDMAN: "riscv"
     steps: