From 8807b2e541eb9e47912d31d7bde8be5caefda5ac Mon Sep 17 00:00:00 2001
From: Tom Rini <trini@konsulko.com>
Date: Wed, 19 Jul 2023 15:09:12 -0400
Subject: [PATCH] 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>
---
 .azure-pipelines.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 91fe06e66c..cc5fa05a5f 100644
--- 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:
-- 
2.39.5