From 23bb448b8f575d64a85b47d5a376496f5471b6cc Mon Sep 17 00:00:00 2001
From: Pavel Zhukov <pavel.zhukov@huawei.com>
Date: Wed, 29 Jun 2022 14:00:21 +0200
Subject: [PATCH] .gitlab-ci: Re-disable linux jobs and fix inheritance
With clang jobs introduced in main (oniro) project the CI of
meta-zephyr was broken. There were few reasons:
- jobs changed names
- some clang jobs have set when: manual via .broken template
Workaround both issue with explicitly disabling jobs which inherit .broken
templates and change rules of overridden workspace to not run linux and
freertos jobs.
Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
---
.gitlab-ci.yml | 37 +++++++++++++++++--------------------
1 file changed, 17 insertions(+), 20 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b861f1a..0785e13 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,7 +3,8 @@
stages:
- compliance
- - build
+ - build-gcc
+ - build-clang
- test
- report
@@ -35,37 +36,33 @@ reuse:
.workspace:
variables:
CI_ONIRO_GIT_REPO_PATH: meta-zephyr
-
# Disable Linux and FreeRTOS builds that are unlikely to be affected by Zephyr
-# changes and certainly save some time. Some jobs no longer use the
-# .build-$flavour base so they are disabled separately.
-.build-linux:
+# changes and certainly save some time. Some jobs use .broken template which sets
+# when: manual on its own so they are disabled separately below
rules:
- - when: never
-
-.build-linux-matrix:
- rules:
- - when: never
+ - if: "$CI_ONIRO_BUILD_FLAVOUR == 'linux'"
+ when: never
+ - if: "$CI_ONIRO_BUILD_FLAVOUR == 'freertos'"
+ when: never
+ - when: on_success
-.build-wic-image:
+## This jobs must be overriden manualy because of .broken rules extention
+linux-seco-imx8mm-c61-2gb-clang:
rules:
- when: never
-.build-freertos:
+linux-seco-imx8mm-c61-4gb-clang:
rules:
- when: never
-linux-qemu-x86:
+freertos-armv5-clang:
rules:
- when: never
-linux-qemu-x86_64:
+linux-seco-imx8mm-c61-4gb-extra-clang:
rules:
- when: never
-linux-raspberrypi4-64:
- rules:
- - when: never
# Run lava test and report jobs for scheduled pipeline only.
.lava-test:
@@ -85,7 +82,7 @@ linux-raspberrypi4-64:
## Submit jobs to LAVA
##
lava-zephyr-96b-nitrogen-tests:
- needs: [zephyr-96b-nitrogen-tests]
+ needs: [zephyr-96b-nitrogen-tests-gcc]
stage: test
extends: .lava-test
variables:
@@ -94,7 +91,7 @@ lava-zephyr-96b-nitrogen-tests:
CI_REPORT_JOB_NAME: lava-report
lava-zephyr-qemu-cortex-m3:
- needs: [zephyr-qemu-cortex-m3]
+ needs: [zephyr-qemu-cortex-m3-gcc]
stage: test
extends: .lava-test
variables:
@@ -103,7 +100,7 @@ lava-zephyr-qemu-cortex-m3:
CI_REPORT_JOB_NAME: lava-report
lava-zephyr-qemu-x86:
- needs: [zephyr-qemu-x86]
+ needs: [zephyr-qemu-x86-gcc]
stage: test
extends: .lava-test
variables:
--
GitLab