Xen project Mailing List

[PATCH] automation: test.yaml: Introduce templates to reduce the overhead

From: Michal Orzel <michal.orzel@xxxxxxx>

Date: Wed, 19 Oct 2022 18:42:46 +0200

Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 165.204.84.17) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=amd.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=amd.com; dkim=none (message not signed); arc=none

Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=kMd2aBnsUoAVumnQYJYbP57oXs20Y21qvcFrIMFAu3E=; b=dtYJjlEqI53JgbJkfzn2McuK871c+cmWjuQC50/R1nP+ceBNVngnkSuoPkO92CVsBXJ7+9UpXIUEzZ0BrKl+5yI2IFaLlWX2GHRLmjQh8WGkDho/7GLmv5FtcU/wom/euBzKkw93N2DfU+jIFfqZKw/BTFD/6iaSydYq+qqaQeXkCv+5pgeT0DTPKpSei4D7AfHPA9WwfJJWKOcrnjOyOt43RPrrJ8VtML3VEuG3FMw2ElWF7+MGerBUmiFdiOJvqR1JhMGD6ateooqXaxKtXVGwXmO8U2UCnMenj4JuiscvwWEhZIbMW6SzLthepBSDMZtlOYnFRqMkVGNgCr4X5w==

Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FQgePsNUWrxyqL7R+agbjnWgiu129YCEeYoBmAwplOcCABTzNjie3FdQKHIV5Io5ynd2c2kXMCdh4SRcXiXGMZIWLG25NZ3mHsnh8ubpkeC26hCXA8PhdvfBj2vWJBLfJ6a4iv7k7dn/gmS1Q8yMPee2xqzCS0U0uU4HGFnzi8CQn0UQlig28XuB/XZt13jq2oR/mb/CTU8gjYbc7jNjiUdFU2++FqKDnjwFkH0aI3QKkOE0YZByllTYfEpMlG/ubueySZmMItQUmFDWNlJr5IUfk9ygDQTeDpIKozz88+MSAYHa2CUcb9sz5/3mW7+gYhTLqtXt3NQydH2pPWZrVg==

Cc: Michal Orzel <michal.orzel@xxxxxxx>, Doug Goldstein <cardoe@xxxxxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>

Delivery-date: Wed, 19 Oct 2022 16:43:18 +0000

List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

At the moment, we define lots of test jobs in test.yaml, that make use of the same configuration sections like variables, tags, artifacts. Introduce templates (hidden jobs whose names start with a dot) to reduce the overhead and simplify the file (more than 100 lines saved). This way, the actual jobs can only specify sections that are unique to them. Most of the test jobs specify the same set of prerequisite jobs under needs property with just one additional being unique to the job itself. Introduce YAML anchors for that purpose, because when using extends, the needs property is not being merged (the parent property overwrites the child one). Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx> --- This patch is based on the CI next branch where we already have several patches (already acked) to be merged into staging after the release: https://gitlab.com/xen-project/people/sstabellini/xen/-/tree/next Tested pipeline: https://gitlab.com/xen-project/people/morzel/xen-orzelmichal/-/pipelines/671114820 --- automation/gitlab-ci/test.yaml | 266 ++++++++++----------------------- 1 file changed, 80 insertions(+), 186 deletions(-) diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 92e0a1f7c510..fc0884b12082 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -7,32 +7,12 @@ - /^coverity-tested\/.*/ - /^stable-.*/ -# Test jobs -build-each-commit-gcc: - extends: .test-jobs-common - variables: - CONTAINER: debian:stretch - XEN_TARGET_ARCH: x86_64 - CC: gcc - script: - - BASE=${BASE_SHA:-${CI_COMMIT_BEFORE_SHA}} TIP=${TIP_SHA:-${CI_COMMIT_SHA}} ./automation/gitlab-ci/build-each-commit.sh 2>&1 | tee ../build-each-commit-gcc.log - - mv ../build-each-commit-gcc.log . - artifacts: - paths: - - '*.log' - when: always - needs: [] - tags: - - x86_64 - -qemu-smoke-dom0-arm64-gcc: +.qemu-arm64: extends: .test-jobs-common variables: CONTAINER: debian:unstable-arm64v8 - script: - - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee qemu-smoke-arm64.log - needs: - - alpine-3.12-gcc-arm64 + LOGFILE: qemu-smoke-arm64.log + needs: &qemu-arm64-needs - alpine-3.12-arm64-rootfs-export - kernel-5.19-arm64-export - qemu-system-aarch64-6.0.0-arm64-export @@ -44,17 +24,13 @@ qemu-smoke-dom0-arm64-gcc: tags: - arm64 -qemu-smoke-dom0-arm64-gcc-debug: +.qemu-arm32: extends: .test-jobs-common variables: CONTAINER: debian:unstable-arm64v8 - script: - - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee qemu-smoke-arm64.log - needs: - - alpine-3.12-gcc-debug-arm64 - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export + LOGFILE: qemu-smoke-arm32.log + needs: &qemu-arm32-needs + - qemu-system-aarch64-6.0.0-arm32-export artifacts: paths: - smoke.serial @@ -63,16 +39,11 @@ qemu-smoke-dom0-arm64-gcc-debug: tags: - arm64 -qemu-alpine-x86_64-gcc: +.qemu-x86-64: extends: .test-jobs-common variables: CONTAINER: debian:stretch - script: - - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee qemu-smoke-x86_64.log - needs: - - alpine-3.12-gcc - - alpine-3.12-rootfs-export - - kernel-5.10.74-export + LOGFILE: qemu-smoke-x86-64.log artifacts: paths: - smoke.serial @@ -81,214 +52,137 @@ qemu-alpine-x86_64-gcc: tags: - x86_64 -qemu-smoke-dom0less-arm64-gcc: +# Test jobs +build-each-commit-gcc: extends: .test-jobs-common variables: - CONTAINER: debian:unstable-arm64v8 + CONTAINER: debian:stretch + XEN_TARGET_ARCH: x86_64 + CC: gcc script: - - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee qemu-smoke-arm64.log - needs: - - alpine-3.12-gcc-arm64 - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export + - BASE=${BASE_SHA:-${CI_COMMIT_BEFORE_SHA}} TIP=${TIP_SHA:-${CI_COMMIT_SHA}} ./automation/gitlab-ci/build-each-commit.sh 2>&1 | tee ../build-each-commit-gcc.log + - mv ../build-each-commit-gcc.log . artifacts: paths: - - smoke.serial - '*.log' when: always + needs: [] tags: - - arm64 + - x86_64 + +qemu-smoke-dom0-arm64-gcc: + extends: .qemu-arm64 + script: + - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} + needs: + - *qemu-arm64-needs + - alpine-3.12-gcc-arm64 + +qemu-smoke-dom0-arm64-gcc-debug: + extends: .qemu-arm64 + script: + - ./automation/scripts/qemu-smoke-dom0-arm64.sh 2>&1 | tee ${LOGFILE} + needs: + - *qemu-arm64-needs + - alpine-3.12-gcc-debug-arm64 + +qemu-smoke-dom0less-arm64-gcc: + extends: .qemu-arm64 + script: + - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} + needs: + - *qemu-arm64-needs + - alpine-3.12-gcc-arm64 qemu-smoke-dom0less-arm64-gcc-debug: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm64 script: - - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee qemu-smoke-arm64.log + - ./automation/scripts/qemu-smoke-dom0less-arm64.sh 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm64-needs - alpine-3.12-gcc-debug-arm64 - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 qemu-smoke-dom0less-arm64-gcc-staticmem: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm64 script: - - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee qemu-smoke-arm64.log + - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm64-needs - alpine-3.12-gcc-arm64-staticmem - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 qemu-smoke-dom0less-arm64-gcc-debug-staticmem: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm64 script: - - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee qemu-smoke-arm64.log + - ./automation/scripts/qemu-smoke-dom0less-arm64.sh static-mem 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm64-needs - alpine-3.12-gcc-debug-arm64-staticmem - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 qemu-smoke-dom0less-arm64-gcc-boot-cpupools: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm64 script: - - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log + - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm64-needs - alpine-3.12-gcc-arm64-boot-cpupools - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 qemu-smoke-dom0less-arm64-gcc-debug-boot-cpupools: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm64 script: - - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee qemu-smoke-arm64.log + - ./automation/scripts/qemu-smoke-dom0less-arm64.sh boot-cpupools 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm64-needs - alpine-3.12-gcc-debug-arm64-boot-cpupools - - alpine-3.12-arm64-rootfs-export - - kernel-5.19-arm64-export - - qemu-system-aarch64-6.0.0-arm64-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 qemu-smoke-dom0-arm32-gcc: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm32 script: - - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee qemu-smoke-arm32.log + - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm32-needs - debian-unstable-gcc-arm32 - - qemu-system-aarch64-6.0.0-arm32-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 qemu-smoke-dom0-arm32-gcc-debug: - extends: .test-jobs-common - variables: - CONTAINER: debian:unstable-arm64v8 + extends: .qemu-arm32 script: - - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee qemu-smoke-arm32.log + - ./automation/scripts/qemu-smoke-dom0-arm32.sh 2>&1 | tee ${LOGFILE} needs: + - *qemu-arm32-needs - debian-unstable-gcc-arm32-debug - - qemu-system-aarch64-6.0.0-arm32-export - artifacts: - paths: - - smoke.serial - - '*.log' - when: always - tags: - - arm64 + +qemu-alpine-x86_64-gcc: + extends: .qemu-x86-64 + script: + - ./automation/scripts/qemu-alpine-x86_64.sh 2>&1 | tee ${LOGFILE} + needs: + - alpine-3.12-gcc + - alpine-3.12-rootfs-export + - kernel-5.10.74-export qemu-smoke-x86-64-gcc: - extends: .test-jobs-common - variables: - CONTAINER: debian:stretch + extends: .qemu-x86-64 script: - - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee qemu-smoke-x86-64.log - artifacts: - paths: - - smoke.serial - - '*.log' - when: always + - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE} needs: - debian-stretch-gcc-debug - tags: - - x86_64 qemu-smoke-x86-64-clang: - extends: .test-jobs-common - variables: - CONTAINER: debian:stretch + extends: .qemu-x86-64 script: - - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee qemu-smoke-x86-64.log - artifacts: - paths: - - smoke.serial - - '*.log' - when: always + - ./automation/scripts/qemu-smoke-x86-64.sh pv 2>&1 | tee ${LOGFILE} needs: - debian-unstable-clang-debug - tags: - - x86_64 qemu-smoke-x86-64-gcc-pvh: - extends: .test-jobs-common - variables: - CONTAINER: debian:stretch + extends: .qemu-x86-64 script: - - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee qemu-smoke-x86-64.log - artifacts: - paths: - - smoke.serial - - '*.log' - when: always + - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - debian-stretch-gcc-debug - tags: - - x86_64 qemu-smoke-x86-64-clang-pvh: - extends: .test-jobs-common - variables: - CONTAINER: debian:stretch + extends: .qemu-x86-64 script: - - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee qemu-smoke-x86-64.log - artifacts: - paths: - - smoke.serial - - '*.log' - when: always + - ./automation/scripts/qemu-smoke-x86-64.sh pvh 2>&1 | tee ${LOGFILE} needs: - debian-unstable-clang-debug - tags: - - x86_64 -- 2.25.1

©2013 Xen Project, A Linux Foundation Collaborative Project. All Rights Reserved.
Linux Foundation is a registered trademark of The Linux Foundation.
Xen Project is a trademark of The Linux Foundation.