From 86a144ebc2f0a66735f00602f4564696baf41656 Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Mon, 11 Oct 2021 18:38:16 +0200
Subject: [PATCH] ostc-ci: Workaround for inter-repo dependency on image builds
For the images renames to fully pass CI, we need to have a change in the
manifest repo. As these two MR would block each other before we could
merge them, we override the image names here, land the rename, do the
actual change in the manifest repo and finally clean this up again.
To be reverted when this change lands in the manifest repository.
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.ostc-ci/machines-and-flavours.yaml | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml
index 1284ca58..8405aa9a 100644
--- a/.ostc-ci/machines-and-flavours.yaml
+++ b/.ostc-ci/machines-and-flavours.yaml
@@ -41,6 +41,9 @@ linux-seco-intel-b68:
extends: .build-linux-matrix
variables:
MACHINE: seco-intel-b68
+ parallel:
+ matrix:
+ - OHOS_BITBAKE_TARGETS: ["oniro-image-base-tests", "oniro-image-extra-tests"]
linux-seco-imx8mm-c61:
extends: .build-linux-matrix
@@ -49,6 +52,9 @@ linux-seco-imx8mm-c61:
# This platform requires proprietary resources to boot.
# See build-generic.yaml for explanation of OHOS_BB_LOCAL_CONF_ variables.
OHOS_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
+ parallel:
+ matrix:
+ - OHOS_BITBAKE_TARGETS: ["oniro-image-base-tests", "oniro-image-extra-tests"]
linux-stm32mp1-av96:
extends: .build-recipe
@@ -61,6 +67,9 @@ linux-raspberrypi4-64:
extends: .build-linux-matrix
variables:
MACHINE: raspberrypi4-64
+ parallel:
+ matrix:
+ - OHOS_BITBAKE_TARGETS: ["oniro-image-base-tests", "oniro-image-extra-tests"]
zephyr-qemu-x86:
extends: .build-image
--
GitLab