From 143c4da1be9670b5e999ab39fd98e2b0790a528a Mon Sep 17 00:00:00 2001
From: Chase Qi <chase.qi@linaro.org>
Date: Tue, 14 Sep 2021 13:37:32 +0800
Subject: [PATCH] Revert ".ostc-ci: use build-recipe instead of build-image"
This reverts commit f7eb3cb0542ba5ab5421bb6ba481639f10bc2053.
Signed-off-by: Chase Qi <chase.qi@linaro.org>
---
.ostc-ci/machines-and-flavours.yaml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml
index d5b2e4c7..914a658b 100644
--- a/.ostc-ci/machines-and-flavours.yaml
+++ b/.ostc-ci/machines-and-flavours.yaml
@@ -11,7 +11,7 @@
# The following jobs are documented in docs/ci/shared-jobs.rst
linux-qemu-x86:
- extends: .build-recipe
+ extends: .build-image
variables:
MACHINE: qemux86
OHOS_BUILD_FLAVOUR: linux
@@ -28,7 +28,7 @@ linux-qemu-x86:
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
linux-qemu-x86_64:
- extends: .build-recipe
+ extends: .build-image
variables:
MACHINE: qemux86-64
OHOS_BUILD_FLAVOUR: linux
@@ -51,7 +51,7 @@ linux-seco-imx8mm-c61:
OHOS_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
linux-stm32mp1-av96:
- extends: .build-recipe
+ extends: .build-image
variables:
OHOS_BUILD_FLAVOUR: linux
OHOS_RECIPE_NAME: allscenarios-image-base-tests
@@ -63,7 +63,7 @@ linux-raspberrypi4-64:
MACHINE: raspberrypi4-64
zephyr-qemu-x86:
- extends: .build-recipe
+ extends: .build-image
variables:
MACHINE: qemu-x86
# See the note on linux-qemu-x86.
@@ -73,7 +73,7 @@ zephyr-qemu-x86:
OHOS_BUILD_FLAVOUR: zephyr
zephyr-qemu-cortex-m3:
- extends: .build-recipe
+ extends: .build-image
variables:
MACHINE: qemu-cortex-m3
# See the note on linux-qemu-x86.
@@ -83,14 +83,14 @@ zephyr-qemu-cortex-m3:
OHOS_BUILD_FLAVOUR: zephyr
zephyr-96b-nitrogen:
- extends: .build-recipe
+ extends: .build-image
variables:
MACHINE: 96b-nitrogen
OHOS_RECIPE_NAME: zephyr-philosophers
OHOS_BUILD_FLAVOUR: zephyr
zephyr-96b-nitrogen-tests:
- extends: .build-recipe
+ extends: .build-image
variables:
MACHINE: 96b-nitrogen
OHOS_RECIPE_NAME: zephyr-kernel-test-all
--
GitLab