* [xenomai-images][PATCH v4 1/8] xenomai: Unify stable recipes, add link for 3.2.x
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
@ 2022-01-07 15:02 ` Jan Kiszka
2022-01-07 15:02 ` [xenomai-images][PATCH v4 2/8] ci: Refactor inclusions Jan Kiszka
` (8 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:02 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.../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
diff --git a/recipes-xenomai/xenomai/xenomai_stable-3.0.x.bb b/recipes-xenomai/xenomai/xenomai_stable-3.0.x.bb
index 758d5ea..6231e9e 100644
--- a/recipes-xenomai/xenomai/xenomai_stable-3.0.x.bb
+++ b/recipes-xenomai/xenomai/xenomai_stable-3.0.x.bb
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2018-2020
+# Copyright (c) Siemens AG, 2018-2022
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -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"
diff --git a/recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb b/recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb
deleted file mode 100644
index d2c7a33..0000000
--- a/recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2020
-#
-# Authors:
-# Quirin Gylstorff <quirin.gylstorff@siemens.com>
-# Jan Kiszka <jan.kiszka@siemens.com>
-#
-# 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"
diff --git a/recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb b/recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb
new file mode 120000
index 0000000..0914c52
--- /dev/null
+++ b/recipes-xenomai/xenomai/xenomai_stable-3.1.x.bb
@@ -0,0 +1 @@
+xenomai_stable-3.0.x.bb
\ No newline at end of file
diff --git a/recipes-xenomai/xenomai/xenomai_stable-3.2.x.bb b/recipes-xenomai/xenomai/xenomai_stable-3.2.x.bb
new file mode 120000
index 0000000..0914c52
--- /dev/null
+++ b/recipes-xenomai/xenomai/xenomai_stable-3.2.x.bb
@@ -0,0 +1 @@
+xenomai_stable-3.0.x.bb
\ No newline at end of file
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 2/8] ci: Refactor inclusions
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
2022-01-07 15:02 ` [xenomai-images][PATCH v4 1/8] xenomai: Unify stable recipes, add link for 3.2.x Jan Kiszka
@ 2022-01-07 15:02 ` Jan Kiszka
2022-01-07 15:02 ` [xenomai-images][PATCH v4 3/8] ci: Drop JOB_TEMPLATE_PATH variable Jan Kiszka
` (7 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:02 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
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.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
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%)
diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
index 367085d..cdf20e5 100644
--- a/ci/gitlab-ci-base.yml
+++ b/ci/gitlab-ci-base.yml
@@ -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
diff --git a/ci/kernel_4_19_xenomai_next.yml b/ci/kernel_4_19.yml
similarity index 71%
rename from ci/kernel_4_19_xenomai_next.yml
rename to ci/kernel_4_19.yml
index 6ae2c35..c55b26a 100644
--- a/ci/kernel_4_19_xenomai_next.yml
+++ b/ci/kernel_4_19.yml
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2019 - 2020
+# Copyright (c) Siemens AG, 2019 - 2022
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -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"
diff --git a/ci/kernel_5_10_xenomai_next.yml b/ci/kernel_5_10.yml
similarity index 71%
rename from ci/kernel_5_10_xenomai_next.yml
rename to ci/kernel_5_10.yml
index 80bcf87..1c30617 100644
--- a/ci/kernel_5_10_xenomai_next.yml
+++ b/ci/kernel_5_10.yml
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2019 - 2021
+# Copyright (c) Siemens AG, 2019 - 2022
#
# Authors:
# Jan Kiszka <jan.kiszka@siemens.com>
@@ -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"
diff --git a/ci/kernel_5_4_xenomai_next.yml b/ci/kernel_5_4.yml
similarity index 71%
rename from ci/kernel_5_4_xenomai_next.yml
rename to ci/kernel_5_4.yml
index 6b2708f..f80b653 100644
--- a/ci/kernel_5_4_xenomai_next.yml
+++ b/ci/kernel_5_4.yml
@@ -1,7 +1,7 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2019 - 2020
+# Copyright (c) Siemens AG, 2019 - 2022
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -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"
diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
index cedd2e0..5d3ddee 100644
--- a/ci/xenomai_3_0_x.yml
+++ b/ci/xenomai_3_0_x.yml
@@ -1,40 +1,33 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2019 - 2020
+# Copyright (c) Siemens AG, 2019 - 2022
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
#
# 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"
diff --git a/ci/xenomai_3_1_x.yml b/ci/xenomai_3_1_x.yml
index 1e0961f..b6f0010 100644
--- a/ci/xenomai_3_1_x.yml
+++ b/ci/xenomai_3_1_x.yml
@@ -1,97 +1,18 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2020
+# Copyright (c) Siemens AG, 2020-2022
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
#
# SPDX-License-Identifier: MIT
#
+
include:
- local: '/ci/gitlab-ci-base.yml'
+ - local: '/ci/kernel_4_19.yml'
-
-build-4.19:qemu-amd64:
- extends: .build:qemu-amd64
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
- LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml"
-
-lava-test-4.19:qemu-amd64:
- needs: [ "build-4.19:qemu-amd64" ]
- extends: .lava-test:qemu-amd64
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- BUILD_IDENTIFIER: "4.19"
-
-build-4.19:qemu-armhf:
- extends: .build:qemu-armhf
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
- LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml"
-
-lava-test-4.19:qemu-armhf:
- needs: [ "build-4.19:qemu-armhf" ]
- extends: .lava-test:qemu-armhf
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- BUILD_IDENTIFIER: "4.19"
-
-build-4.19:qemu-arm64:
- extends: .build:qemu-arm64
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
- LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml"
-
-lava-test-4.19:qemu-arm64:
- needs: [ "build-4.19:qemu-arm64" ]
- extends: .lava-test:qemu-arm64
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- BUILD_IDENTIFIER: "4.19"
-
-build-4.19:hikey:
- extends: .build:hikey
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
- LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml"
-
-lava-test-4.19:hikey:
- needs: [ "build-4.19:hikey" ]
- extends: .lava-test:hikey
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- BUILD_IDENTIFIER: "4.19"
-
-build-4.19:beagle-bone-black:
- extends: .build:beagle-bone-black
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
- LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml"
-
-lava-test-4.19:beagle-bone-black:
- needs: [ "build-4.19:beagle-bone-black" ]
- extends: .lava-test:beagle-bone-black
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- BUILD_IDENTIFIER: "4.19"
-
-build-4.19:x86-64-efi:
- extends: .build:x86-64-efi
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
- LINUX_BUILD_OPTION: ":opt-linux-latest-4.19.yml"
-
-lava-test-4.19:x86-64-efi:
- needs: [ "build-4.19:x86-64-efi" ]
- extends: .lava-test:x86-64-efi
- variables:
- DEPLOY_DIR_EXTENSION: "xenomai-3.1.x"
- BUILD_IDENTIFIER: "4.19"
+variables:
+ XENOMAI_BUILD_OPTION: ":opt-xenomai-3.1.x.yml"
+ XENOMAI_VERSION: "3.1.x"
diff --git a/ci/xenomai_next.yml b/ci/xenomai_next.yml
index b13dfa8..91275ae 100644
--- a/ci/xenomai_next.yml
+++ b/ci/xenomai_next.yml
@@ -1,15 +1,20 @@
#
# Xenomai Real-Time System
#
-# Copyright (c) Siemens AG, 2019 - 2021
+# Copyright (c) Siemens AG, 2019 - 2022
#
# Authors:
# Quirin Gylstorff <quirin.gylstorff@siemens.com>
#
# 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"
diff --git a/scripts/deploy_to_aws.sh b/scripts/deploy_to_aws.sh
index 7d9aa89..f5aed6f 100755
--- a/scripts/deploy_to_aws.sh
+++ b/scripts/deploy_to_aws.sh
@@ -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"
diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index de63b28..c090d83 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -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}'"
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 3/8] ci: Drop JOB_TEMPLATE_PATH variable
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
2022-01-07 15:02 ` [xenomai-images][PATCH v4 1/8] xenomai: Unify stable recipes, add link for 3.2.x Jan Kiszka
2022-01-07 15:02 ` [xenomai-images][PATCH v4 2/8] ci: Refactor inclusions Jan Kiszka
@ 2022-01-07 15:02 ` Jan Kiszka
2022-01-07 15:02 ` [xenomai-images][PATCH v4 4/8] ci: Drop no longer user TARGET_EXTENSION variable Jan Kiszka
` (6 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:02 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
That's an interface without a real use case. Dropping it makes live
easier for users that want to understand the setup.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
scripts/run-lava-tests.sh | 3 +--
tests/README.md | 1 -
2 files changed, 1 insertion(+), 3 deletions(-)
diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index c090d83..30a853f 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -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"
diff --git a/tests/README.md b/tests/README.md
index 3e17271..24ffb81 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -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
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 4/8] ci: Drop no longer user TARGET_EXTENSION variable
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (2 preceding siblings ...)
2022-01-07 15:02 ` [xenomai-images][PATCH v4 3/8] ci: Drop JOB_TEMPLATE_PATH variable Jan Kiszka
@ 2022-01-07 15:02 ` Jan Kiszka
2022-01-07 15:03 ` [xenomai-images][PATCH v4 5/8] ci: Update README.md regarding CI variables Jan Kiszka
` (5 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:02 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
Was obsoleted by d3a501ebfe2c.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
ci/gitlab-ci-base.yml | 2 +-
tests/README.md | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
index cdf20e5..057b9dd 100644
--- a/ci/gitlab-ci-base.yml
+++ b/ci/gitlab-ci-base.yml
@@ -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:
diff --git a/tests/README.md b/tests/README.md
index 24ffb81..5779e9b 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -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
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 5/8] ci: Update README.md regarding CI variables
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (3 preceding siblings ...)
2022-01-07 15:02 ` [xenomai-images][PATCH v4 4/8] ci: Drop no longer user TARGET_EXTENSION variable Jan Kiszka
@ 2022-01-07 15:03 ` Jan Kiszka
2022-01-07 15:03 ` [xenomai-images][PATCH v4 6/8] ci: Add 3.2.x stable, confine next Jan Kiszka
` (4 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:03 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
Some were undocumented, DEPLOY_DIR_EXTENSION is now history and was
actually never an external interface.
Reindent the LAVA settings section at this chance.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
tests/README.md | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/tests/README.md b/tests/README.md
index 5779e9b..0767192 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -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
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 6/8] ci: Add 3.2.x stable, confine next
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (4 preceding siblings ...)
2022-01-07 15:03 ` [xenomai-images][PATCH v4 5/8] ci: Update README.md regarding CI variables Jan Kiszka
@ 2022-01-07 15:03 ` Jan Kiszka
2022-01-07 15:03 ` [xenomai-images][PATCH v4 7/8] Kconfig: Add entry for 3.2.x head Jan Kiszka
` (3 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:03 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
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.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
.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%)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1eb0b3..58398fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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:
diff --git a/ci/xenomai_next.yml b/ci/xenomai_3_2_x.yml
similarity index 81%
copy from ci/xenomai_next.yml
copy to ci/xenomai_3_2_x.yml
index 91275ae..7ca77a3 100644
--- a/ci/xenomai_next.yml
+++ b/ci/xenomai_3_2_x.yml
@@ -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"
diff --git a/ci/xenomai_next.yml b/ci/xenomai_next.yml
index 91275ae..adb5990 100644
--- a/ci/xenomai_next.yml
+++ b/ci/xenomai_next.yml
@@ -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:
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 7/8] Kconfig: Add entry for 3.2.x head
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (5 preceding siblings ...)
2022-01-07 15:03 ` [xenomai-images][PATCH v4 6/8] ci: Add 3.2.x stable, confine next Jan Kiszka
@ 2022-01-07 15:03 ` Jan Kiszka
2022-01-07 15:03 ` [xenomai-images][PATCH v4 8/8] linux-xenomai: Refactor latest recipe Jan Kiszka
` (2 subsequent siblings)
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:03 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
Kconfig | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Kconfig b/Kconfig
index 8337d3f..df47058 100644
--- a/Kconfig
+++ b/Kconfig
@@ -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"
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* [xenomai-images][PATCH v4 8/8] linux-xenomai: Refactor latest recipe
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (6 preceding siblings ...)
2022-01-07 15:03 ` [xenomai-images][PATCH v4 7/8] Kconfig: Add entry for 3.2.x head Jan Kiszka
@ 2022-01-07 15:03 ` Jan Kiszka
2022-01-07 15:25 ` [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Gylstorff Quirin
2022-01-07 17:43 ` Bezdeka, Florian
9 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-07 15:03 UTC (permalink / raw)
To: xenomai
From: Jan Kiszka <jan.kiszka@siemens.com>
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.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
recipes-kernel/linux/linux-xenomai_latest.bb | 37 +++++++++++++++-----
1 file changed, 28 insertions(+), 9 deletions(-)
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
index 05946f7..bc5379e 100644
--- a/recipes-kernel/linux/linux-xenomai_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai_latest.bb
@@ -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}"
--
2.31.1
^ permalink raw reply related [flat|nested] 12+ messages in thread* Re: [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (7 preceding siblings ...)
2022-01-07 15:03 ` [xenomai-images][PATCH v4 8/8] linux-xenomai: Refactor latest recipe Jan Kiszka
@ 2022-01-07 15:25 ` Gylstorff Quirin
2022-01-07 17:43 ` Bezdeka, Florian
9 siblings, 0 replies; 12+ messages in thread
From: Gylstorff Quirin @ 2022-01-07 15:25 UTC (permalink / raw)
To: Jan Kiszka, xenomai
On 1/7/22 16:02, Jan Kiszka wrote:
> 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.bb
>
Looks good to me.
Quirin
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x
2022-01-07 15:02 [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Jan Kiszka
` (8 preceding siblings ...)
2022-01-07 15:25 ` [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x Gylstorff Quirin
@ 2022-01-07 17:43 ` Bezdeka, Florian
2022-01-08 9:56 ` Jan Kiszka
9 siblings, 1 reply; 12+ messages in thread
From: Bezdeka, Florian @ 2022-01-07 17:43 UTC (permalink / raw)
To: xenomai, jan.kiszka
On Fri, 2022-01-07 at 16:02 +0100, Jan Kiszka via Xenomai wrote:
> 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.
Can we simplify conf/distro/include/xenomai-version.inc now as well?
>
> 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
>
>
^ permalink raw reply [flat|nested] 12+ messages in thread* Re: [xenomai-images][PATCH v4 0/8] Update CI and kconfig for next and stable/3.2.x
2022-01-07 17:43 ` Bezdeka, Florian
@ 2022-01-08 9:56 ` Jan Kiszka
0 siblings, 0 replies; 12+ messages in thread
From: Jan Kiszka @ 2022-01-08 9:56 UTC (permalink / raw)
To: Bezdeka, Florian (T CED SES-DE), xenomai
On 07.01.22 18:43, Bezdeka, Florian (T CED SES-DE) wrote:
> On Fri, 2022-01-07 at 16:02 +0100, Jan Kiszka via Xenomai wrote:
>> 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.
>
> 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
--
Siemens AG, Technology
Competence Center Embedded Linux
^ permalink raw reply [flat|nested] 12+ messages in thread