From: Stefano Stabellini <stefano.stabellini@amd.com>
We are going to use artifacts produced by the Yocto builds in test jobs.
Signed-off-by: Stefano Stabellini <stefano.stabellini@amd.com>
---
automation/gitlab-ci/build.yaml | 51 +++++++++++++++++++++++++++++++++
automation/gitlab-ci/test.yaml | 45 -----------------------------
2 files changed, 51 insertions(+), 45 deletions(-)
diff --git a/automation/gitlab-ci/build.yaml b/automation/gitlab-ci/build.yaml
index a053c5c732..f62cf21f45 100644
--- a/automation/gitlab-ci/build.yaml
+++ b/automation/gitlab-ci/build.yaml
@@ -199,6 +199,41 @@
variables:
<<: *gcc
+.yocto-test:
+ stage: build
+ image: registry.gitlab.com/xen-project/xen/${CONTAINER}
+ except:
+ - master
+ - smoke
+ - /^coverity-tested\/.*/
+ - /^stable-.*/
+ script:
+ - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD}
+ variables:
+ YOCTO_VERSION: kirkstone
+ CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST}
+ artifacts:
+ paths:
+ - 'logs/*'
+ when: always
+ needs: []
+
+.yocto-test-arm64:
+ extends: .yocto-test
+ variables:
+ YOCTO_HOST: arm64v8
+ tags:
+ - arm64
+
+# This is not used by any test job as we only run Yocto on arm based machines.
+# Keep it here so that someone having x86 hardware can easily add jobs.
+.yocto-test-x86-64:
+ extends: .yocto-test
+ variables:
+ YOCTO_HOST: amd64
+ tags:
+ - x86_64
+
# Jobs below this line
archlinux-gcc:
@@ -679,6 +714,22 @@ archlinux-current-gcc-riscv64-debug-randconfig:
EXTRA_FIXED_RANDCONFIG:
CONFIG_COVERAGE=n
+# Yocto test jobs
+yocto-qemuarm64:
+ extends: .yocto-test-arm64
+ variables:
+ YOCTO_BOARD: qemuarm64
+
+yocto-qemuarm:
+ extends: .yocto-test-arm64
+ variables:
+ YOCTO_BOARD: qemuarm
+
+yocto-qemux86-64:
+ extends: .yocto-test-arm64
+ variables:
+ YOCTO_BOARD: qemux86-64
+
## Test artifacts common
.test-jobs-artifact-common:
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index ce543ef5c0..9570085a60 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -67,35 +67,6 @@
tags:
- x86_64
-.yocto-test:
- extends: .test-jobs-common
- script:
- - ./automation/build/yocto/build-yocto.sh -v --log-dir=./logs --xen-dir=`pwd` ${YOCTO_BOARD}
- variables:
- YOCTO_VERSION: kirkstone
- CONTAINER: yocto:${YOCTO_VERSION}-${YOCTO_BOARD}-${YOCTO_HOST}
- artifacts:
- paths:
- - 'logs/*'
- when: always
- needs: []
-
-.yocto-test-arm64:
- extends: .yocto-test
- variables:
- YOCTO_HOST: arm64v8
- tags:
- - arm64
-
-# This is not used by any test job as we only run Yocto on arm based machines.
-# Keep it here so that someone having x86 hardware can easily add jobs.
-.yocto-test-x86-64:
- extends: .yocto-test
- variables:
- YOCTO_HOST: amd64
- tags:
- - x86_64
-
# Test jobs
build-each-commit-gcc:
extends: .test-jobs-common
@@ -253,19 +224,3 @@ qemu-smoke-riscv64-gcc:
- ./automation/scripts/qemu-smoke-riscv64.sh 2>&1 | tee ${LOGFILE}
needs:
- archlinux-current-gcc-riscv64-debug
-
-# Yocto test jobs
-yocto-qemuarm64:
- extends: .yocto-test-arm64
- variables:
- YOCTO_BOARD: qemuarm64
-
-yocto-qemuarm:
- extends: .yocto-test-arm64
- variables:
- YOCTO_BOARD: qemuarm
-
-yocto-qemux86-64:
- extends: .yocto-test-arm64
- variables:
- YOCTO_BOARD: qemux86-64
--
2.25.1