From 4ccf4c12d0f4d08c24672a6abc6821babb95a16f Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Wed, 13 Oct 2021 13:43:56 +0200
Subject: [PATCH] Revert "ostc-ci: Workaround for inter-repo dependency on
image builds"
This reverts commit 86a144ebc2f0a66735f00602f4564696baf41656.
As mentioned in the commit this was a temporary workaround until the
needed change could land in the manifest repository. This has happend
now:
https://git.ostc-eu.org/OSTC/OHOS/manifest/-/commit/8d604fb7cd63f6247c3071989005d251f0a068bc
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
.ostc-ci/machines-and-flavours.yaml | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml
index b0487f69..9319e971 100644
--- a/.ostc-ci/machines-and-flavours.yaml
+++ b/.ostc-ci/machines-and-flavours.yaml
@@ -41,9 +41,6 @@ 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
@@ -52,9 +49,6 @@ 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
@@ -67,9 +61,6 @@ 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