Azure: Rework our Rockchip jobs slightly

Currently the 64bit "rk" job is close to and sometimes goes over the job
time limit.  Let us rework this in to one job for "rk" and "rv" (which
are the SoC prefixes) jobs which include or exclude "rockchip" the board
vendor.  This gives us two jobs of similar numbers of platforms to build
now instead.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 91fe06e66c31ab8a47495f761bb3e9081366c414..cc5fa05a5fce3db9b12a8d101b4be1a4d4ec3629 100644 (file)
--- a/.azure-pipelines.yml
+++ b/.azure-pipelines.yml
@@ -563,10 +563,10 @@ stages:
           BUILDMAN: "uniphier"
         aarch64_catch_all:
           BUILDMAN: "aarch64 -x amlogic,bcm,imx8,imx9,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,renesas,sunxi,samsung,socfpga,rk,versal,zynq"
-        rockchip_32bit:
-          BUILDMAN: "rk -x aarch64"
-        rockchip_64bit:
-          BUILDMAN: "rk&aarch64"
+        rk_rv_non_rockchip:
+          BUILDMAN: "rk|rv -x rockchip"
+        rk_rv_and_rockchip:
+          BUILDMAN: "(rk|rv)&rockchip"
         renesas:
           BUILDMAN: "renesas"
         zynq: