CI: merge testimage into the build stage
PATCH 1/3 CI: merge testimage into the build stage
Signed-off-by Jon Mason <[email protected]>
--- .gitlab-ci.yml | 98 +++++++----------------------------------------- ci/testimage.yml | 1 + 2 files changed, 14 insertions(+), 85 deletions(-)
.gitlab-ci.yml +13 -85
@@ -5,7 +5,6 @@ stages: - prep - bootstrap - build - - test # Common job fragment to get a worker ready .setup:
@@ -35,26 +34,6 @@ stages: - kas build $KASFILES - ./ci/check-warnings $KAS_WORK_DIR/build/warnings.log -.build_artifacts: - artifacts: - paths: - - $IMAGE_DIR/* - expire_in: 1 day - -.test: - extends: .setup - stage: test - # Unique before_script here to avoid the rm from the one in .setup - before_script: - - mkdir --verbose --parents $KAS_WORK_DIR $KAS_REPO_REF_DIR $SSTATE_DIR $DL_DIR $TOOLCHAIN_DIR - script: - - KASFILES=$(./ci/jobs-to-kas $CI_JOB_NAME) - # These are needed to avoid warnings about file permissions from the artifacts - - sudo chown -R builder $KAS_WORK_DIR - - sudo chgrp -R builder $KAS_WORK_DIR - - kas build $KASFILES -c testimage - - # # Prep stage, update repositories once #
@@ -162,83 +141,32 @@ n1sdp/armgcc: qemu-cortex-a53: extends: .build -qemuarm: - extends: - - .build - - .build_artifacts - -qemuarm64-sbsa: - extends: - - .build - - .build_artifacts - -qemuarm64-secureboot: - extends: - - .build - - .build_artifacts - -qemuarm64-secureboot/clang: - extends: - - .build - - .build_artifacts - -qemuarm64-secureboot/clang/musl: - extends: - - .build - - .build_artifacts - -qemuarm64-secureboot/musl: - extends: - - .build - - .build_artifacts - -qemuarmv5: - extends: - - .build - - .build_artifacts - -sgi575: +qemuarm/testimage: extends: .build -tc0: +qemuarm64-sbsa: extends: .build - -# -# Third phase, the test jobs -# - -# QEMU based machines can use testimage, others will need something else (i.e., LAVA) - -qemuarm/testimage: - extends: .test - needs: - - job: qemuarm - qemuarm64-secureboot/testimage: - extends: .test - needs: - - job: qemuarm64-secureboot + extends: .build qemuarm64-secureboot/clang/testimage: - extends: .test - needs: - - job: qemuarm64-secureboot/clang + extends: .build qemuarm64-secureboot/clang/musl/testimage: - extends: .test - needs: - - job: qemuarm64-secureboot/clang/musl + extends: .build qemuarm64-secureboot/musl/testimage: - extends: .test - needs: - - job: qemuarm64-secureboot/musl + extends: .build qemuarmv5/testimage: - extends: .test - needs: - - job: qemuarmv5 + extends: .build + +sgi575: + extends: .build + +tc0: + extends: .build #
ci/testimage.yml +1 -0
@@ -4,6 +4,7 @@ header: local_conf_header: testimage: | IMAGE_CLASSES += "testimage" + TESTIMAGE_AUTO = "1" slirp: | TEST_RUNQEMUPARAMS = "slirp" TEST_SERVER_IP = "127.0.0.1"
Signature · 1 line
2.17.1
PATCH 2/3 CI: Add bootstrap for clang
Signed-off-by Jon Mason <[email protected]>
--- .gitlab-ci.yml | 10 +++++++--- ci/clang-bootstrap.yml | 10 ++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 ci/clang-bootstrap.yml
.gitlab-ci.yml +7 -3
@@ -60,6 +60,10 @@ n1sdp/bootstrap: extends: .build stage: bootstrap +n1sdp/clang/clang-bootstrap: + extends: .build + stage: bootstrap + # What percentage of machines in the layer do we build machine-coverage: stage: bootstrap
@@ -68,6 +72,9 @@ machine-coverage: - ./ci/check-machine-coverage coverage: '/Coverage: \d+/' +toolchains: + extends: .build + stage: bootstrap # # Build stage, the actual build jobs
@@ -81,9 +88,6 @@ check-layers: - kas shell --update --force-checkout ci/base.yml:ci/meta-arm-autonomy.yml:ci/meta-python.yml --command \ "$CI_PROJECT_DIR/ci/check-layers.py $CI_PROJECT_DIR/ci/check-layers.yml $CI_PROJECT_DIR $KAS_WORK_DIR" -toolchains: - extends: .build - corstone500: extends: .build
ci/clang-bootstrap.yml new file +10 -0
@@ -0,0 +1,10 @@ +header: + version: 9 + +target: + - binutils-cross-aarch64 + - clang-cross-aarch64 + - clang-native + - python3-native + - opkg-native + - rpm-native
Signature · 1 line
2.17.1
PATCH 3/3 CI: add qemuarm clang testimage
In reply to Jon MasonSigned-off-by Jon Mason <[email protected]>
--- .gitlab-ci.yml | 3 +++ 1 file changed, 3 insertions(+)
.gitlab-ci.yml +3 -0
@@ -148,6 +148,9 @@ qemu-cortex-a53: qemuarm/testimage: extends: .build +qemuarm/clang/testimage: + extends: .build + qemuarm64-sbsa: extends: .build
Signature · 1 line
2.17.1