Update CI and kconfig for next and stable/3.2.x
v4 cover Update CI and kconfig for next and stable/3.2.x
Changes in v4:
- clean up CI variable interface and documentation
This accounts for change in Xenomai next as well as the fork-off of stable/3.2.x. And it simplifies our gitlab-ci configuration as bit.
This is "v3" because of patch 3 which was still broken and required the other 2 in order to actually achieve the goal.
There is also 5.15 enabling in next already, but that will likely need an update once the pending mm-issue is understood and resolved.
Jan
Jan Kiszka (8):
xenomai: Unify stable recipes, add link for 3.2.x
ci: Refactor inclusions
ci: Drop JOB_TEMPLATE_PATH variable
ci: Drop no longer user TARGET_EXTENSION variable
ci: Update README.md regarding CI variables
ci: Add 3.2.x stable, confine next
Kconfig: Add entry for 3.2.x head
linux-xenomai: Refactor latest recipe
.gitlab-ci.yml | 6 ++
Kconfig | 8 +-
ci/gitlab-ci-base.yml | 4 +-
..._4_19_xenomai_next.yml => kernel_4_19.yml} | 32 +++----
..._5_10_xenomai_next.yml => kernel_5_10.yml} | 32 +++----
...el_5_4_xenomai_next.yml => kernel_5_4.yml} | 32 +++----
ci/xenomai_3_0_x.yml | 23 ++---
ci/xenomai_3_1_x.yml | 91 ++-----------------
ci/xenomai_3_2_x.yml | 20 ++++
ci/xenomai_next.yml | 11 ++-
recipes-kernel/linux/linux-xenomai_latest.bb | 37 ++++++--
.../xenomai/xenomai_stable-3.0.x.bb | 7 +-
.../xenomai/xenomai_stable-3.1.x.bb | 22 +----
.../xenomai/xenomai_stable-3.2.x.bb | 1 +
scripts/deploy_to_aws.sh | 2 +-
scripts/run-lava-tests.sh | 5 +-
tests/README.md | 19 ++--
17 files changed, 142 insertions(+), 210 deletions(-)
rename ci/{kernel_4_19_xenomai_next.yml => kernel_4_19.yml} (71%)
rename ci/{kernel_5_10_xenomai_next.yml => kernel_5_10.yml} (71%)
rename ci/{kernel_5_4_xenomai_next.yml => kernel_5_4.yml} (71%)
create mode 100644 ci/xenomai_3_2_x.yml
mode change 100644 => 120000 recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb
create mode 120000 recipes-xenomai/xenomai/xenomai_stable-3.2.x.bbSignature · 1 line
2.31.1
PATCH v4 1/8 xenomai: Unify stable recipes, add link for 3.2.x
From: Jan Kiszka <[email protected]>
--- .../xenomai/xenomai_stable-3.0.x.bb | 7 +++--- .../xenomai/xenomai_stable-3.1.x.bb | 22 +------------------ .../xenomai/xenomai_stable-3.2.x.bb | 1 + 3 files changed, 6 insertions(+), 24 deletions(-) mode change 100644 => 120000 recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb create mode 120000 recipes-xenomai/xenomai/xenomai_stable-3.2.x.bb
recipes-xenomai/xenomai/xenomai_stable-3.0.x.bb +4 -3
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2018-2020 +# Copyright (c) Siemens AG, 2018-2022 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -12,10 +12,11 @@ require xenomai.inc -CHANGELOG_V = "3.0.x-head" +XENOMAI_VERSION = "${@d.getVar('PV').split('-')[1]}" +CHANGELOG_V = "${XENOMAI_VERSION}-head" SRC_URI = " \ - git://github.com/xenomai-ci/xenomai.git;protocol=https;branch=stable/v3.0.x" + git://github.com/xenomai-ci/xenomai.git;protocol=https;branch=stable/v${XENOMAI_VERSION}" SRCREV = "${AUTOREV}" S = "${WORKDIR}/git"
recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb deleted +0 -21
@@ -1,21 +0,0 @@ -# -# Xenomai Real-Time System -# -# Copyright (c) Siemens AG, 2020 -# -# Authors: -# Quirin Gylstorff <[email protected]> -# Jan Kiszka <[email protected]> -# -# SPDX-License-Identifier: MIT -# - -require xenomai.inc - -CHANGELOG_V = "3.1.x-head" - -SRC_URI = " \ - git://github.com/xenomai-ci/xenomai.git;protocol=https;branch=stable/v3.1.x" -SRCREV = "${AUTOREV}" - -S = "${WORKDIR}/git"
recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb new file +1 -0
@@ -0,0 +1 @@ +xenomai_stable-3.0.x.bb
recipes-xenomai/xenomai/xenomai_stable-3.2.x.bb new file +1 -0
@@ -0,0 +1 @@ +xenomai_stable-3.0.x.bb
Signature · 1 line
2.31.1
PATCH v4 2/8 ci: Refactor inclusions
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
This makes the inclusion structure more regular and reduces duplications by re-using the kernel_<version>.yml files for 3.1 and next. The trick is that we pull common variables to additional top-level 'variables:' blocks and only set what differes in the job-specific 'variables:'.
BUILD_IDENTIFIER is now used in place of DEPLOY_DIR_EXTENSION, and the former is derived from the XENOMAI_VERSION and KERNEL_VERSION. Only those version variables are set at xenomai_<version>.yml and kernel- specific job level, respectively.
---
ci/gitlab-ci-base.yml | 2 +-
..._4_19_xenomai_next.yml => kernel_4_19.yml} | 32 +++----
..._5_10_xenomai_next.yml => kernel_5_10.yml} | 32 +++----
...el_5_4_xenomai_next.yml => kernel_5_4.yml} | 32 +++----
ci/xenomai_3_0_x.yml | 23 ++---
ci/xenomai_3_1_x.yml | 91 ++-----------------
ci/xenomai_next.yml | 13 ++-
scripts/deploy_to_aws.sh | 2 +-
scripts/run-lava-tests.sh | 2 +-
9 files changed, 65 insertions(+), 164 deletions(-)
rename ci/{kernel_4_19_xenomai_next.yml => kernel_4_19.yml} (71%)
rename ci/{kernel_5_10_xenomai_next.yml => kernel_5_10.yml} (71%)
rename ci/{kernel_5_4_xenomai_next.yml => kernel_5_4.yml} (71%)ci/gitlab-ci-base.yml +1 -1
@@ -18,10 +18,10 @@ variables: https_proxy: "$HTTPS_PROXY" ftp_proxy: "$FTP_PROXY" no_proxy: "$NO_PROXY" - XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml" ISAR_IMAGE: demo-image ISAR_DISTRIBUTION: xenomai-demo LAVA_TESTS_ENABLED: "true" + BUILD_IDENTIFIER: "xenomai-${XENOMAI_VERSION}_kernel-${KERNEL_VERSION}" default: image: ghcr.io/siemens/kas/kas-isar:2.6.3
ci/kernel_4_19.yml renamed from ci/kernel_4_19_xenomai_next.yml +13 -19
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019 - 2020 +# Copyright (c) Siemens AG, 2019 - 2022 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -13,76 +13,70 @@ build-4.19:qemu-amd64: extends: .build:qemu-amd64 variables: LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml" - DEPLOY_DIR_EXTENSION: "4.19" + KERNEL_VERSION: "4.19" lava-test-4.19:qemu-amd64: needs: [ "build-4.19:qemu-amd64" ] extends: .lava-test:qemu-amd64 variables: - DEPLOY_DIR_EXTENSION: "4.19" - BUILD_IDENTIFIER: "4.19" + KERNEL_VERSION: "4.19" build-4.19:qemu-armhf: extends: .build:qemu-armhf variables: LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml" - DEPLOY_DIR_EXTENSION: "4.19" + KERNEL_VERSION: "4.19" lava-test-4.19:qemu-armhf: needs: [ "build-4.19:qemu-armhf" ] extends: .lava-test:qemu-armhf variables: - DEPLOY_DIR_EXTENSION: "4.19" - BUILD_IDENTIFIER: "4.19" + KERNEL_VERSION: "4.19" build-4.19:qemu-arm64: extends: .build:qemu-arm64 variables: LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml" - DEPLOY_DIR_EXTENSION: "4.19" + KERNEL_VERSION: "4.19" lava-test-4.19:qemu-arm64: needs: [ "build-4.19:qemu-arm64" ] extends: .lava-test:qemu-arm64 variables: - DEPLOY_DIR_EXTENSION: "4.19" - BUILD_IDENTIFIER: "4.19" + KERNEL_VERSION: "4.19" build-4.19:hikey: extends: .build:hikey variables: LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml" - DEPLOY_DIR_EXTENSION: "4.19" + KERNEL_VERSION: "4.19" lava-test-4.19:hikey: needs: [ "build-4.19:hikey" ] extends: .lava-test:hikey variables: - DEPLOY_DIR_EXTENSION: "4.19" - BUILD_IDENTIFIER: "4.19" + KERNEL_VERSION: "4.19" build-4.19:beagle-bone-black: extends: .build:beagle-bone-black variables: LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml" - DEPLOY_DIR_EXTENSION: "4.19" + KERNEL_VERSION: "4.19" lava-test-4.19:beagle-bone-black: needs: [ "build-4.19:beagle-bone-black" ] extends: .lava-test:beagle-bone-black variables: - DEPLOY_DIR_EXTENSION: "4.19" - BUILD_IDENTIFIER: "4.19" + KERNEL_VERSION: "4.19" build-4.19:x86-64-efi: extends: .build:x86-64-efi variables: LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml" - DEPLOY_DIR_EXTENSION: "4.19" + KERNEL_VERSION: "4.19" lava-test-4.19:x86-64-efi: needs: [ "build-4.19:x86-64-efi" ] extends: .lava-test:x86-64-efi variables: - DEPLOY_DIR_EXTENSION: "4.19" - BUILD_IDENTIFIER: "4.19" + KERNEL_VERSION: "4.19"
ci/kernel_5_10.yml renamed from ci/kernel_5_10_xenomai_next.yml +13 -19
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019 - 2021 +# Copyright (c) Siemens AG, 2019 - 2022 # # Authors: # Jan Kiszka <[email protected]>
@@ -13,76 +13,70 @@ build-5.10:qemu-amd64: extends: .build:qemu-amd64 variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml" - DEPLOY_DIR_EXTENSION: "5.10" + KERNEL_VERSION: "5.10" lava-test-5.10:qemu-amd64: needs: [ "build-5.10:qemu-amd64" ] extends: .lava-test:qemu-amd64 variables: - DEPLOY_DIR_EXTENSION: "5.10" - BUILD_IDENTIFIER: "5.10" + KERNEL_VERSION: "5.10" build-5.10:qemu-armhf: extends: .build:qemu-armhf variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml" - DEPLOY_DIR_EXTENSION: "5.10" + KERNEL_VERSION: "5.10" lava-test-5.10:qemu-armhf: needs: [ "build-5.10:qemu-armhf" ] extends: .lava-test:qemu-armhf variables: - DEPLOY_DIR_EXTENSION: "5.10" - BUILD_IDENTIFIER: "5.10" + KERNEL_VERSION: "5.10" build-5.10:qemu-arm64: extends: .build:qemu-arm64 variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml" - DEPLOY_DIR_EXTENSION: "5.10" + KERNEL_VERSION: "5.10" lava-test-5.10:qemu-arm64: needs: [ "build-5.10:qemu-arm64" ] extends: .lava-test:qemu-arm64 variables: - DEPLOY_DIR_EXTENSION: "5.10" - BUILD_IDENTIFIER: "5.10" + KERNEL_VERSION: "5.10" build-5.10:hikey: extends: .build:hikey variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml" - DEPLOY_DIR_EXTENSION: "5.10" + KERNEL_VERSION: "5.10" lava-test-5.10:hikey: needs: [ "build-5.10:hikey" ] extends: .lava-test:hikey variables: - DEPLOY_DIR_EXTENSION: "5.10" - BUILD_IDENTIFIER: "5.10" + KERNEL_VERSION: "5.10" build-5.10:beagle-bone-black: extends: .build:beagle-bone-black variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml" - DEPLOY_DIR_EXTENSION: "5.10" + KERNEL_VERSION: "5.10" lava-test-5.10:beagle-bone-black: needs: [ "build-5.10:beagle-bone-black" ] extends: .lava-test:beagle-bone-black variables: - DEPLOY_DIR_EXTENSION: "5.10" - BUILD_IDENTIFIER: "5.10" + KERNEL_VERSION: "5.10" build-5.10:x86-64-efi: extends: .build:x86-64-efi variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.10.yml" - DEPLOY_DIR_EXTENSION: "5.10" + KERNEL_VERSION: "5.10" lava-test-5.10:x86-64-efi: needs: [ "build-5.10:x86-64-efi" ] extends: .lava-test:x86-64-efi variables: - DEPLOY_DIR_EXTENSION: "5.10" - BUILD_IDENTIFIER: "5.10" + KERNEL_VERSION: "5.10"
ci/kernel_5_4.yml renamed from ci/kernel_5_4_xenomai_next.yml +13 -19
@@ -1,7 +1,7 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019 - 2020 +# Copyright (c) Siemens AG, 2019 - 2022 # # Authors: # Quirin Gylstorff <[email protected]>
@@ -13,76 +13,70 @@ build-5.4:qemu-amd64: extends: .build:qemu-amd64 variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.4.yml" - DEPLOY_DIR_EXTENSION: "5.4" + KERNEL_VERSION: "5.4" lava-test-5.4:qemu-amd64: needs: [ "build-5.4:qemu-amd64" ] extends: .lava-test:qemu-amd64 variables: - DEPLOY_DIR_EXTENSION: "5.4" - BUILD_IDENTIFIER: "5.4" + KERNEL_VERSION: "5.4" build-5.4:qemu-armhf: extends: .build:qemu-armhf variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.4.yml" - DEPLOY_DIR_EXTENSION: "5.4" + KERNEL_VERSION: "5.4" lava-test-5.4:qemu-armhf: needs: [ "build-5.4:qemu-armhf" ] extends: .lava-test:qemu-armhf variables: - DEPLOY_DIR_EXTENSION: "5.4" - BUILD_IDENTIFIER: "5.4" + KERNEL_VERSION: "5.4" build-5.4:qemu-arm64: extends: .build:qemu-arm64 variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.4.yml" - DEPLOY_DIR_EXTENSION: "5.4" + KERNEL_VERSION: "5.4" lava-test-5.4:qemu-arm64: needs: [ "build-5.4:qemu-arm64" ] extends: .lava-test:qemu-arm64 variables: - DEPLOY_DIR_EXTENSION: "5.4" - BUILD_IDENTIFIER: "5.4" + KERNEL_VERSION: "5.4" build-5.4:hikey: extends: .build:hikey variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.4.yml" - DEPLOY_DIR_EXTENSION: "5.4" + KERNEL_VERSION: "5.4" lava-test-5.4:hikey: needs: [ "build-5.4:hikey" ] extends: .lava-test:hikey variables: - DEPLOY_DIR_EXTENSION: "5.4" - BUILD_IDENTIFIER: "5.4" + KERNEL_VERSION: "5.4" build-5.4:beagle-bone-black: extends: .build:beagle-bone-black variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.4.yml" - DEPLOY_DIR_EXTENSION: "5.4" + KERNEL_VERSION: "5.4" lava-test-5.4:beagle-bone-black: needs: [ "build-5.4:beagle-bone-black" ] extends: .lava-test:beagle-bone-black variables: - DEPLOY_DIR_EXTENSION: "5.4" - BUILD_IDENTIFIER: "5.4" + KERNEL_VERSION: "5.4" build-5.4:x86-64-efi: extends: .build:x86-64-efi variables: LINUX_BUILD_OPTION: ":opt-linux-latest-5.4.yml" - DEPLOY_DIR_EXTENSION: "5.4" + KERNEL_VERSION: "5.4" lava-test-5.4:x86-64-efi: needs: [ "build-5.4:x86-64-efi" ] extends: .lava-test:x86-64-efi variables: - DEPLOY_DIR_EXTENSION: "5.4" - BUILD_IDENTIFIER: "5.4" + KERNEL_VERSION: "5.4"
ci/xenomai_3_0_x.yml +8 -15
@@ -1,40 +1,33 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019 - 2020 +# Copyright (c) Siemens AG, 2019 - 2022 # # Authors: # Quirin Gylstorff <[email protected]> # # SPDX-License-Identifier: MIT # + include: - local: '/ci/gitlab-ci-base.yml' +variables: + XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml" + LINUX_BUILD_OPTION: ":opt-linux-latest-4.4.yml" + XENOMAI_VERSION: "3.0.x" + KERNEL_VERSION: "4.4" + build-4.4:beagle-bone-black: extends: .build:beagle-bone-black - variables: - XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml" - LINUX_BUILD_OPTION: ":opt-linux-latest-4.4.yml" - DEPLOY_DIR_EXTENSION: "xenomai-3.0.x" lava-test-4.4:beagle-bone-black: needs: [ "build-4.4:beagle-bone-black" ] extends: .lava-test:beagle-bone-black - variables: - DEPLOY_DIR_EXTENSION: "xenomai-3.0.x" - BUILD_IDENTIFIER: "4.4" build-4.4:x86-64-efi: extends: .build:x86-64-efi - variables: - XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml" - LINUX_BUILD_OPTION: ":opt-linux-latest-4.4.yml" - DEPLOY_DIR_EXTENSION: "xenomai-3.0.x" lava-test-4.4:x86-64-efi: needs: [ "build-4.4:x86-64-efi" ] extends: .lava-test:x86-64-efi - variables: - DEPLOY_DIR_EXTENSION: "xenomai-3.0.x" - BUILD_IDENTIFIER: "4.4"
ci/xenomai_3_1_x.yml +6 -85
103 lines not on this page · raw message
ci/xenomai_next.yml +9 -4
@@ -1,15 +1,20 @@ # # Xenomai Real-Time System # -# Copyright (c) Siemens AG, 2019 - 2021 +# Copyright (c) Siemens AG, 2019 - 2022 # # Authors: # Quirin Gylstorff <[email protected]> # # SPDX-License-Identifier: MIT # + include: - local: '/ci/gitlab-ci-base.yml' - - local: '/ci/kernel_4_19_xenomai_next.yml' - - local: '/ci/kernel_5_4_xenomai_next.yml' - - local: '/ci/kernel_5_10_xenomai_next.yml' + - local: '/ci/kernel_4_19.yml' + - local: '/ci/kernel_5_4.yml' + - local: '/ci/kernel_5_10.yml' + +variables: + XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml" + XENOMAI_VERSION: "next"
scripts/deploy_to_aws.sh +1 -1
@@ -28,7 +28,7 @@ fi aws_args="--acl=public-read" isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}" -deploy_dir="${destination}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}" +deploy_dir="${destination}/${CI_PIPELINE_ID}/${BUILD_IDENTIFIER}" kernel="${images_dir}/${target}/${isar_base_name}-vmlinuz" kernel_suffix="vmlinuz"
scripts/run-lava-tests.sh +1 -1
@@ -27,7 +27,7 @@ echo "connect to lava server: ${lava_master_uri}" lavacli identities add --token "${LAVA_MASTER_TOKEN}" --uri "${lava_master_uri}" --username "${LAVA_MASTER_ACCOUNT}" default #generate lava job description from template -DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}" +DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}/${BUILD_IDENTIFIER}" export DEPLOY_URL echo "Deploy artifacts from '${artifact_url}'"
Signature · 1 line
2.31.1
PATCH v4 3/8 ci: Drop JOB_TEMPLATE_PATH variable
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
That's an interface without a real use case. Dropping it makes live easier for users that want to understand the setup.
--- scripts/run-lava-tests.sh | 3 +-- tests/README.md | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
scripts/run-lava-tests.sh +1 -2
@@ -32,11 +32,10 @@ export DEPLOY_URL echo "Deploy artifacts from '${artifact_url}'" -job_template_path="${JOB_TEMPLATE_PATH:-tests/jobs/xenomai}" tmp_dir=$(mktemp -d) template="${tmp_dir}/job_${TARGET}_${CI_PIPELINE_ID}.yml" -cat "${job_template_path}-${TARGET}.yml" | envsubst > "$template" +cat "tests/jobs/xenomai-${TARGET}.yml" | envsubst > "$template" echo "submit lava job"
tests/README.md +0 -1
@@ -111,7 +111,6 @@ The following variables are used and set by the ci system: - General build settings - `BUILD_OPTIONS` : optional parameter. Used for triggers. Overwrite to build the newest ipipe together with xenomai or other combinations. - `DEPLOY_DIR_EXTENSION`: Extension path to store artifacts for the same target - - `JOB_TEMPLATE_PATH`: Path to the test templates - Default tests/jobs/xenomai - `TARGET_EXTENSION`: Extension of the build job name ## LAVA Template variable
Signature · 1 line
2.31.1
PATCH v4 4/8 ci: Drop no longer user TARGET_EXTENSION variable
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Was obsoleted by d3a501ebfe2c.
--- ci/gitlab-ci-base.yml | 2 +- tests/README.md | 1 - 2 files changed, 1 insertion(+), 2 deletions(-)
ci/gitlab-ci-base.yml +1 -1
@@ -50,7 +50,7 @@ default: - scripts/install-lavacli.sh - scripts/run-lava-tests.sh ${TARGET} variables: - BUILD_JOB_NAME: "build-${BUILD_IDENTIFIER}:${TARGET}${TARGET_EXTENSION}" + BUILD_JOB_NAME: "build-${BUILD_IDENTIFIER}:${TARGET}" artifacts: when: always reports:
tests/README.md +0 -1
@@ -111,7 +111,6 @@ The following variables are used and set by the ci system: - General build settings - `BUILD_OPTIONS` : optional parameter. Used for triggers. Overwrite to build the newest ipipe together with xenomai or other combinations. - `DEPLOY_DIR_EXTENSION`: Extension path to store artifacts for the same target - - `TARGET_EXTENSION`: Extension of the build job name ## LAVA Template variable
Signature · 1 line
2.31.1
PATCH v4 5/8 ci: Update README.md regarding CI variables
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Some were undocumented, DEPLOY_DIR_EXTENSION is now history and was actually never an external interface.
Reindent the LAVA settings section at this chance.
--- tests/README.md | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-)
tests/README.md +11 -6
@@ -96,21 +96,26 @@ the [Custom CI configuration path](https://code.siemens.com/help/ci/pipelines/se ## CI Variables The following variables are used and set by the ci system: -- proxy settings: +- Proxy settings: - `HTTP_PROXY` : http proxy - `HTTPS_PROXY` : https proxy - `FTP_PROXY` : ftp proxy - `NO_PROXY` : no proxy - LAVA settings: - - `LAVA_MASTER_ACCOUNT` : lava master account name to register lavacli for test execution - - `LAVA_MASTER_TOKEN` : token to connect with the lava master - - `LAVA_ARTIFACTS_URL` : optional variable where to get the artifacts for testing + - `LAVA_MASTER_ACCOUNT`: lava master account name to register lavacli for test execution + - `LAVA_MASTER_TOKEN`: token to connect with the lava master + - `LAVA_ARTIFACTS_URL`: optional variable where to get the artifacts for testing - `LAVA_MASTER_URL`: URL to the LAVA Master -- General build settings +- Image deployment settings: + - `USE_S3_BUCKET`: Set to `1` in order to upload build artifacts to AWS S3 + - `AWS_ACCESS_KEY_ID`: Key ID to use for uploading + - `AWS_SECRET_ACCESS_KEY`: Secret access key for uploading + - `S3_BUCKET_URL`: S3 URL where to place the artifacts (synchronize with `LAVA_ARTIFACTS_URL`) + +- Build settings: - `BUILD_OPTIONS` : optional parameter. Used for triggers. Overwrite to build the newest ipipe together with xenomai or other combinations. - - `DEPLOY_DIR_EXTENSION`: Extension path to store artifacts for the same target ## LAVA Template variable
Signature · 1 line
2.31.1
PATCH v4 6/8 ci: Add 3.2.x stable, confine next
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Open up the building & testing for stable/v3.2.x by moving current 'next' rules over. As the next Xenomai release dropped support for I-pipe kernels, drop anything but 5.10 from the related CI rules for the development head. That also avoids increasing the CI load too much.
---
.gitlab-ci.yml | 6 ++++++
ci/{xenomai_next.yml => xenomai_3_2_x.yml} | 4 ++--
ci/xenomai_next.yml | 2 --
3 files changed, 8 insertions(+), 4 deletions(-)
copy ci/{xenomai_next.yml => xenomai_3_2_x.yml} (81%).gitlab-ci.yml +6 -0
@@ -32,6 +32,12 @@ stable/v3.1.x: include: - local: '/ci/xenomai_3_1_x.yml' +stable/v3.2.x: + extends: .parent + trigger: + include: + - local: '/ci/xenomai_3_2_x.yml' + next: extends: .parent trigger:
ci/xenomai_3_2_x.yml renamed from ci/xenomai_next.yml +2 -2
@@ -16,5 +16,5 @@ include: - local: '/ci/kernel_5_10.yml' variables: - XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml" - XENOMAI_VERSION: "next" + XENOMAI_BUILD_OPTION: ":opt-xenomai-3.2.x.yml" + XENOMAI_VERSION: "3.2.x"
ci/xenomai_next.yml +0 -2
@@ -11,8 +11,6 @@ include: - local: '/ci/gitlab-ci-base.yml' - - local: '/ci/kernel_4_19.yml' - - local: '/ci/kernel_5_4.yml' - local: '/ci/kernel_5_10.yml' variables:
Signature · 1 line
2.31.1
PATCH v4 7/8 Kconfig: Add entry for 3.2.x head
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
--- Kconfig | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
Kconfig +6 -2
@@ -63,6 +63,9 @@ choice config XENOMAI_LATEST bool "Head of next branch" +config XENOMAI_3_2_LATEST + bool "Head of stable/v3.2.x branch" + config XENOMAI_3_2 bool "Latest 3.2.x release"
@@ -78,6 +81,7 @@ endchoice config KAS_INCLUDE_XENOMAI string default "opt-xenomai-next.yml" if XENOMAI_LATEST + default "opt-xenomai-3.2.x.yml" if XENOMAI_3_2_LATEST default "opt-xenomai-3.1.x.yml" if XENOMAI_3_1_LATEST default "opt-xenomai-3.0.x.yml" if XENOMAI_3_0_LATEST
@@ -87,11 +91,11 @@ choice config KERNEL_5_10_LATEST bool "Head of 5.10 Dovetail branch" - depends on XENOMAI_LATEST || XENOMAI_3_2 + depends on XENOMAI_LATEST || XENOMAI_3_2_LATEST || XENOMAI_3_2 config KERNEL_5_10 bool "Latest 5.10 Dovetail version" - depends on XENOMAI_LATEST || XENOMAI_3_2 + depends on XENOMAI_LATEST || XENOMAI_3_2_LATEST || XENOMAI_3_2 config KERNEL_5_4_LATEST bool "Head of 5.4 I-pipe branch"
Signature · 1 line
2.31.1
PATCH v4 8/8 linux-xenomai: Refactor latest recipe
In reply to Jan KiszkaFrom: Jan Kiszka <[email protected]>
Prepare for adding more dovetail kernel version and reformat the lengthy GIT_REPO and GIT_BRANCH inline-python statements. Should also improve readability.
is_kernel() does not have to use startswith because we always compare exact version strings.
--- recipes-kernel/linux/linux-xenomai_latest.bb | 37 +++++++++++++++----- 1 file changed, 28 insertions(+), 9 deletions(-)
recipes-kernel/linux/linux-xenomai_latest.bb +28 -9
@@ -20,17 +20,36 @@ def is_xeno_3_0(d): def is_kernel(d, ver): linux_ver = d.getVar('LATEST_GIT_BRANCH') or '' - return linux_ver.startswith(ver) + return linux_ver == ver # default: amd64 or i386 -GIT_REPO = "${@'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) else 'git://source.denx.de/xenomai/linux-dovetail.git' if is_kernel(d, '5.10') else 'git://github.com/xenomai-ci/ipipe-x86.git'}" -GIT_BRANCH = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') else 'ipipe-x86-5.4.y' if is_kernel(d, '5.4') else 'ipipe-x86-4.19.y-cip'}" - -GIT_REPO_armhf = "${@'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) else 'git://source.denx.de/xenomai/linux-dovetail.git' if is_kernel(d, '5.10') else 'git://github.com/xenomai-ci/ipipe-arm.git'}" -GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') else 'ipipe/5.4.y' if is_kernel(d, '5.4') else 'ipipe/4.19.y-cip'}" - -GIT_REPO_arm64 = "${@'git://source.denx.de/xenomai/linux-dovetail.git' if is_kernel(d, '5.10') else 'git://github.com/xenomai-ci/ipipe-arm64.git'}" -GIT_BRANCH_arm64 = "${@'v5.10.y-dovetail-rebase' if is_kernel(d, '5.10') else 'ipipe/5.4.y' if is_kernel(d, '5.4') else 'ipipe/4.19.y-cip'}" +GIT_REPO = "${@ \ + 'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) \ + else 'git://github.com/xenomai-ci/ipipe-x86.git' if is_kernel(d, '4.19') or is_kernel(d, '5.4') \ + else 'git://source.denx.de/xenomai/linux-dovetail.git' }" +GIT_BRANCH = "${@ \ + 'ipipe-4.4.y-cip' if is_xeno_3_0(d) \ + else 'ipipe-x86-4.19.y-cip' if is_kernel(d, '4.19') \ + else 'ipipe-x86-5.4.y' if is_kernel(d, '5.4') \ + else 'v5.10.y-dovetail-rebase' }" + +GIT_REPO_armhf = "${@ \ + 'git://github.com/xenomai-ci/ipipe.git' if is_xeno_3_0(d) \ + else 'git://github.com/xenomai-ci/ipipe-arm.git' if is_kernel(d, '4.19') or is_kernel(d, '5.4') \ + else 'git://source.denx.de/xenomai/linux-dovetail.git' }" +GIT_BRANCH_armhf = "${@ \ + 'ipipe-4.4.y-cip' if is_xeno_3_0(d) \ + else 'ipipe/4.19.y-cip' if is_kernel(d, '4.19') \ + else 'ipipe/5.4.y' if is_kernel(d, '5.4') \ + else 'v5.10.y-dovetail-rebase' }" + +GIT_REPO_arm64 = "${@ \ + 'git://github.com/xenomai-ci/ipipe-arm64.git' if is_kernel(d, '4.19') or is_kernel(d, '5.4') \ + else 'git://source.denx.de/xenomai/linux-dovetail.git' }" +GIT_BRANCH_arm64 = "${@ \ + 'ipipe/4.19.y-cip' if is_kernel(d, '4.19') \ + else 'ipipe/5.4.y' if is_kernel(d, '5.4') \ + else 'v5.10.y-dovetail-rebase' }" SRC_URI += "${GIT_REPO};protocol=https;branch=${GIT_BRANCH}" SRCREV = "${AUTOREV}"
Signature · 1 line
2.31.1
Quoted 42 lines · Jan Kiszka
Changes in v4:
- clean up CI variable interface and documentationThis accounts for change in Xenomai next as well as the fork-off of stable/3.2.x. And it simplifies our gitlab-ci configuration as bit.
This is "v3" because of patch 3 which was still broken and required the other 2 in order to actually achieve the goal.
There is also 5.15 enabling in next already, but that will likely need an update once the pending mm-issue is understood and resolved.
Jan
Jan Kiszka (8):
xenomai: Unify stable recipes, add link for 3.2.x
ci: Refactor inclusions
ci: DropJOB_TEMPLATE_PATHvariable
ci: Drop no longer userTARGET_EXTENSIONvariable
ci: Update README.md regarding CI variables
ci: Add 3.2.x stable, confine next
Kconfig: Add entry for 3.2.x head
linux-xenomai: Refactor latest recipe.gitlab-ci.yml | 6 ++ Kconfig | 8 +- ci/gitlab-ci-base.yml | 4 +- ..._4_19_xenomai_next.yml => kernel_4_19.yml} | 32 +++---- ..._5_10_xenomai_next.yml => kernel_5_10.yml} | 32 +++---- ...el_5_4_xenomai_next.yml => kernel_5_4.yml} | 32 +++---- ci/xenomai_3_0_x.yml | 23 ++--- ci/xenomai_3_1_x.yml | 91 ++----------------- ci/xenomai_3_2_x.yml | 20 ++++ ci/xenomai_next.yml | 11 ++- recipes-kernel/linux/linux-xenomai_latest.bb | 37 ++++++-- .../xenomai/xenomai_stable-3.0.x.bb | 7 +- .../xenomai/xenomai_stable-3.1.x.bb | 22 +---- .../xenomai/xenomai_stable-3.2.x.bb | 1 + scripts/deploy_to_aws.sh | 2 +- scripts/run-lava-tests.sh | 5 +- tests/README.md | 19 ++-- 17 files changed, 142 insertions(+), 210 deletions(-)
Quoted 7 lines
rename
ci/{kernel_4_19_xenomai_next.yml=> kernel_4_19.yml} (71%) renameci/{kernel_5_10_xenomai_next.yml=> kernel_5_10.yml} (71%) renameci/{kernel_5_4_xenomai_next.yml=> kernel_5_4.yml} (71%) create mode 100644ci/xenomai_3_2_x.yml
mode change 100644 => 120000 recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb create mode 120000 recipes-xenomai/xenomai/xenomai_stable-3.2.x.bb
Looks good to me.
Quirin
Quoted 5 lines · Jan Kiszka via Xenomai
Changes in v4:
- clean up CI variable interface and documentationThis accounts for change in Xenomai next as well as the fork-off of stable/3.2.x. And it simplifies our gitlab-ci configuration as bit.
Can we simplify conf/distro/include/xenomai-version.inc now as well?
Quoted 10 lines
This is "v3" because of patch 3 which was still broken and required the other 2 in order to actually achieve the goal.
There is also 5.15 enabling in next already, but that will likely need an update once the pending mm-issue is understood and resolved.
Jan
Quoted 9 lines · Florian (T CED SES-DE)
Quoted 5 lines · Jan Kiszka via Xenomai
Changes in v4:
- clean up CI variable interface and documentationThis accounts for change in Xenomai next as well as the fork-off of stable/3.2.x. And it simplifies our gitlab-ci configuration as bit.
Can we simplify conf/distro/include/xenomai-version.inc now as well?
We cannot simplify it as long as we support 3.0 and 3.1 with the recipes. We actually need to expand it when adding 5.15 kernel support so that 3.2 picks 5.10 and head 5.15.
Jan
Signature · 2 lines
Siemens AG, Technology Competence Center Embedded Linux