From 0ab70423efc7623d2b84f7e888bc409bdd4325b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stevan=20Radakovi=C4=87?= <stevan.radakovic@linaro.org>
Date: Tue, 22 Jun 2021 12:59:53 +0200
Subject: [PATCH] .ostc-ci: Add Qemu LAVA test jobs to this layer
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add Qemu test jobs.
Add images for Qemu builds in order to boot them with LAVA.
Also fix a problem where CI jobs where not added to the pipeline on
changes within .ostc-ci dir.
Signed-off-by: Stevan Radaković <stevan.radakovic@linaro.org>
---
.ostc-ci/gitlab-ci.yml | 25 +++++++++++++++++++++++--
.ostc-ci/machines-and-flavours.yaml | 8 ++++++--
2 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/.ostc-ci/gitlab-ci.yml b/.ostc-ci/gitlab-ci.yml
index 7d71cb8c..5b3a94f1 100644
--- a/.ostc-ci/gitlab-ci.yml
+++ b/.ostc-ci/gitlab-ci.yml
@@ -75,9 +75,12 @@ aggregate-docs:
- assets/**/*
- flavours/**/*
- meta-*/**/*
- - .ostc-ci/*.yml
+ - .ostc-ci/*
- if: '$CI_COMMIT_TAG'
+##
+## Submit jobs to LAVA
+##
lava-linux-avenger96:
needs: [linux-stm32mp1-av96]
stage: test
@@ -87,6 +90,24 @@ lava-linux-avenger96:
CI_BUILD_JOB_NAME: linux-stm32mp1-av96
CI_REPORT_JOB_NAME: lava-report
+lava-qemu-x86_64:
+ needs: [linux-qemu-x86_64]
+ stage: test
+ extends: .lava-test
+ variables:
+ CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86_64-acts.yaml"
+ CI_BUILD_JOB_NAME: linux-qemu-x86_64
+ CI_REPORT_JOB_NAME: lava-report
+
+lava-qemu-x86:
+ needs: [linux-qemu-x86]
+ stage: test
+ extends: .lava-test
+ variables:
+ CI_LAVA_JOB_DEFINITION: "https://git.ostc-eu.org/OSTC/infrastructure/lava/lava-config/-/raw/master/lava.ostc-eu.org/job-definitions/ci/qemu-x86-acts.yaml"
+ CI_BUILD_JOB_NAME: linux-qemu-x86
+ CI_REPORT_JOB_NAME: lava-report
+
lava-report:
- needs: [lava-linux-avenger96]
+ needs: [lava-linux-avenger96, lava-qemu-x86_64, lava-qemu-x86]
extends: .lava-report
diff --git a/.ostc-ci/machines-and-flavours.yaml b/.ostc-ci/machines-and-flavours.yaml
index 9bb3cbd2..728af0ed 100644
--- a/.ostc-ci/machines-and-flavours.yaml
+++ b/.ostc-ci/machines-and-flavours.yaml
@@ -11,9 +11,11 @@
# The following jobs are documented in docs/ci/shared-jobs.rst
linux-qemu-x86:
- extends: .build-linux
+ extends: .build-image
variables:
MACHINE: qemux86
+ OHOS_BUILD_FLAVOUR: linux
+ OHOS_RECIPE_NAME: allscenarios-image-base-tests
# Set OHOS_BUILD_CACHE to "pub", overriding the value defined in the
# .build job. This enables sharing of download and sstate-cache created
# during this job.
@@ -26,9 +28,11 @@ linux-qemu-x86:
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
linux-qemu-x86_64:
- extends: .build-linux
+ extends: .build-image
variables:
MACHINE: qemux86-64
+ OHOS_BUILD_FLAVOUR: linux
+ OHOS_RECIPE_NAME: allscenarios-image-base-tests
# See the note on linux-qemu-x86.
OHOS_BUILD_CACHE: "pub"
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
--
GitLab