From 6250cbebef4f432f691291623d5d0614ec128302 Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Tue, 28 Jun 2022 09:28:40 +0200
Subject: [PATCH] oniro-ci: Add clang jobs
Add first clang jobs.
This should be factorized and moved to workspace definition once clang
is ready. In current situation defining all build jobs as matrix causes
dependencies issue similar to one in [1]
[1] https://gitlab.eclipse.org/eclipse/oniro-core/oniro/-/issues/574
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
.oniro-ci/machines-and-flavours.yaml | 36 +++++++++++++++++++++++++++-
1 file changed, 35 insertions(+), 1 deletion(-)
diff --git a/.oniro-ci/machines-and-flavours.yaml b/.oniro-ci/machines-and-flavours.yaml
index 3f544b5c..ebc1de1a 100644
--- a/.oniro-ci/machines-and-flavours.yaml
+++ b/.oniro-ci/machines-and-flavours.yaml
@@ -20,6 +20,12 @@ linux-qemu-x86:
# tainted build intermediate files, downloads or published artifacts.
CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap ovmf.qcow2"
+ parallel:
+ matrix:
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "clang"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "llvm"
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "gcc"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "gnu"
linux-qemu-x86_64:
extends: .build-wic-image
@@ -31,13 +37,20 @@ linux-qemu-x86_64:
CI_ONIRO_BUILD_CACHE: "pub"
CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
CI_ONIRO_JOB_ARTIFACTS: "*.wic.* *.bmap ovmf.qcow2"
+ parallel:
+ matrix:
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "clang"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "llvm"
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "gcc"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "gnu"
+
linux-seco-intel-b68:
extends: .build-wic-image
variables:
+ MACHINE: seco-intel-b68
CI_ONIRO_BUILD_FLAVOUR: linux
CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
- MACHINE: seco-intel-b68
linux-seco-intel-b68-extra:
extends: .build-linux
@@ -92,6 +105,16 @@ zephyr-qemu-x86:
CI_ONIRO_RECIPE_NAME: zephyr-philosophers
CI_ONIRO_BUILD_FLAVOUR: zephyr
CI_ONIRO_INSTANCE_SIZE: s3.large.2
+ parallel:
+ matrix:
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "clang"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "llvm"
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "gcc"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "gnu"
+ rules:
+ - if: '$CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN == "clang"'
+ allow_failure: true
+ when: manual
zephyr-qemu-cortex-m3:
extends: .build-zephyr-image
@@ -103,6 +126,17 @@ zephyr-qemu-cortex-m3:
CI_ONIRO_RECIPE_NAME: zephyr-philosophers
CI_ONIRO_BUILD_FLAVOUR: zephyr
CI_ONIRO_INSTANCE_SIZE: s3.large.2
+ parallel:
+ matrix:
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "clang"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "llvm"
+ - CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN: "gcc"
+ CI_ONIRO_BB_LOCAL_CONF_RUNTIME: "gnu"
+ rules:
+ - if: '$CI_ONIRO_BB_LOCAL_CONF_TOOLCHAIN == "clang"'
+ allow_failure: true
+ when: manual
+ - when: on_success
zephyr-96b-nitrogen:
extends: .build-zephyr-image
--
GitLab