Skip to content
Snippets Groups Projects
Commit 84a3bf94 authored by Zygmunt Krynicki's avatar Zygmunt Krynicki
Browse files

Include flavours and target jobs from manifest CI


This drops the local definitions of all the build flavours and all the
targets based on "develop.xml". This significantly simplifies this
pipeline and reduces duplication of the set of supported targets.

Signed-off-by: default avatarZygmunt Krynicki <zygmunt.krynicki@huawei.com>
parent 800607b5
No related branches found
No related tags found
No related merge requests found
...@@ -25,6 +25,12 @@ include: ...@@ -25,6 +25,12 @@ include:
- 'dco.yaml' - 'dco.yaml'
- 'reuse.yaml' - 'reuse.yaml'
- 'workspace.yaml' - 'workspace.yaml'
- project: 'OSTC/OHOS/manifest'
file:
# Include the set of build flavours.
- '.ostc-ci/build-flavours.yaml'
# Include the set of templates and jobs that use develop.xml.
- '.ostc-ci/develop-targets.yaml'
dco: dco:
extends: .dco extends: .dco
...@@ -89,93 +95,3 @@ reuse: ...@@ -89,93 +95,3 @@ reuse:
- artifacts/ - artifacts/
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH
##
## Templates build jobs for each OpenHarmony flavor.
##
.build-linux:
extends: .build
variables:
OHOS_BUILD_FLAVOUR: linux
OHOS_RECIPE_NAME: openharmony-image-base-tests
.build-zephyr:
extends: .build
variables:
OHOS_BUILD_FLAVOUR: zephyr
OHOS_RECIPE_NAME: zephyr-philosophers
.build-freertos:
extends: .build
variables:
OHOS_BUILD_FLAVOUR: freertos
OHOS_RECIPE_NAME: freertos-demo
##
## Template build jobs for develop.xml
##
## This manifest is "floating" and follows default branches of OSTC-specific repositories
## it includes.
##
.build-develop-linux:
extends: .build-linux
variables:
OHOS_MANIFEST_NAME: develop.xml
.build-develop-zephyr:
extends: .build-zephyr
variables:
OHOS_MANIFEST_NAME: develop.xml
.build-develop-freertos:
extends: .build-freertos
variables:
OHOS_MANIFEST_NAME: develop.xml
##
## Build jobs for develop.xml
##
develop-linux-qemu-x86_64:
extends: .build-develop-linux
variables:
MACHINE: qemux86-64
develop-linux-seco-intel-b68:
extends: .build-develop-linux
variables:
MACHINE: seco-intel-b68
develop-linux-seco-imx8mm-c61:
extends: .build-develop-linux
variables:
MACHINE: seco-imx8mm-c61
# This platform requires proprietary resources to boot.
OHOS_ACCEPT_FSL_EULA: 1
develop-linux-stm32mp1-av96:
extends: .build-develop-linux
variables:
MACHINE: stm32mp1-av96
develop-zephyr-qemu-x86:
extends: .build-develop-zephyr
variables:
MACHINE: qemu-x86
develop-zephyr-96b-nitrogen:
extends: .build-develop-zephyr
variables:
MACHINE: 96b-nitrogen
develop-zephyr-96b-avenger:
extends: .build-develop-zephyr
variables:
MACHINE: 96b-avenger96
develop-freertos-armv5:
extends: .build-develop-freertos
variables:
MACHINE: qemuarmv5
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment