From 2d4cd12dc219066117001067a106efc11cb800c4 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Mon, 9 Mar 2020 13:01:57 -0400 Subject: [PATCH] Azure/Travis: Re-sync jobs and clarify exclusions We keep both of these jobs in sync as much as possible even when the primary motivation is to keep Travis from exceeding the build time limit there. With that in mind: - Use "rk" not "rockchip" to get all Rockchip SoC platforms in one job, rather than just all Rockchip vendor platforms. - The NXP LX216* SoCs have their own job, exclude them from the AArch64 generic job. - SoCFPGA SoCs have their own job, exclude them from the AArch64 generic job. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 6 +++--- .travis.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 86480581a2..f66d58aa76 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -361,7 +361,7 @@ jobs: sun50i: BUILDMAN: "sun50i" arm_catch_all: - BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rockchip,toradex,socfpga,k2,k3,zynq" + BUILDMAN: "arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rk,toradex,socfpga,k2,k3,zynq" sandbox_x86: BUILDMAN: "sandbox x86" technexion: @@ -399,9 +399,9 @@ jobs: uniphier: BUILDMAN: "uniphier" aarch64_catch_all: - BUILDMAN: "aarch64 -x bcm,k3,tegra,ls1,ls2,mvebu,uniphier,sunxi,samsung,rockchip,versal,zynq" + BUILDMAN: "aarch64 -x bcm,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,sunxi,samsung,socfpga,rk,versal,zynq" rockchip: - BUILDMAN: "rockchip" + BUILDMAN: "rk" sh: BUILDMAN: "sh -x arm" zynq: diff --git a/.travis.yml b/.travis.yml index 7ab855acb2..c59bd7790b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -248,7 +248,7 @@ matrix: - BUILDMAN="sun50i -x orangepi" - name: "buildman catch-all ARM" env: - - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rockchip,toradex,socfpga,k2,k3,zynq" + - BUILDMAN="arm -x arm11,arm7,arm9,aarch64,at91,bcm,freescale,kirkwood,mvebu,siemens,tegra,uniphier,mx,samsung,sunxi,am33xx,omap,rk,toradex,socfpga,k2,k3,zynq" - name: "buildman sandbox x86" env: - BUILDMAN="sandbox x86" @@ -322,10 +322,10 @@ matrix: - BUILDMAN="uniphier" - name: "buildman catch-all AArch64" env: - - BUILDMAN="aarch64 -x bcm,k3,tegra,ls1,ls2,mvebu,uniphier,sunxi,samsung,rockchip,versal,zynq" + - BUILDMAN="aarch64 -x bcm,k3,tegra,ls1,ls2,lx216,mvebu,uniphier,sunxi,samsung,socfpga,rk,versal,zynq" - name: "buildman rockchip" env: - - BUILDMAN="rockchip -x orangepi" + - BUILDMAN="rk -x orangepi" - name: "buildman sh" env: - BUILDMAN="sh -x arm" -- 2.39.5