All of lore.kernel.org
 help / color / mirror / Atom feed
* [xenomai-images][PATCH 0/4] ci: update for 5.4 testing
@ 2020-11-04 16:11 Q. Gylstorff
  2020-11-04 16:11 ` [xenomai-images][PATCH 1/4] linux-xenomai: update ipipe versions Q. Gylstorff
                   ` (4 more replies)
  0 siblings, 5 replies; 15+ messages in thread
From: Q. Gylstorff @ 2020-11-04 16:11 UTC (permalink / raw)
  To: xenomai, jan.kiszka

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Split the xenomai build into multiple files to decrease duplicated
code. Defaults-builds now contains the base definition for each
build and test. 4.19_builds, 5.4_builds and xenomai_3_0_x.yml use
this base-builds for the targets.

You can find the a pipeline at:
https://gitlab.com/Quirin.Gy/xenomai-images-test/-/pipelines/211684466

Quirin Gylstorff (4):
  linux-xenomai: update ipipe versions
  delete linux-xenomai_4.14
  ci: Split build and add 5.4 builds
  tests: increase timeouts

 ci/4_19_builds.yml                           |  58 ++++++++++
 ci/5_4_builds.yml                            |  30 +++++
 ci/artifacts.yml                             |   4 +
 ci/default-builds.yml                        |  76 +++++++++++++
 ci/gitlab-ci-base.yml                        | 110 +------------------
 ci/no-artifacts.yml                          |   4 +
 ci/xenomai_3_0_x.yml                         |  36 ++++++
 opt-linux-4.19.yml                           |  17 +++
 opt-linux-latest.yml                         |   3 +
 recipes-kernel/linux/linux-xenomai_4.14.bb   |  24 ----
 recipes-kernel/linux/linux-xenomai_4.19.bb   |  12 +-
 recipes-kernel/linux/linux-xenomai_4.4.bb    |   8 +-
 recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
 scripts/get-build-id.sh                      |   2 +-
 tests/jobs/xenomai-beagle-bone-black.yml     |   8 +-
 tests/jobs/xenomai-hikey.yml                 |   6 +-
 tests/jobs/xenomai-ipc227e.yml               |   8 +-
 tests/jobs/xenomai-minnow.yml                |   8 +-
 tests/jobs/xenomai-qemu-amd64.yml            |   8 +-
 tests/jobs/xenomai-qemu-arm64.yml            |   8 +-
 tests/jobs/xenomai-qemu-armhf.yml            |   8 +-
 tests/jobs/xenomai-x86-64-efi.yml            |   8 +-
 22 files changed, 279 insertions(+), 173 deletions(-)
 create mode 100644 ci/4_19_builds.yml
 create mode 100644 ci/5_4_builds.yml
 create mode 100644 ci/default-builds.yml
 create mode 100644 ci/xenomai_3_0_x.yml
 create mode 100644 opt-linux-4.19.yml
 delete mode 100644 recipes-kernel/linux/linux-xenomai_4.14.bb

-- 
2.20.1



^ permalink raw reply	[flat|nested] 15+ messages in thread
* [xenomai-images][PATCH 1/4] linux-xenomai: update ipipe versions
  2020-11-04 16:11 [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Q. Gylstorff
@ 2020-11-04 16:11 ` Q. Gylstorff
  2020-11-04 16:11 ` [xenomai-images][PATCH 2/4] delete linux-xenomai_4.14 Q. Gylstorff
                   ` (3 subsequent siblings)
  4 siblings, 0 replies; 15+ messages in thread
From: Q. Gylstorff @ 2020-11-04 16:11 UTC (permalink / raw)
  To: xenomai, jan.kiszka

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Update linux-xenomai 4.19 and 4.4 to latest release tag.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 recipes-kernel/linux/linux-xenomai_4.19.bb | 12 ++++++------
 recipes-kernel/linux/linux-xenomai_4.4.bb  |  8 +++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/recipes-kernel/linux/linux-xenomai_4.19.bb b/recipes-kernel/linux/linux-xenomai_4.19.bb
index 29e9f05..12e2199 100644
--- a/recipes-kernel/linux/linux-xenomai_4.19.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.19.bb
@@ -12,15 +12,15 @@
 require recipes-kernel/linux/linux-xenomai.inc
 
 SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;nobranch=1"
-SRCREV_amd64 ?= "ipipe-core-4.19.94-cip18-x86-10"
-PV_amd64 ?= "4.19.94+"
+SRCREV_amd64 ?= "ipipe-core-4.19.140-cip33-x86-14"
+PV_amd64 ?= "4.19.140+"
 
 SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1"
-SRCREV_arm64 ?= "ipipe-core-4.19.55-arm64-4"
-PV_arm64 ?= "4.19.55+"
+SRCREV_arm64 ?= "ipipe-core-4.19.144-cip34-arm64-08"
+PV_arm64 ?= "4.19.144+"
 
 SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1"
-SRCREV_armhf ?= "ipipe-core-4.19.55-arm-5"
-PV_armhf ?= "4.19.55+"
+SRCREV_armhf ?= "ipipe-core-4.19.140-cip33-arm-11"
+PV_armhf ?= "4.19.140+"
 
 S = "${WORKDIR}/git"
diff --git a/recipes-kernel/linux/linux-xenomai_4.4.bb b/recipes-kernel/linux/linux-xenomai_4.4.bb
index 1c8c80f..c141914 100644
--- a/recipes-kernel/linux/linux-xenomai_4.4.bb
+++ b/recipes-kernel/linux/linux-xenomai_4.4.bb
@@ -11,10 +11,12 @@
 
 require recipes-kernel/linux/linux-xenomai.inc
 
-SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1;tag=ipipe-core-4.4.208-cip41-x86-21"
-PV_amd64 = "4.4.208+"
+SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
+SRCREV_amd64 ?= "ipipe-core-4.4.235-cip49-x86-25"
+PV_amd64 = "4.4.235+"
 
-SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1;tag=ipipe-core-4.4.176-arm-10"
+SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe.git;protocol=https;nobranch=1"
+SRCREV_armhf ?= "ipipe-core-4.4.176-arm-10"
 PV_armhf = "4.4.176+"
 
 S = "${WORKDIR}/git"
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [xenomai-images][PATCH 2/4] delete linux-xenomai_4.14
  2020-11-04 16:11 [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Q. Gylstorff
  2020-11-04 16:11 ` [xenomai-images][PATCH 1/4] linux-xenomai: update ipipe versions Q. Gylstorff
@ 2020-11-04 16:11 ` Q. Gylstorff
  2020-11-04 16:11 ` [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds Q. Gylstorff
                   ` (2 subsequent siblings)
  4 siblings, 0 replies; 15+ messages in thread
From: Q. Gylstorff @ 2020-11-04 16:11 UTC (permalink / raw)
  To: xenomai, jan.kiszka

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Delete linux-xenomai_4.14 as it is no longer supported.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 recipes-kernel/linux/linux-xenomai_4.14.bb | 24 ----------------------
 1 file changed, 24 deletions(-)
 delete mode 100644 recipes-kernel/linux/linux-xenomai_4.14.bb

diff --git a/recipes-kernel/linux/linux-xenomai_4.14.bb b/recipes-kernel/linux/linux-xenomai_4.14.bb
deleted file mode 100644
index 8ffc66f..0000000
--- a/recipes-kernel/linux/linux-xenomai_4.14.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# Xenomai Real-Time System
-#
-# Copyright (c) Siemens AG, 2018
-#
-# Authors:
-#  Jan Kiszka <jan.kiszka@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-require recipes-kernel/linux/linux-xenomai.inc
-
-SRC_URI_append_amd64 = " git://github.com/xenomai-ci/ipipe-x86.git;protocol=https;branch=ipipe-x86-4.14.y"
-SRCREV_amd64 = "fdfa1aff4578edf6a03e2e77ea20bf7f97863954"
-PV_amd64 = "4.14.134+"
-
-SRC_URI_append_arm64 = " git://github.com/xenomai-ci/ipipe-arm64.git;protocol=https;nobranch=1;tag=ipipe-core-4.14.78-arm64-2"
-PV_arm64 = "4.14.78+"
-
-SRC_URI_append_armhf = " git://github.com/xenomai-ci/ipipe-arm.git;protocol=https;nobranch=1;tag=ipipe-core-4.14.110-arm-7"
-PV_armhf = "4.14.110+"
-
-S = "${WORKDIR}/git"
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 16:11 [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Q. Gylstorff
  2020-11-04 16:11 ` [xenomai-images][PATCH 1/4] linux-xenomai: update ipipe versions Q. Gylstorff
  2020-11-04 16:11 ` [xenomai-images][PATCH 2/4] delete linux-xenomai_4.14 Q. Gylstorff
@ 2020-11-04 16:11 ` Q. Gylstorff
  2020-11-04 16:22   ` Jan Kiszka
                     ` (2 more replies)
  2020-11-04 16:11 ` [xenomai-images][PATCH 4/4] tests: increase timeouts Q. Gylstorff
  2020-11-04 16:49 ` [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Jan Kiszka
  4 siblings, 3 replies; 15+ messages in thread
From: Q. Gylstorff @ 2020-11-04 16:11 UTC (permalink / raw)
  To: xenomai, jan.kiszka

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
This allows the reuse of build descriptions and simplifies the adding
of new builds.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 ci/4_19_builds.yml                           |  58 ++++++++++
 ci/5_4_builds.yml                            |  30 +++++
 ci/artifacts.yml                             |   4 +
 ci/default-builds.yml                        |  76 +++++++++++++
 ci/gitlab-ci-base.yml                        | 110 +------------------
 ci/no-artifacts.yml                          |   4 +
 ci/xenomai_3_0_x.yml                         |  36 ++++++
 opt-linux-4.19.yml                           |  17 +++
 opt-linux-latest.yml                         |   3 +
 recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
 scripts/get-build-id.sh                      |   2 +-
 11 files changed, 237 insertions(+), 109 deletions(-)
 create mode 100644 ci/4_19_builds.yml
 create mode 100644 ci/5_4_builds.yml
 create mode 100644 ci/default-builds.yml
 create mode 100644 ci/xenomai_3_0_x.yml
 create mode 100644 opt-linux-4.19.yml

diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
new file mode 100644
index 0000000..25be0c5
--- /dev/null
+++ b/ci/4_19_builds.yml
@@ -0,0 +1,58 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2020
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+variables:
+  LATEST_GIT_BRANCH: "4.19"
+  DEPLOY_DIR_EXTENSION: "4.19"
+  BUILD_IDENTIFIER: "4.19"
+
+build-4.19:board-qemu-amd64:
+  extends: .build:board-qemu-amd64
+
+lava-test-4.19:qemu-amd64:
+  needs: [ "build-4.19:board-qemu-amd64" ]
+  extends: .lava-test:qemu-amd64
+
+build-4.19:board-qemu-armhf:
+  extends: .build:board-qemu-armhf
+
+lava-test-4.19:qemu-armhf:
+  needs: [ "build-4.19:board-qemu-armhf" ]
+  extends: .lava-test:qemu-armhf
+
+build-4.19:board-qemu-arm64:
+  extends: .build:board-qemu-arm64
+
+lava-test-4.19:qemu-arm64:
+  needs: [ "build-4.19:board-qemu-arm64" ]
+  extends: .lava-test:qemu-arm64
+
+build-4.19:board-hikey:
+  extends: .build:board-hikey
+
+lava-test-4.19:board-hikey:
+  needs: [ "build-4.19:board-hikey" ]
+  extends: .lava-test:board-hikey
+
+build-4.19:board-beagle-bone-black:
+  extends: .build:board-beagle-bone-black
+
+lava-test-4.19:board-beagle-bone-black:
+  needs: [ "build-4.19:board-beagle-bone-black" ]
+  extends: .lava-test:board-beagle-bone-black
+
+build-4.19:board-x86-64-efi:
+  extends: .build:board-x86-64-efi
+
+lava-test-4.19:board-x86-64-efi:
+  needs: [ "build-4.19:board-x86-64-efi" ]
+  extends: .lava-test:board-x86-64-efi
+
+
diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
new file mode 100644
index 0000000..b5cfdb9
--- /dev/null
+++ b/ci/5_4_builds.yml
@@ -0,0 +1,30 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2020
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+variables:
+  LATEST_GIT_BRANCH: "5.4"
+  DEPLOY_DIR_EXTENSION: "5.4"
+  BUILD_IDENTIFIER: "5.4"
+
+build-5.4:board-qemu-amd64:
+  extends: .build:board-qemu-amd64
+
+lava-test-5.4:qemu-amd64:
+  needs: [ "build-5.4:board-qemu-amd64" ]
+  extends: .lava-test:qemu-amd64
+
+build-5.4:board-x86-64-efi:
+  extends: .build:board-x86-64-efi
+
+lava-test-5.4:board-x86-64-efi:
+  needs: [ "build-5.4:board-x86-64-efi" ]
+  extends: .lava-test:board-x86-64-efi
+
+
diff --git a/ci/artifacts.yml b/ci/artifacts.yml
index 510f903..cc42274 100644
--- a/ci/artifacts.yml
+++ b/ci/artifacts.yml
@@ -19,3 +19,7 @@
     expire_in: 1 week
 include:
   - local: '/ci/gitlab-ci-base.yml'
+  - local: '/ci/default-builds.yml'
+  - local: '/ci/4_19_builds.yml'
+  - local: '/ci/5_4_builds.yml'
+  - local: '/ci/xenomai_3_0_x.yml'
diff --git a/ci/default-builds.yml b/ci/default-builds.yml
new file mode 100644
index 0000000..6979dd3
--- /dev/null
+++ b/ci/default-builds.yml
@@ -0,0 +1,76 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2020
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+.build:board-qemu-amd64:
+  extends: .build
+  variables:
+    TARGET: qemu-amd64
+    BUILD_OPTIONS: ":opt-ext4-gz.yml"
+
+.lava-test:qemu-amd64:
+  extends: .test
+  variables:
+    TARGET: qemu-amd64
+
+.build:board-qemu-armhf:
+  extends: .build
+  variables:
+    TARGET: qemu-armhf
+    BUILD_OPTIONS: ":opt-ext4-gz.yml"
+
+.lava-test:qemu-armhf:
+  extends: .test
+  variables:
+    TARGET: qemu-armhf
+
+.build:board-qemu-arm64:
+  extends: .build
+  variables:
+    TARGET: qemu-arm64
+    BUILD_OPTIONS: ":opt-ext4-gz.yml"
+
+.lava-test:qemu-arm64:
+  extends: .test
+  variables:
+    TARGET: qemu-arm64
+
+.build:board-hikey:
+  extends: .build
+  variables:
+    TARGET: hikey
+    BUILD_OPTIONS: ":opt-lava-test.yml"
+
+.lava-test:board-hikey:
+  extends: .test
+  variables:
+    TARGET: hikey
+
+.build:board-beagle-bone-black:
+  extends: .build
+  variables:
+    TARGET: beagle-bone-black
+    BUILD_OPTIONS: ":opt-lava-test.yml"
+
+.lava-test:board-beagle-bone-black:
+  extends: .test
+  variables:
+    TARGET: beagle-bone-black
+
+.build:board-x86-64-efi:
+  extends: .build
+  variables:
+    TARGET: x86-64-efi
+    BUILD_OPTIONS: ":opt-lava-test.yml"
+
+.lava-test:board-x86-64-efi:
+  extends: .test
+  variables:
+    TARGET: x86-64-efi
+
diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
index 18419a8..a766a9e 100644
--- a/ci/gitlab-ci-base.yml
+++ b/ci/gitlab-ci-base.yml
@@ -10,7 +10,7 @@
 #
 stages:
   - build
-  - lava-test
+  - test
 
 variables:
   GIT_STRATEGY: clone
@@ -37,119 +37,15 @@ default:
 
 .test:
   extends: .add-lava-ssh-config
-  stage: lava-test
+  stage: test
   script:
     - scripts/install-lavacli.sh
     - export BUILD_JOB_ID=$(scripts/get-build-id.sh ${BUILD_JOB_NAME})
     - scripts/run-lava-tests.sh ${TARGET}
   variables:
-    BUILD_JOB_NAME: "build:board-${TARGET}${TARGET_EXTENSION}"
+    BUILD_JOB_NAME: "build-${BUILD_IDENTIFIER}:board-${TARGET}${TARGET_EXTENSION}"
   only:
     variables:
       - $LAVA_SSH_USER
 
 
-build:board-qemu-amd64:
-  extends: .build
-  variables:
-    TARGET: qemu-amd64
-    BUILD_OPTIONS: ":opt-ext4-gz.yml"
-
-lava-test:qemu-amd64:
-  needs: [ "build:board-qemu-amd64" ]
-  dependencies: [ "build:board-qemu-amd64" ]
-  extends: .test
-  variables:
-    TARGET: qemu-amd64
-
-build:board-qemu-armhf:
-  extends: .build
-  variables:
-    TARGET: qemu-armhf
-    BUILD_OPTIONS: ":opt-ext4-gz.yml"
-
-lava-test:qemu-armhf:
-  needs: [ "build:board-qemu-armhf" ]
-  extends: .test
-  variables:
-    TARGET: qemu-armhf
-
-build:board-qemu-arm64:
-  extends: .build
-  variables:
-    TARGET: qemu-arm64
-    BUILD_OPTIONS: ":opt-ext4-gz.yml"
-
-lava-test:qemu-arm64:
-  needs: [ "build:board-qemu-arm64" ]
-  extends: .test
-  variables:
-    TARGET: qemu-arm64
-
-build:board-hikey:
-  extends: .build
-  variables:
-    TARGET: hikey
-    BUILD_OPTIONS: ":opt-lava-test.yml"
-
-lava-test:board-hikey:
-  needs: [ "build:board-hikey" ]
-  extends: .test
-  variables:
-    TARGET: hikey
-
-build:board-beagle-bone-black:
-  extends: .build
-  variables:
-    TARGET: beagle-bone-black
-    BUILD_OPTIONS: ":opt-lava-test.yml"
-
-lava-test:board-beagle-bone-black:
-  needs: [ "build:board-beagle-bone-black" ]
-  extends: .test
-  variables:
-    TARGET: beagle-bone-black
-
-build:board-x86-64-efi:
-  extends: .build
-  variables:
-    TARGET: x86-64-efi
-    BUILD_OPTIONS: ":opt-lava-test.yml"
-
-lava-test:board-x86-64-efi:
-  needs: [ "build:board-x86-64-efi" ]
-  extends: .test
-  variables:
-    TARGET: x86-64-efi
-
-build:board-beagle-bone-black:xenomai-3.0.x:
-  extends: .build
-  variables:
-    TARGET: beagle-bone-black
-    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
-    BUILD_OPTIONS: ":opt-lava-test.yml"
-    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
-
-lava-test:board-beagle-bone-black:xenomai-3.0.x:
-  needs: [ "build:board-beagle-bone-black:xenomai-3.0.x" ]
-  extends: .test
-  variables:
-    TARGET: beagle-bone-black
-    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
-    TARGET_EXTENSION: ":xenomai-3.0.x"
-
-build:board-x86-64-efi:xenomai-3.0.x:
-  extends: .build
-  variables:
-    TARGET: x86-64-efi
-    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
-    BUILD_OPTIONS: ":opt-lava-test.yml"
-    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
-
-lava-test:board-x86-64-efi:xenomai-3.0.x:
-  needs: [ "build:board-x86-64-efi:xenomai-3.0.x" ]
-  extends: .test
-  variables:
-    TARGET: x86-64-efi
-    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
-    TARGET_EXTENSION: ":xenomai-3.0.x"
diff --git a/ci/no-artifacts.yml b/ci/no-artifacts.yml
index 02457de..517446e 100644
--- a/ci/no-artifacts.yml
+++ b/ci/no-artifacts.yml
@@ -19,3 +19,7 @@
       - $USE_GITLAB_ARTIFACTS
 include:
   - local: '/ci/gitlab-ci-base.yml'
+  - local: '/ci/default-builds.yml'
+  - local: '/ci/4_19_builds.yml'
+  - local: '/ci/5_4_builds.yml'
+  - local: '/ci/xenomai_3_0_x.yml'
diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
new file mode 100644
index 0000000..9dbd8d4
--- /dev/null
+++ b/ci/xenomai_3_0_x.yml
@@ -0,0 +1,36 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2019 - 2020
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+build-4.4:board-beagle-bone-black:
+  extends: .build:board-beagle-bone-black
+  variables:
+    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
+    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
+
+lava-test-4.4:board-beagle-bone-black:
+  needs: [ "build-4.4:board-beagle-bone-black" ]
+  extends: .lava-test:board-beagle-bone-black
+  variables:
+    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
+    BUILD_IDENTIFIER: "4.4"
+
+build-4.4:board-x86-64-efi:
+  extends: .build:board-x86-64-efi
+  variables:
+    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
+    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
+
+lava-test-4.4:board-x86-64-efi:
+  needs: [ "build-4.4:board-x86-64-efi" ]
+  extends: .lava-test:board-x86-64-efi
+  variables:
+    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
+    BUILD_IDENTIFIER: "4.4"
diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
new file mode 100644
index 0000000..1613e1c
--- /dev/null
+++ b/opt-linux-4.19.yml
@@ -0,0 +1,17 @@
+#
+# Xenomai Real-Time System
+#
+# Copyright (c) Siemens AG, 2020
+#
+# Authors:
+#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+header:
+  version: 8
+
+local_conf_header:
+  linux-xenomai-latest: |
+    PREFERRED_VERSION_linux-xenomai = "4.19%"
diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
index 7cf291a..735c30e 100644
--- a/opt-linux-latest.yml
+++ b/opt-linux-latest.yml
@@ -12,6 +12,9 @@
 header:
   version: 8
 
+env:
+  LATEST_GIT_BRANCH: :LATEST_GIT_BRANCH
+
 local_conf_header:
   linux-xenomai-latest: |
     PREFERRED_VERSION_linux-xenomai = "9999-%"
diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
index 9fc6a63..b99a565 100644
--- a/recipes-kernel/linux/linux-xenomai_latest.bb
+++ b/recipes-kernel/linux/linux-xenomai_latest.bb
@@ -18,8 +18,12 @@ def is_xeno_3_0(d):
     xeno_ver = d.getVar('PREFERRED_VERSION_xenomai') or ''
     return xeno_ver.startswith('3.0') or xeno_ver == 'stable-3.0.x'
 
+def is_5_4_branch(d):
+    linux_ver = d.getVar('LATEST_GIT_BRANCH') or ''
+    return linux_ver.startswith('5.4')
+
 GIT_REPO_amd64 = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-x86.git'}"
-GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y'}"
+GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y' if is_5_4_branch(d) else 'ipipe-x86-4.19.y'}"
 
 GIT_REPO_armhf = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-arm.git'}"
 GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe/master'}"
diff --git a/scripts/get-build-id.sh b/scripts/get-build-id.sh
index ace70c6..71f4413 100755
--- a/scripts/get-build-id.sh
+++ b/scripts/get-build-id.sh
@@ -17,7 +17,7 @@ if [ -z "${name}" ]; then
     fi
 index=0
 JSON=$(curl -s --header "PRIVATE-TOKEN: ${API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?scope[]=success"  )
-while  [ ${index} -le ${MAX_TEST:-16} ]
+while  [ ${index} -le ${MAX_TEST:-26} ]
 do
     build_name=$(echo "${JSON}"  | tr '\r\n' ' ' | jq -r ".[${index}].name")
     if [ "$build_name" = "${name}" ]; then
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread
* [xenomai-images][PATCH 4/4] tests: increase timeouts
  2020-11-04 16:11 [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Q. Gylstorff
                   ` (2 preceding siblings ...)
  2020-11-04 16:11 ` [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds Q. Gylstorff
@ 2020-11-04 16:11 ` Q. Gylstorff
  2020-11-04 16:49 ` [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Jan Kiszka
  4 siblings, 0 replies; 15+ messages in thread
From: Q. Gylstorff @ 2020-11-04 16:11 UTC (permalink / raw)
  To: xenomai, jan.kiszka

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Increase the LAVA test timeouts to avoid test aborts due to slow
connections

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 tests/jobs/xenomai-beagle-bone-black.yml | 8 ++++----
 tests/jobs/xenomai-hikey.yml             | 6 +++---
 tests/jobs/xenomai-ipc227e.yml           | 8 ++++----
 tests/jobs/xenomai-minnow.yml            | 8 ++++----
 tests/jobs/xenomai-qemu-amd64.yml        | 8 ++++----
 tests/jobs/xenomai-qemu-arm64.yml        | 8 ++++----
 tests/jobs/xenomai-qemu-armhf.yml        | 8 ++++----
 tests/jobs/xenomai-x86-64-efi.yml        | 8 ++++----
 8 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/tests/jobs/xenomai-beagle-bone-black.yml b/tests/jobs/xenomai-beagle-bone-black.yml
index 91cb138..034ac99 100644
--- a/tests/jobs/xenomai-beagle-bone-black.yml
+++ b/tests/jobs/xenomai-beagle-bone-black.yml
@@ -13,11 +13,11 @@ device_type: beaglebone-black
 
 timeouts:
   job:
-    minutes: 30
+    minutes: 90
   action:
-    minutes: 20
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -29,7 +29,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tftp
     kernel:
       url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
diff --git a/tests/jobs/xenomai-hikey.yml b/tests/jobs/xenomai-hikey.yml
index b33cef6..f6eb4a4 100644
--- a/tests/jobs/xenomai-hikey.yml
+++ b/tests/jobs/xenomai-hikey.yml
@@ -13,11 +13,11 @@ device_type: hikey
 
 timeouts:
   job:
-    minutes: 30
+    minutes: 90
   action:
-    minutes: 20
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
diff --git a/tests/jobs/xenomai-ipc227e.yml b/tests/jobs/xenomai-ipc227e.yml
index d283c00..a5a181c 100644
--- a/tests/jobs/xenomai-ipc227e.yml
+++ b/tests/jobs/xenomai-ipc227e.yml
@@ -13,11 +13,11 @@ device_type: ipc227e
 
 timeouts:
   job:
-    minutes: 30
+    minutes: 90
   action:
-    minutes: 20
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -29,7 +29,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tftp
     kernel:
       url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
diff --git a/tests/jobs/xenomai-minnow.yml b/tests/jobs/xenomai-minnow.yml
index 82c1468..d5292ff 100644
--- a/tests/jobs/xenomai-minnow.yml
+++ b/tests/jobs/xenomai-minnow.yml
@@ -12,11 +12,11 @@ job_name: xenomai-test-suite
 device_type: minnowboard-max-E3825
 timeouts:
   job:
-    minutes: 30
+    minutes: 90
   action:
-    minutes: 20
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -28,7 +28,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tftp
     kernel:
       url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml
index 68d849f..c335292 100644
--- a/tests/jobs/xenomai-qemu-amd64.yml
+++ b/tests/jobs/xenomai-qemu-amd64.yml
@@ -13,11 +13,11 @@ job_name: QEMU pipeline, xenomai-images-qemu-amd64
 
 timeouts:
   job:
-    minutes: 45
+    minutes: 90
   action:
-    minutes: 5
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -42,7 +42,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tmpfs
     images:
       kernel:
diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
index cd0ca9f..88fb880 100644
--- a/tests/jobs/xenomai-qemu-arm64.yml
+++ b/tests/jobs/xenomai-qemu-arm64.yml
@@ -13,11 +13,11 @@ job_name: QEMU pipeline, xenomai-images-qemu-arm64
 
 timeouts:
   job:
-    minutes: 45
+    minutes: 90
   action:
-    minutes: 5
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -46,7 +46,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tmpfs
     images:
       kernel:
diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml
index 18e3bf8..3e3a8ab 100644
--- a/tests/jobs/xenomai-qemu-armhf.yml
+++ b/tests/jobs/xenomai-qemu-armhf.yml
@@ -13,11 +13,11 @@ job_name: QEMU pipeline, xenomai-images-qemu-armhf
 
 timeouts:
   job:
-    minutes: 45
+    minutes: 90
   action:
-    minutes: 5
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -42,7 +42,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tmpfs
     images:
       kernel:
diff --git a/tests/jobs/xenomai-x86-64-efi.yml b/tests/jobs/xenomai-x86-64-efi.yml
index 2471cce..bc71b75 100644
--- a/tests/jobs/xenomai-x86-64-efi.yml
+++ b/tests/jobs/xenomai-x86-64-efi.yml
@@ -13,11 +13,11 @@ device_type: x86
 
 timeouts:
   job:
-    minutes: 30
+    minutes: 90
   action:
-    minutes: 20
+    minutes: 65
   connection:
-    minutes: 2
+    minutes: 5
 priority: medium
 visibility: public
 
@@ -29,7 +29,7 @@ metadata:
 actions:
 - deploy:
     timeout:
-      minutes: 5
+      minutes: 15
     to: tftp
     kernel:
       url: ${DEPLOY_URL}/${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${TARGET}-vmlinuz
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 16:11 ` [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds Q. Gylstorff
@ 2020-11-04 16:22   ` Jan Kiszka
  2020-11-05  9:15     ` Gylstorff Quirin
  2020-11-04 18:28   ` Jan Kiszka
  2020-11-04 19:44   ` Jan Kiszka
  2 siblings, 1 reply; 15+ messages in thread
From: Jan Kiszka @ 2020-11-04 16:22 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 04.11.20 17:11, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
> This allows the reuse of build descriptions and simplifies the adding
> of new builds.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  ci/4_19_builds.yml                           |  58 ++++++++++
>  ci/5_4_builds.yml                            |  30 +++++
>  ci/artifacts.yml                             |   4 +
>  ci/default-builds.yml                        |  76 +++++++++++++
>  ci/gitlab-ci-base.yml                        | 110 +------------------
>  ci/no-artifacts.yml                          |   4 +
>  ci/xenomai_3_0_x.yml                         |  36 ++++++
>  opt-linux-4.19.yml                           |  17 +++
>  opt-linux-latest.yml                         |   3 +
>  recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>  scripts/get-build-id.sh                      |   2 +-
>  11 files changed, 237 insertions(+), 109 deletions(-)
>  create mode 100644 ci/4_19_builds.yml
>  create mode 100644 ci/5_4_builds.yml
>  create mode 100644 ci/default-builds.yml
>  create mode 100644 ci/xenomai_3_0_x.yml
>  create mode 100644 opt-linux-4.19.yml
> 
> diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
> new file mode 100644
> index 0000000..25be0c5
> --- /dev/null
> +++ b/ci/4_19_builds.yml
> @@ -0,0 +1,58 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +variables:
> +  LATEST_GIT_BRANCH: "4.19"
> +  DEPLOY_DIR_EXTENSION: "4.19"
> +  BUILD_IDENTIFIER: "4.19"
> +
> +build-4.19:board-qemu-amd64:
> +  extends: .build:board-qemu-amd64
> +
> +lava-test-4.19:qemu-amd64:
> +  needs: [ "build-4.19:board-qemu-amd64" ]
> +  extends: .lava-test:qemu-amd64
> +
> +build-4.19:board-qemu-armhf:
> +  extends: .build:board-qemu-armhf
> +
> +lava-test-4.19:qemu-armhf:
> +  needs: [ "build-4.19:board-qemu-armhf" ]
> +  extends: .lava-test:qemu-armhf
> +
> +build-4.19:board-qemu-arm64:
> +  extends: .build:board-qemu-arm64
> +
> +lava-test-4.19:qemu-arm64:
> +  needs: [ "build-4.19:board-qemu-arm64" ]
> +  extends: .lava-test:qemu-arm64
> +
> +build-4.19:board-hikey:
> +  extends: .build:board-hikey
> +
> +lava-test-4.19:board-hikey:
> +  needs: [ "build-4.19:board-hikey" ]
> +  extends: .lava-test:board-hikey
> +
> +build-4.19:board-beagle-bone-black:
> +  extends: .build:board-beagle-bone-black
> +
> +lava-test-4.19:board-beagle-bone-black:
> +  needs: [ "build-4.19:board-beagle-bone-black" ]
> +  extends: .lava-test:board-beagle-bone-black
> +
> +build-4.19:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +
> +lava-test-4.19:board-x86-64-efi:
> +  needs: [ "build-4.19:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +
> +
> diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
> new file mode 100644
> index 0000000..b5cfdb9
> --- /dev/null
> +++ b/ci/5_4_builds.yml
> @@ -0,0 +1,30 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +variables:
> +  LATEST_GIT_BRANCH: "5.4"
> +  DEPLOY_DIR_EXTENSION: "5.4"
> +  BUILD_IDENTIFIER: "5.4"
> +
> +build-5.4:board-qemu-amd64:
> +  extends: .build:board-qemu-amd64
> +
> +lava-test-5.4:qemu-amd64:
> +  needs: [ "build-5.4:board-qemu-amd64" ]
> +  extends: .lava-test:qemu-amd64
> +
> +build-5.4:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +
> +lava-test-5.4:board-x86-64-efi:
> +  needs: [ "build-5.4:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +
> +
> diff --git a/ci/artifacts.yml b/ci/artifacts.yml
> index 510f903..cc42274 100644
> --- a/ci/artifacts.yml
> +++ b/ci/artifacts.yml
> @@ -19,3 +19,7 @@
>      expire_in: 1 week
>  include:
>    - local: '/ci/gitlab-ci-base.yml'
> +  - local: '/ci/default-builds.yml'
> +  - local: '/ci/4_19_builds.yml'
> +  - local: '/ci/5_4_builds.yml'
> +  - local: '/ci/xenomai_3_0_x.yml'
> diff --git a/ci/default-builds.yml b/ci/default-builds.yml
> new file mode 100644
> index 0000000..6979dd3
> --- /dev/null
> +++ b/ci/default-builds.yml
> @@ -0,0 +1,76 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +.build:board-qemu-amd64:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-amd64
> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> +
> +.lava-test:qemu-amd64:
> +  extends: .test
> +  variables:
> +    TARGET: qemu-amd64
> +
> +.build:board-qemu-armhf:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-armhf
> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> +
> +.lava-test:qemu-armhf:
> +  extends: .test
> +  variables:
> +    TARGET: qemu-armhf
> +
> +.build:board-qemu-arm64:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-arm64
> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> +
> +.lava-test:qemu-arm64:
> +  extends: .test
> +  variables:
> +    TARGET: qemu-arm64
> +
> +.build:board-hikey:
> +  extends: .build
> +  variables:
> +    TARGET: hikey
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +
> +.lava-test:board-hikey:
> +  extends: .test
> +  variables:
> +    TARGET: hikey
> +
> +.build:board-beagle-bone-black:
> +  extends: .build
> +  variables:
> +    TARGET: beagle-bone-black
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +
> +.lava-test:board-beagle-bone-black:
> +  extends: .test
> +  variables:
> +    TARGET: beagle-bone-black
> +
> +.build:board-x86-64-efi:
> +  extends: .build
> +  variables:
> +    TARGET: x86-64-efi
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +
> +.lava-test:board-x86-64-efi:
> +  extends: .test
> +  variables:
> +    TARGET: x86-64-efi
> +
> diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
> index 18419a8..a766a9e 100644
> --- a/ci/gitlab-ci-base.yml
> +++ b/ci/gitlab-ci-base.yml
> @@ -10,7 +10,7 @@
>  #
>  stages:
>    - build
> -  - lava-test
> +  - test
>  
>  variables:
>    GIT_STRATEGY: clone
> @@ -37,119 +37,15 @@ default:
>  
>  .test:
>    extends: .add-lava-ssh-config
> -  stage: lava-test
> +  stage: test
>    script:
>      - scripts/install-lavacli.sh
>      - export BUILD_JOB_ID=$(scripts/get-build-id.sh ${BUILD_JOB_NAME})
>      - scripts/run-lava-tests.sh ${TARGET}
>    variables:
> -    BUILD_JOB_NAME: "build:board-${TARGET}${TARGET_EXTENSION}"
> +    BUILD_JOB_NAME: "build-${BUILD_IDENTIFIER}:board-${TARGET}${TARGET_EXTENSION}"
>    only:
>      variables:
>        - $LAVA_SSH_USER
>  
>  
> -build:board-qemu-amd64:
> -  extends: .build
> -  variables:
> -    TARGET: qemu-amd64
> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> -
> -lava-test:qemu-amd64:
> -  needs: [ "build:board-qemu-amd64" ]
> -  dependencies: [ "build:board-qemu-amd64" ]
> -  extends: .test
> -  variables:
> -    TARGET: qemu-amd64
> -
> -build:board-qemu-armhf:
> -  extends: .build
> -  variables:
> -    TARGET: qemu-armhf
> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> -
> -lava-test:qemu-armhf:
> -  needs: [ "build:board-qemu-armhf" ]
> -  extends: .test
> -  variables:
> -    TARGET: qemu-armhf
> -
> -build:board-qemu-arm64:
> -  extends: .build
> -  variables:
> -    TARGET: qemu-arm64
> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> -
> -lava-test:qemu-arm64:
> -  needs: [ "build:board-qemu-arm64" ]
> -  extends: .test
> -  variables:
> -    TARGET: qemu-arm64
> -
> -build:board-hikey:
> -  extends: .build
> -  variables:
> -    TARGET: hikey
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -
> -lava-test:board-hikey:
> -  needs: [ "build:board-hikey" ]
> -  extends: .test
> -  variables:
> -    TARGET: hikey
> -
> -build:board-beagle-bone-black:
> -  extends: .build
> -  variables:
> -    TARGET: beagle-bone-black
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -
> -lava-test:board-beagle-bone-black:
> -  needs: [ "build:board-beagle-bone-black" ]
> -  extends: .test
> -  variables:
> -    TARGET: beagle-bone-black
> -
> -build:board-x86-64-efi:
> -  extends: .build
> -  variables:
> -    TARGET: x86-64-efi
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -
> -lava-test:board-x86-64-efi:
> -  needs: [ "build:board-x86-64-efi" ]
> -  extends: .test
> -  variables:
> -    TARGET: x86-64-efi
> -
> -build:board-beagle-bone-black:xenomai-3.0.x:
> -  extends: .build
> -  variables:
> -    TARGET: beagle-bone-black
> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -
> -lava-test:board-beagle-bone-black:xenomai-3.0.x:
> -  needs: [ "build:board-beagle-bone-black:xenomai-3.0.x" ]
> -  extends: .test
> -  variables:
> -    TARGET: beagle-bone-black
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -    TARGET_EXTENSION: ":xenomai-3.0.x"
> -
> -build:board-x86-64-efi:xenomai-3.0.x:
> -  extends: .build
> -  variables:
> -    TARGET: x86-64-efi
> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -
> -lava-test:board-x86-64-efi:xenomai-3.0.x:
> -  needs: [ "build:board-x86-64-efi:xenomai-3.0.x" ]
> -  extends: .test
> -  variables:
> -    TARGET: x86-64-efi
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -    TARGET_EXTENSION: ":xenomai-3.0.x"
> diff --git a/ci/no-artifacts.yml b/ci/no-artifacts.yml
> index 02457de..517446e 100644
> --- a/ci/no-artifacts.yml
> +++ b/ci/no-artifacts.yml
> @@ -19,3 +19,7 @@
>        - $USE_GITLAB_ARTIFACTS
>  include:
>    - local: '/ci/gitlab-ci-base.yml'
> +  - local: '/ci/default-builds.yml'
> +  - local: '/ci/4_19_builds.yml'
> +  - local: '/ci/5_4_builds.yml'
> +  - local: '/ci/xenomai_3_0_x.yml'
> diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
> new file mode 100644
> index 0000000..9dbd8d4
> --- /dev/null
> +++ b/ci/xenomai_3_0_x.yml
> @@ -0,0 +1,36 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +build-4.4:board-beagle-bone-black:
> +  extends: .build:board-beagle-bone-black
> +  variables:
> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +
> +lava-test-4.4:board-beagle-bone-black:
> +  needs: [ "build-4.4:board-beagle-bone-black" ]
> +  extends: .lava-test:board-beagle-bone-black
> +  variables:
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +    BUILD_IDENTIFIER: "4.4"
> +
> +build-4.4:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +  variables:
> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +
> +lava-test-4.4:board-x86-64-efi:
> +  needs: [ "build-4.4:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +  variables:
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +    BUILD_IDENTIFIER: "4.4"
> diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
> new file mode 100644
> index 0000000..1613e1c
> --- /dev/null
> +++ b/opt-linux-4.19.yml
> @@ -0,0 +1,17 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> +  version: 8
> +
> +local_conf_header:
> +  linux-xenomai-latest: |
> +    PREFERRED_VERSION_linux-xenomai = "4.19%"
> diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
> index 7cf291a..735c30e 100644
> --- a/opt-linux-latest.yml
> +++ b/opt-linux-latest.yml
> @@ -12,6 +12,9 @@
>  header:
>    version: 8
>  
> +env:
> +  LATEST_GIT_BRANCH: :LATEST_GIT_BRANCH
> +
>  local_conf_header:
>    linux-xenomai-latest: |
>      PREFERRED_VERSION_linux-xenomai = "9999-%"
> diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
> index 9fc6a63..b99a565 100644
> --- a/recipes-kernel/linux/linux-xenomai_latest.bb
> +++ b/recipes-kernel/linux/linux-xenomai_latest.bb
> @@ -18,8 +18,12 @@ def is_xeno_3_0(d):
>      xeno_ver = d.getVar('PREFERRED_VERSION_xenomai') or ''
>      return xeno_ver.startswith('3.0') or xeno_ver == 'stable-3.0.x'
>  
> +def is_5_4_branch(d):
> +    linux_ver = d.getVar('LATEST_GIT_BRANCH') or ''
> +    return linux_ver.startswith('5.4')
> +
>  GIT_REPO_amd64 = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-x86.git'}"
> -GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y'}"
> +GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y' if is_5_4_branch(d) else 'ipipe-x86-4.19.y'}"
>  
>  GIT_REPO_armhf = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-arm.git'}"
>  GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe/master'}"
> diff --git a/scripts/get-build-id.sh b/scripts/get-build-id.sh
> index ace70c6..71f4413 100755
> --- a/scripts/get-build-id.sh
> +++ b/scripts/get-build-id.sh
> @@ -17,7 +17,7 @@ if [ -z "${name}" ]; then
>      fi
>  index=0
>  JSON=$(curl -s --header "PRIVATE-TOKEN: ${API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?scope[]=success"  )
> -while  [ ${index} -le ${MAX_TEST:-16} ]
> +while  [ ${index} -le ${MAX_TEST:-26} ]

Where does MAX_TEST come from, BTW? CI env var?

Why do we need that limit at all? Seems we should rather detect if the
build_name extraction below starts to fail and terminate with an error then.

>  do
>      build_name=$(echo "${JSON}"  | tr '\r\n' ' ' | jq -r ".[${index}].name")
>      if [ "$build_name" = "${name}" ]; then
> 

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 0/4] ci: update for 5.4 testing
  2020-11-04 16:11 [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Q. Gylstorff
                   ` (3 preceding siblings ...)
  2020-11-04 16:11 ` [xenomai-images][PATCH 4/4] tests: increase timeouts Q. Gylstorff
@ 2020-11-04 16:49 ` Jan Kiszka
  4 siblings, 0 replies; 15+ messages in thread
From: Jan Kiszka @ 2020-11-04 16:49 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 04.11.20 17:11, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Split the xenomai build into multiple files to decrease duplicated
> code. Defaults-builds now contains the base definition for each
> build and test. 4.19_builds, 5.4_builds and xenomai_3_0_x.yml use
> this base-builds for the targets.
> 
> You can find the a pipeline at:
> https://gitlab.com/Quirin.Gy/xenomai-images-test/-/pipelines/211684466
> 
> Quirin Gylstorff (4):
>   linux-xenomai: update ipipe versions
>   delete linux-xenomai_4.14
>   ci: Split build and add 5.4 builds
>   tests: increase timeouts
> 
>  ci/4_19_builds.yml                           |  58 ++++++++++
>  ci/5_4_builds.yml                            |  30 +++++
>  ci/artifacts.yml                             |   4 +
>  ci/default-builds.yml                        |  76 +++++++++++++
>  ci/gitlab-ci-base.yml                        | 110 +------------------
>  ci/no-artifacts.yml                          |   4 +
>  ci/xenomai_3_0_x.yml                         |  36 ++++++
>  opt-linux-4.19.yml                           |  17 +++
>  opt-linux-latest.yml                         |   3 +
>  recipes-kernel/linux/linux-xenomai_4.14.bb   |  24 ----
>  recipes-kernel/linux/linux-xenomai_4.19.bb   |  12 +-
>  recipes-kernel/linux/linux-xenomai_4.4.bb    |   8 +-
>  recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>  scripts/get-build-id.sh                      |   2 +-
>  tests/jobs/xenomai-beagle-bone-black.yml     |   8 +-
>  tests/jobs/xenomai-hikey.yml                 |   6 +-
>  tests/jobs/xenomai-ipc227e.yml               |   8 +-
>  tests/jobs/xenomai-minnow.yml                |   8 +-
>  tests/jobs/xenomai-qemu-amd64.yml            |   8 +-
>  tests/jobs/xenomai-qemu-arm64.yml            |   8 +-
>  tests/jobs/xenomai-qemu-armhf.yml            |   8 +-
>  tests/jobs/xenomai-x86-64-efi.yml            |   8 +-
>  22 files changed, 279 insertions(+), 173 deletions(-)
>  create mode 100644 ci/4_19_builds.yml
>  create mode 100644 ci/5_4_builds.yml
>  create mode 100644 ci/default-builds.yml
>  create mode 100644 ci/xenomai_3_0_x.yml
>  create mode 100644 opt-linux-4.19.yml
>  delete mode 100644 recipes-kernel/linux/linux-xenomai_4.14.bb
> 

Thanks, all applied to next in order to move on with testing. My comment
on patch 3 should be addressed on top.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 16:11 ` [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds Q. Gylstorff
  2020-11-04 16:22   ` Jan Kiszka
@ 2020-11-04 18:28   ` Jan Kiszka
  2020-11-05  9:30     ` Gylstorff Quirin
  2020-11-04 19:44   ` Jan Kiszka
  2 siblings, 1 reply; 15+ messages in thread
From: Jan Kiszka @ 2020-11-04 18:28 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 04.11.20 17:11, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
> This allows the reuse of build descriptions and simplifies the adding
> of new builds.

Would be good the express that correlation between kernel version and 
Xenomai version somehow as well. Longer job names? Or is there some 
better way?

> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   ci/4_19_builds.yml                           |  58 ++++++++++
>   ci/5_4_builds.yml                            |  30 +++++
>   ci/artifacts.yml                             |   4 +
>   ci/default-builds.yml                        |  76 +++++++++++++
>   ci/gitlab-ci-base.yml                        | 110 +------------------
>   ci/no-artifacts.yml                          |   4 +
>   ci/xenomai_3_0_x.yml                         |  36 ++++++
>   opt-linux-4.19.yml                           |  17 +++
>   opt-linux-latest.yml                         |   3 +
>   recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>   scripts/get-build-id.sh                      |   2 +-
>   11 files changed, 237 insertions(+), 109 deletions(-)
>   create mode 100644 ci/4_19_builds.yml
>   create mode 100644 ci/5_4_builds.yml
>   create mode 100644 ci/default-builds.yml
>   create mode 100644 ci/xenomai_3_0_x.yml
>   create mode 100644 opt-linux-4.19.yml
> 
> diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
> new file mode 100644
> index 0000000..25be0c5
> --- /dev/null
> +++ b/ci/4_19_builds.yml
> @@ -0,0 +1,58 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +variables:
> +  LATEST_GIT_BRANCH: "4.19"
> +  DEPLOY_DIR_EXTENSION: "4.19"
> +  BUILD_IDENTIFIER: "4.19"
> +
> +build-4.19:board-qemu-amd64:
> +  extends: .build:board-qemu-amd64
> +
> +lava-test-4.19:qemu-amd64:
> +  needs: [ "build-4.19:board-qemu-amd64" ]
> +  extends: .lava-test:qemu-amd64
> +
> +build-4.19:board-qemu-armhf:
> +  extends: .build:board-qemu-armhf
> +
> +lava-test-4.19:qemu-armhf:
> +  needs: [ "build-4.19:board-qemu-armhf" ]
> +  extends: .lava-test:qemu-armhf
> +
> +build-4.19:board-qemu-arm64:
> +  extends: .build:board-qemu-arm64
> +
> +lava-test-4.19:qemu-arm64:
> +  needs: [ "build-4.19:board-qemu-arm64" ]
> +  extends: .lava-test:qemu-arm64
> +
> +build-4.19:board-hikey:
> +  extends: .build:board-hikey
> +
> +lava-test-4.19:board-hikey:
> +  needs: [ "build-4.19:board-hikey" ]
> +  extends: .lava-test:board-hikey
> +
> +build-4.19:board-beagle-bone-black:
> +  extends: .build:board-beagle-bone-black
> +
> +lava-test-4.19:board-beagle-bone-black:
> +  needs: [ "build-4.19:board-beagle-bone-black" ]
> +  extends: .lava-test:board-beagle-bone-black
> +
> +build-4.19:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +
> +lava-test-4.19:board-x86-64-efi:
> +  needs: [ "build-4.19:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +
> +
> diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
> new file mode 100644
> index 0000000..b5cfdb9
> --- /dev/null
> +++ b/ci/5_4_builds.yml
> @@ -0,0 +1,30 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +variables:
> +  LATEST_GIT_BRANCH: "5.4"
> +  DEPLOY_DIR_EXTENSION: "5.4"
> +  BUILD_IDENTIFIER: "5.4"
> +
> +build-5.4:board-qemu-amd64:
> +  extends: .build:board-qemu-amd64
> +
> +lava-test-5.4:qemu-amd64:
> +  needs: [ "build-5.4:board-qemu-amd64" ]
> +  extends: .lava-test:qemu-amd64
> +
> +build-5.4:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +
> +lava-test-5.4:board-x86-64-efi:
> +  needs: [ "build-5.4:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +
> +
> diff --git a/ci/artifacts.yml b/ci/artifacts.yml
> index 510f903..cc42274 100644
> --- a/ci/artifacts.yml
> +++ b/ci/artifacts.yml
> @@ -19,3 +19,7 @@
>       expire_in: 1 week
>   include:
>     - local: '/ci/gitlab-ci-base.yml'
> +  - local: '/ci/default-builds.yml'
> +  - local: '/ci/4_19_builds.yml'
> +  - local: '/ci/5_4_builds.yml'
> +  - local: '/ci/xenomai_3_0_x.yml'

Can we de-duplicate the common parts of ci/[no-]artifacts.yml, at least 
the includes?

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 16:11 ` [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds Q. Gylstorff
  2020-11-04 16:22   ` Jan Kiszka
  2020-11-04 18:28   ` Jan Kiszka
@ 2020-11-04 19:44   ` Jan Kiszka
  2020-11-04 20:03     ` Jan Kiszka
  2 siblings, 1 reply; 15+ messages in thread
From: Jan Kiszka @ 2020-11-04 19:44 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 04.11.20 17:11, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
> This allows the reuse of build descriptions and simplifies the adding
> of new builds.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   ci/4_19_builds.yml                           |  58 ++++++++++
>   ci/5_4_builds.yml                            |  30 +++++
>   ci/artifacts.yml                             |   4 +
>   ci/default-builds.yml                        |  76 +++++++++++++
>   ci/gitlab-ci-base.yml                        | 110 +------------------
>   ci/no-artifacts.yml                          |   4 +
>   ci/xenomai_3_0_x.yml                         |  36 ++++++
>   opt-linux-4.19.yml                           |  17 +++
>   opt-linux-latest.yml                         |   3 +
>   recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>   scripts/get-build-id.sh                      |   2 +-
>   11 files changed, 237 insertions(+), 109 deletions(-)
>   create mode 100644 ci/4_19_builds.yml
>   create mode 100644 ci/5_4_builds.yml
>   create mode 100644 ci/default-builds.yml
>   create mode 100644 ci/xenomai_3_0_x.yml
>   create mode 100644 opt-linux-4.19.yml
> 
> diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
> new file mode 100644
> index 0000000..25be0c5
> --- /dev/null
> +++ b/ci/4_19_builds.yml
> @@ -0,0 +1,58 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +variables:
> +  LATEST_GIT_BRANCH: "4.19"
> +  DEPLOY_DIR_EXTENSION: "4.19"
> +  BUILD_IDENTIFIER: "4.19"
> +
> +build-4.19:board-qemu-amd64:
> +  extends: .build:board-qemu-amd64
> +
> +lava-test-4.19:qemu-amd64:
> +  needs: [ "build-4.19:board-qemu-amd64" ]
> +  extends: .lava-test:qemu-amd64
> +
> +build-4.19:board-qemu-armhf:
> +  extends: .build:board-qemu-armhf
> +
> +lava-test-4.19:qemu-armhf:
> +  needs: [ "build-4.19:board-qemu-armhf" ]
> +  extends: .lava-test:qemu-armhf
> +
> +build-4.19:board-qemu-arm64:
> +  extends: .build:board-qemu-arm64
> +
> +lava-test-4.19:qemu-arm64:
> +  needs: [ "build-4.19:board-qemu-arm64" ]
> +  extends: .lava-test:qemu-arm64
> +
> +build-4.19:board-hikey:
> +  extends: .build:board-hikey
> +
> +lava-test-4.19:board-hikey:
> +  needs: [ "build-4.19:board-hikey" ]
> +  extends: .lava-test:board-hikey
> +
> +build-4.19:board-beagle-bone-black:
> +  extends: .build:board-beagle-bone-black
> +
> +lava-test-4.19:board-beagle-bone-black:
> +  needs: [ "build-4.19:board-beagle-bone-black" ]
> +  extends: .lava-test:board-beagle-bone-black
> +
> +build-4.19:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +
> +lava-test-4.19:board-x86-64-efi:
> +  needs: [ "build-4.19:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +
> +
> diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
> new file mode 100644
> index 0000000..b5cfdb9
> --- /dev/null
> +++ b/ci/5_4_builds.yml
> @@ -0,0 +1,30 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +variables:
> +  LATEST_GIT_BRANCH: "5.4"
> +  DEPLOY_DIR_EXTENSION: "5.4"
> +  BUILD_IDENTIFIER: "5.4"
> +
> +build-5.4:board-qemu-amd64:
> +  extends: .build:board-qemu-amd64
> +
> +lava-test-5.4:qemu-amd64:
> +  needs: [ "build-5.4:board-qemu-amd64" ]
> +  extends: .lava-test:qemu-amd64
> +
> +build-5.4:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +
> +lava-test-5.4:board-x86-64-efi:
> +  needs: [ "build-5.4:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +
> +
> diff --git a/ci/artifacts.yml b/ci/artifacts.yml
> index 510f903..cc42274 100644
> --- a/ci/artifacts.yml
> +++ b/ci/artifacts.yml
> @@ -19,3 +19,7 @@
>       expire_in: 1 week
>   include:
>     - local: '/ci/gitlab-ci-base.yml'
> +  - local: '/ci/default-builds.yml'
> +  - local: '/ci/4_19_builds.yml'
> +  - local: '/ci/5_4_builds.yml'
> +  - local: '/ci/xenomai_3_0_x.yml'
> diff --git a/ci/default-builds.yml b/ci/default-builds.yml
> new file mode 100644
> index 0000000..6979dd3
> --- /dev/null
> +++ b/ci/default-builds.yml
> @@ -0,0 +1,76 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +.build:board-qemu-amd64:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-amd64
> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> +
> +.lava-test:qemu-amd64:
> +  extends: .test
> +  variables:
> +    TARGET: qemu-amd64
> +
> +.build:board-qemu-armhf:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-armhf
> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> +
> +.lava-test:qemu-armhf:
> +  extends: .test
> +  variables:
> +    TARGET: qemu-armhf
> +
> +.build:board-qemu-arm64:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-arm64
> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> +
> +.lava-test:qemu-arm64:
> +  extends: .test
> +  variables:
> +    TARGET: qemu-arm64
> +
> +.build:board-hikey:
> +  extends: .build
> +  variables:
> +    TARGET: hikey
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +
> +.lava-test:board-hikey:
> +  extends: .test
> +  variables:
> +    TARGET: hikey
> +
> +.build:board-beagle-bone-black:
> +  extends: .build
> +  variables:
> +    TARGET: beagle-bone-black
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +
> +.lava-test:board-beagle-bone-black:
> +  extends: .test
> +  variables:
> +    TARGET: beagle-bone-black
> +
> +.build:board-x86-64-efi:
> +  extends: .build
> +  variables:
> +    TARGET: x86-64-efi
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +
> +.lava-test:board-x86-64-efi:
> +  extends: .test
> +  variables:
> +    TARGET: x86-64-efi
> +
> diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
> index 18419a8..a766a9e 100644
> --- a/ci/gitlab-ci-base.yml
> +++ b/ci/gitlab-ci-base.yml
> @@ -10,7 +10,7 @@
>   #
>   stages:
>     - build
> -  - lava-test
> +  - test
>   
>   variables:
>     GIT_STRATEGY: clone
> @@ -37,119 +37,15 @@ default:
>   
>   .test:
>     extends: .add-lava-ssh-config
> -  stage: lava-test
> +  stage: test
>     script:
>       - scripts/install-lavacli.sh
>       - export BUILD_JOB_ID=$(scripts/get-build-id.sh ${BUILD_JOB_NAME})
>       - scripts/run-lava-tests.sh ${TARGET}
>     variables:
> -    BUILD_JOB_NAME: "build:board-${TARGET}${TARGET_EXTENSION}"
> +    BUILD_JOB_NAME: "build-${BUILD_IDENTIFIER}:board-${TARGET}${TARGET_EXTENSION}"
>     only:
>       variables:
>         - $LAVA_SSH_USER
>   
>   
> -build:board-qemu-amd64:
> -  extends: .build
> -  variables:
> -    TARGET: qemu-amd64
> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> -
> -lava-test:qemu-amd64:
> -  needs: [ "build:board-qemu-amd64" ]
> -  dependencies: [ "build:board-qemu-amd64" ]
> -  extends: .test
> -  variables:
> -    TARGET: qemu-amd64
> -
> -build:board-qemu-armhf:
> -  extends: .build
> -  variables:
> -    TARGET: qemu-armhf
> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> -
> -lava-test:qemu-armhf:
> -  needs: [ "build:board-qemu-armhf" ]
> -  extends: .test
> -  variables:
> -    TARGET: qemu-armhf
> -
> -build:board-qemu-arm64:
> -  extends: .build
> -  variables:
> -    TARGET: qemu-arm64
> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
> -
> -lava-test:qemu-arm64:
> -  needs: [ "build:board-qemu-arm64" ]
> -  extends: .test
> -  variables:
> -    TARGET: qemu-arm64
> -
> -build:board-hikey:
> -  extends: .build
> -  variables:
> -    TARGET: hikey
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -
> -lava-test:board-hikey:
> -  needs: [ "build:board-hikey" ]
> -  extends: .test
> -  variables:
> -    TARGET: hikey
> -
> -build:board-beagle-bone-black:
> -  extends: .build
> -  variables:
> -    TARGET: beagle-bone-black
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -
> -lava-test:board-beagle-bone-black:
> -  needs: [ "build:board-beagle-bone-black" ]
> -  extends: .test
> -  variables:
> -    TARGET: beagle-bone-black
> -
> -build:board-x86-64-efi:
> -  extends: .build
> -  variables:
> -    TARGET: x86-64-efi
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -
> -lava-test:board-x86-64-efi:
> -  needs: [ "build:board-x86-64-efi" ]
> -  extends: .test
> -  variables:
> -    TARGET: x86-64-efi
> -
> -build:board-beagle-bone-black:xenomai-3.0.x:
> -  extends: .build
> -  variables:
> -    TARGET: beagle-bone-black
> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -
> -lava-test:board-beagle-bone-black:xenomai-3.0.x:
> -  needs: [ "build:board-beagle-bone-black:xenomai-3.0.x" ]
> -  extends: .test
> -  variables:
> -    TARGET: beagle-bone-black
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -    TARGET_EXTENSION: ":xenomai-3.0.x"
> -
> -build:board-x86-64-efi:xenomai-3.0.x:
> -  extends: .build
> -  variables:
> -    TARGET: x86-64-efi
> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> -    BUILD_OPTIONS: ":opt-lava-test.yml"
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -
> -lava-test:board-x86-64-efi:xenomai-3.0.x:
> -  needs: [ "build:board-x86-64-efi:xenomai-3.0.x" ]
> -  extends: .test
> -  variables:
> -    TARGET: x86-64-efi
> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> -    TARGET_EXTENSION: ":xenomai-3.0.x"
> diff --git a/ci/no-artifacts.yml b/ci/no-artifacts.yml
> index 02457de..517446e 100644
> --- a/ci/no-artifacts.yml
> +++ b/ci/no-artifacts.yml
> @@ -19,3 +19,7 @@
>         - $USE_GITLAB_ARTIFACTS
>   include:
>     - local: '/ci/gitlab-ci-base.yml'
> +  - local: '/ci/default-builds.yml'
> +  - local: '/ci/4_19_builds.yml'
> +  - local: '/ci/5_4_builds.yml'
> +  - local: '/ci/xenomai_3_0_x.yml'
> diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
> new file mode 100644
> index 0000000..9dbd8d4
> --- /dev/null
> +++ b/ci/xenomai_3_0_x.yml
> @@ -0,0 +1,36 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2019 - 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +build-4.4:board-beagle-bone-black:
> +  extends: .build:board-beagle-bone-black
> +  variables:
> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +
> +lava-test-4.4:board-beagle-bone-black:
> +  needs: [ "build-4.4:board-beagle-bone-black" ]
> +  extends: .lava-test:board-beagle-bone-black
> +  variables:
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +    BUILD_IDENTIFIER: "4.4"
> +
> +build-4.4:board-x86-64-efi:
> +  extends: .build:board-x86-64-efi
> +  variables:
> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +
> +lava-test-4.4:board-x86-64-efi:
> +  needs: [ "build-4.4:board-x86-64-efi" ]
> +  extends: .lava-test:board-x86-64-efi
> +  variables:
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> +    BUILD_IDENTIFIER: "4.4"
> diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
> new file mode 100644
> index 0000000..1613e1c
> --- /dev/null
> +++ b/opt-linux-4.19.yml
> @@ -0,0 +1,17 @@
> +#
> +# Xenomai Real-Time System
> +#
> +# Copyright (c) Siemens AG, 2020
> +#
> +# Authors:
> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> +#
> +# SPDX-License-Identifier: MIT
> +#
> +
> +header:
> +  version: 8
> +
> +local_conf_header:
> +  linux-xenomai-latest: |
> +    PREFERRED_VERSION_linux-xenomai = "4.19%"
> diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
> index 7cf291a..735c30e 100644
> --- a/opt-linux-latest.yml
> +++ b/opt-linux-latest.yml
> @@ -12,6 +12,9 @@
>   header:
>     version: 8
>   
> +env:
> +  LATEST_GIT_BRANCH: :LATEST_GIT_BRANCH
> +
>   local_conf_header:
>     linux-xenomai-latest: |
>       PREFERRED_VERSION_linux-xenomai = "9999-%"
> diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
> index 9fc6a63..b99a565 100644
> --- a/recipes-kernel/linux/linux-xenomai_latest.bb
> +++ b/recipes-kernel/linux/linux-xenomai_latest.bb
> @@ -18,8 +18,12 @@ def is_xeno_3_0(d):
>       xeno_ver = d.getVar('PREFERRED_VERSION_xenomai') or ''
>       return xeno_ver.startswith('3.0') or xeno_ver == 'stable-3.0.x'
>   
> +def is_5_4_branch(d):
> +    linux_ver = d.getVar('LATEST_GIT_BRANCH') or ''
> +    return linux_ver.startswith('5.4')
> +
>   GIT_REPO_amd64 = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-x86.git'}"
> -GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y'}"
> +GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y' if is_5_4_branch(d) else 'ipipe-x86-4.19.y'}"
>   
>   GIT_REPO_armhf = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-arm.git'}"
>   GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe/master'}"
> diff --git a/scripts/get-build-id.sh b/scripts/get-build-id.sh
> index ace70c6..71f4413 100755
> --- a/scripts/get-build-id.sh
> +++ b/scripts/get-build-id.sh
> @@ -17,7 +17,7 @@ if [ -z "${name}" ]; then
>       fi
>   index=0
>   JSON=$(curl -s --header "PRIVATE-TOKEN: ${API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?scope[]=success"  )
> -while  [ ${index} -le ${MAX_TEST:-16} ]
> +while  [ ${index} -le ${MAX_TEST:-26} ]
>   do
>       build_name=$(echo "${JSON}"  | tr '\r\n' ' ' | jq -r ".[${index}].name")
>       if [ "$build_name" = "${name}" ]; then
> 

There is unfortunately another issue with this: We are building 5.4 for 
4.19, see

https://gitlab.denx.de/Xenomai/xenomai-images/-/jobs/175879
https://gitlab.denx.de/Xenomai/xenomai-images/-/jobs/175881

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 19:44   ` Jan Kiszka
@ 2020-11-04 20:03     ` Jan Kiszka
  2020-11-05 11:18       ` Gylstorff Quirin
  0 siblings, 1 reply; 15+ messages in thread
From: Jan Kiszka @ 2020-11-04 20:03 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 04.11.20 20:44, Jan Kiszka via Xenomai wrote:
> On 04.11.20 17:11, Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
>> This allows the reuse of build descriptions and simplifies the adding
>> of new builds.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   ci/4_19_builds.yml                           |  58 ++++++++++
>>   ci/5_4_builds.yml                            |  30 +++++
>>   ci/artifacts.yml                             |   4 +
>>   ci/default-builds.yml                        |  76 +++++++++++++
>>   ci/gitlab-ci-base.yml                        | 110 +------------------
>>   ci/no-artifacts.yml                          |   4 +
>>   ci/xenomai_3_0_x.yml                         |  36 ++++++
>>   opt-linux-4.19.yml                           |  17 +++
>>   opt-linux-latest.yml                         |   3 +
>>   recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>>   scripts/get-build-id.sh                      |   2 +-
>>   11 files changed, 237 insertions(+), 109 deletions(-)
>>   create mode 100644 ci/4_19_builds.yml
>>   create mode 100644 ci/5_4_builds.yml
>>   create mode 100644 ci/default-builds.yml
>>   create mode 100644 ci/xenomai_3_0_x.yml
>>   create mode 100644 opt-linux-4.19.yml
>>
>> diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
>> new file mode 100644
>> index 0000000..25be0c5
>> --- /dev/null
>> +++ b/ci/4_19_builds.yml
>> @@ -0,0 +1,58 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +variables:
>> +  LATEST_GIT_BRANCH: "4.19"
>> +  DEPLOY_DIR_EXTENSION: "4.19"
>> +  BUILD_IDENTIFIER: "4.19"
>> +
>> +build-4.19:board-qemu-amd64:
>> +  extends: .build:board-qemu-amd64
>> +
>> +lava-test-4.19:qemu-amd64:
>> +  needs: [ "build-4.19:board-qemu-amd64" ]
>> +  extends: .lava-test:qemu-amd64
>> +
>> +build-4.19:board-qemu-armhf:
>> +  extends: .build:board-qemu-armhf
>> +
>> +lava-test-4.19:qemu-armhf:
>> +  needs: [ "build-4.19:board-qemu-armhf" ]
>> +  extends: .lava-test:qemu-armhf
>> +
>> +build-4.19:board-qemu-arm64:
>> +  extends: .build:board-qemu-arm64
>> +
>> +lava-test-4.19:qemu-arm64:
>> +  needs: [ "build-4.19:board-qemu-arm64" ]
>> +  extends: .lava-test:qemu-arm64
>> +
>> +build-4.19:board-hikey:
>> +  extends: .build:board-hikey
>> +
>> +lava-test-4.19:board-hikey:
>> +  needs: [ "build-4.19:board-hikey" ]
>> +  extends: .lava-test:board-hikey
>> +
>> +build-4.19:board-beagle-bone-black:
>> +  extends: .build:board-beagle-bone-black
>> +
>> +lava-test-4.19:board-beagle-bone-black:
>> +  needs: [ "build-4.19:board-beagle-bone-black" ]
>> +  extends: .lava-test:board-beagle-bone-black
>> +
>> +build-4.19:board-x86-64-efi:
>> +  extends: .build:board-x86-64-efi
>> +
>> +lava-test-4.19:board-x86-64-efi:
>> +  needs: [ "build-4.19:board-x86-64-efi" ]
>> +  extends: .lava-test:board-x86-64-efi
>> +
>> +
>> diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
>> new file mode 100644
>> index 0000000..b5cfdb9
>> --- /dev/null
>> +++ b/ci/5_4_builds.yml
>> @@ -0,0 +1,30 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +variables:
>> +  LATEST_GIT_BRANCH: "5.4"
>> +  DEPLOY_DIR_EXTENSION: "5.4"
>> +  BUILD_IDENTIFIER: "5.4"
>> +
>> +build-5.4:board-qemu-amd64:
>> +  extends: .build:board-qemu-amd64
>> +
>> +lava-test-5.4:qemu-amd64:
>> +  needs: [ "build-5.4:board-qemu-amd64" ]
>> +  extends: .lava-test:qemu-amd64
>> +
>> +build-5.4:board-x86-64-efi:
>> +  extends: .build:board-x86-64-efi
>> +
>> +lava-test-5.4:board-x86-64-efi:
>> +  needs: [ "build-5.4:board-x86-64-efi" ]
>> +  extends: .lava-test:board-x86-64-efi
>> +
>> +
>> diff --git a/ci/artifacts.yml b/ci/artifacts.yml
>> index 510f903..cc42274 100644
>> --- a/ci/artifacts.yml
>> +++ b/ci/artifacts.yml
>> @@ -19,3 +19,7 @@
>>       expire_in: 1 week
>>   include:
>>     - local: '/ci/gitlab-ci-base.yml'
>> +  - local: '/ci/default-builds.yml'
>> +  - local: '/ci/4_19_builds.yml'
>> +  - local: '/ci/5_4_builds.yml'
>> +  - local: '/ci/xenomai_3_0_x.yml'
>> diff --git a/ci/default-builds.yml b/ci/default-builds.yml
>> new file mode 100644
>> index 0000000..6979dd3
>> --- /dev/null
>> +++ b/ci/default-builds.yml
>> @@ -0,0 +1,76 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +.build:board-qemu-amd64:
>> +  extends: .build
>> +  variables:
>> +    TARGET: qemu-amd64
>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> +
>> +.lava-test:qemu-amd64:
>> +  extends: .test
>> +  variables:
>> +    TARGET: qemu-amd64
>> +
>> +.build:board-qemu-armhf:
>> +  extends: .build
>> +  variables:
>> +    TARGET: qemu-armhf
>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> +
>> +.lava-test:qemu-armhf:
>> +  extends: .test
>> +  variables:
>> +    TARGET: qemu-armhf
>> +
>> +.build:board-qemu-arm64:
>> +  extends: .build
>> +  variables:
>> +    TARGET: qemu-arm64
>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> +
>> +.lava-test:qemu-arm64:
>> +  extends: .test
>> +  variables:
>> +    TARGET: qemu-arm64
>> +
>> +.build:board-hikey:
>> +  extends: .build
>> +  variables:
>> +    TARGET: hikey
>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>> +.lava-test:board-hikey:
>> +  extends: .test
>> +  variables:
>> +    TARGET: hikey
>> +
>> +.build:board-beagle-bone-black:
>> +  extends: .build
>> +  variables:
>> +    TARGET: beagle-bone-black
>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>> +.lava-test:board-beagle-bone-black:
>> +  extends: .test
>> +  variables:
>> +    TARGET: beagle-bone-black
>> +
>> +.build:board-x86-64-efi:
>> +  extends: .build
>> +  variables:
>> +    TARGET: x86-64-efi
>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>> +.lava-test:board-x86-64-efi:
>> +  extends: .test
>> +  variables:
>> +    TARGET: x86-64-efi
>> +
>> diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
>> index 18419a8..a766a9e 100644
>> --- a/ci/gitlab-ci-base.yml
>> +++ b/ci/gitlab-ci-base.yml
>> @@ -10,7 +10,7 @@
>>   #
>>   stages:
>>     - build
>> -  - lava-test
>> +  - test
>>   variables:
>>     GIT_STRATEGY: clone
>> @@ -37,119 +37,15 @@ default:
>>   .test:
>>     extends: .add-lava-ssh-config
>> -  stage: lava-test
>> +  stage: test
>>     script:
>>       - scripts/install-lavacli.sh
>>       - export BUILD_JOB_ID=$(scripts/get-build-id.sh ${BUILD_JOB_NAME})
>>       - scripts/run-lava-tests.sh ${TARGET}
>>     variables:
>> -    BUILD_JOB_NAME: "build:board-${TARGET}${TARGET_EXTENSION}"
>> +    BUILD_JOB_NAME: 
>> "build-${BUILD_IDENTIFIER}:board-${TARGET}${TARGET_EXTENSION}"
>>     only:
>>       variables:
>>         - $LAVA_SSH_USER
>> -build:board-qemu-amd64:
>> -  extends: .build
>> -  variables:
>> -    TARGET: qemu-amd64
>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> -
>> -lava-test:qemu-amd64:
>> -  needs: [ "build:board-qemu-amd64" ]
>> -  dependencies: [ "build:board-qemu-amd64" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: qemu-amd64
>> -
>> -build:board-qemu-armhf:
>> -  extends: .build
>> -  variables:
>> -    TARGET: qemu-armhf
>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> -
>> -lava-test:qemu-armhf:
>> -  needs: [ "build:board-qemu-armhf" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: qemu-armhf
>> -
>> -build:board-qemu-arm64:
>> -  extends: .build
>> -  variables:
>> -    TARGET: qemu-arm64
>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> -
>> -lava-test:qemu-arm64:
>> -  needs: [ "build:board-qemu-arm64" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: qemu-arm64
>> -
>> -build:board-hikey:
>> -  extends: .build
>> -  variables:
>> -    TARGET: hikey
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>> -lava-test:board-hikey:
>> -  needs: [ "build:board-hikey" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: hikey
>> -
>> -build:board-beagle-bone-black:
>> -  extends: .build
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>> -lava-test:board-beagle-bone-black:
>> -  needs: [ "build:board-beagle-bone-black" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -
>> -build:board-x86-64-efi:
>> -  extends: .build
>> -  variables:
>> -    TARGET: x86-64-efi
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>> -lava-test:board-x86-64-efi:
>> -  needs: [ "build:board-x86-64-efi" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: x86-64-efi
>> -
>> -build:board-beagle-bone-black:xenomai-3.0.x:
>> -  extends: .build
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -
>> -lava-test:board-beagle-bone-black:xenomai-3.0.x:
>> -  needs: [ "build:board-beagle-bone-black:xenomai-3.0.x" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -    TARGET_EXTENSION: ":xenomai-3.0.x"
>> -
>> -build:board-x86-64-efi:xenomai-3.0.x:
>> -  extends: .build
>> -  variables:
>> -    TARGET: x86-64-efi
>> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -
>> -lava-test:board-x86-64-efi:xenomai-3.0.x:
>> -  needs: [ "build:board-x86-64-efi:xenomai-3.0.x" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: x86-64-efi
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -    TARGET_EXTENSION: ":xenomai-3.0.x"
>> diff --git a/ci/no-artifacts.yml b/ci/no-artifacts.yml
>> index 02457de..517446e 100644
>> --- a/ci/no-artifacts.yml
>> +++ b/ci/no-artifacts.yml
>> @@ -19,3 +19,7 @@
>>         - $USE_GITLAB_ARTIFACTS
>>   include:
>>     - local: '/ci/gitlab-ci-base.yml'
>> +  - local: '/ci/default-builds.yml'
>> +  - local: '/ci/4_19_builds.yml'
>> +  - local: '/ci/5_4_builds.yml'
>> +  - local: '/ci/xenomai_3_0_x.yml'
>> diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
>> new file mode 100644
>> index 0000000..9dbd8d4
>> --- /dev/null
>> +++ b/ci/xenomai_3_0_x.yml
>> @@ -0,0 +1,36 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +build-4.4:board-beagle-bone-black:
>> +  extends: .build:board-beagle-bone-black
>> +  variables:
>> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +
>> +lava-test-4.4:board-beagle-bone-black:
>> +  needs: [ "build-4.4:board-beagle-bone-black" ]
>> +  extends: .lava-test:board-beagle-bone-black
>> +  variables:
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +    BUILD_IDENTIFIER: "4.4"
>> +
>> +build-4.4:board-x86-64-efi:
>> +  extends: .build:board-x86-64-efi
>> +  variables:
>> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +
>> +lava-test-4.4:board-x86-64-efi:
>> +  needs: [ "build-4.4:board-x86-64-efi" ]
>> +  extends: .lava-test:board-x86-64-efi
>> +  variables:
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +    BUILD_IDENTIFIER: "4.4"
>> diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
>> new file mode 100644
>> index 0000000..1613e1c
>> --- /dev/null
>> +++ b/opt-linux-4.19.yml
>> @@ -0,0 +1,17 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +header:
>> +  version: 8
>> +
>> +local_conf_header:
>> +  linux-xenomai-latest: |
>> +    PREFERRED_VERSION_linux-xenomai = "4.19%"
>> diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
>> index 7cf291a..735c30e 100644
>> --- a/opt-linux-latest.yml
>> +++ b/opt-linux-latest.yml
>> @@ -12,6 +12,9 @@
>>   header:
>>     version: 8
>> +env:
>> +  LATEST_GIT_BRANCH: :LATEST_GIT_BRANCH

Is that gitlab-ci syntax? That also breaks local builds.

We rather need to generate a kas command lines so that every build job 
can easily be replicated locally.

I'm pulling this patch and patch 4 from next again. Patch 1 I will 
update in place as I just released to new 4.4 ipipe versions.

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 16:22   ` Jan Kiszka
@ 2020-11-05  9:15     ` Gylstorff Quirin
  0 siblings, 0 replies; 15+ messages in thread
From: Gylstorff Quirin @ 2020-11-05  9:15 UTC (permalink / raw)
  To: Jan Kiszka, xenomai



On 11/4/20 5:22 PM, Jan Kiszka wrote:
> On 04.11.20 17:11, Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
>> This allows the reuse of build descriptions and simplifies the adding
>> of new builds.
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   ci/4_19_builds.yml                           |  58 ++++++++++
>>   ci/5_4_builds.yml                            |  30 +++++
>>   ci/artifacts.yml                             |   4 +
>>   ci/default-builds.yml                        |  76 +++++++++++++
>>   ci/gitlab-ci-base.yml                        | 110 +------------------
>>   ci/no-artifacts.yml                          |   4 +
>>   ci/xenomai_3_0_x.yml                         |  36 ++++++
>>   opt-linux-4.19.yml                           |  17 +++
>>   opt-linux-latest.yml                         |   3 +
>>   recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>>   scripts/get-build-id.sh                      |   2 +-
>>   11 files changed, 237 insertions(+), 109 deletions(-)
>>   create mode 100644 ci/4_19_builds.yml
>>   create mode 100644 ci/5_4_builds.yml
>>   create mode 100644 ci/default-builds.yml
>>   create mode 100644 ci/xenomai_3_0_x.yml
>>   create mode 100644 opt-linux-4.19.yml
>>
>> diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
>> new file mode 100644
>> index 0000000..25be0c5
>> --- /dev/null
>> +++ b/ci/4_19_builds.yml
>> @@ -0,0 +1,58 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +variables:
>> +  LATEST_GIT_BRANCH: "4.19"
>> +  DEPLOY_DIR_EXTENSION: "4.19"
>> +  BUILD_IDENTIFIER: "4.19"
>> +
>> +build-4.19:board-qemu-amd64:
>> +  extends: .build:board-qemu-amd64
>> +
>> +lava-test-4.19:qemu-amd64:
>> +  needs: [ "build-4.19:board-qemu-amd64" ]
>> +  extends: .lava-test:qemu-amd64
>> +
>> +build-4.19:board-qemu-armhf:
>> +  extends: .build:board-qemu-armhf
>> +
>> +lava-test-4.19:qemu-armhf:
>> +  needs: [ "build-4.19:board-qemu-armhf" ]
>> +  extends: .lava-test:qemu-armhf
>> +
>> +build-4.19:board-qemu-arm64:
>> +  extends: .build:board-qemu-arm64
>> +
>> +lava-test-4.19:qemu-arm64:
>> +  needs: [ "build-4.19:board-qemu-arm64" ]
>> +  extends: .lava-test:qemu-arm64
>> +
>> +build-4.19:board-hikey:
>> +  extends: .build:board-hikey
>> +
>> +lava-test-4.19:board-hikey:
>> +  needs: [ "build-4.19:board-hikey" ]
>> +  extends: .lava-test:board-hikey
>> +
>> +build-4.19:board-beagle-bone-black:
>> +  extends: .build:board-beagle-bone-black
>> +
>> +lava-test-4.19:board-beagle-bone-black:
>> +  needs: [ "build-4.19:board-beagle-bone-black" ]
>> +  extends: .lava-test:board-beagle-bone-black
>> +
>> +build-4.19:board-x86-64-efi:
>> +  extends: .build:board-x86-64-efi
>> +
>> +lava-test-4.19:board-x86-64-efi:
>> +  needs: [ "build-4.19:board-x86-64-efi" ]
>> +  extends: .lava-test:board-x86-64-efi
>> +
>> +
>> diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
>> new file mode 100644
>> index 0000000..b5cfdb9
>> --- /dev/null
>> +++ b/ci/5_4_builds.yml
>> @@ -0,0 +1,30 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +variables:
>> +  LATEST_GIT_BRANCH: "5.4"
>> +  DEPLOY_DIR_EXTENSION: "5.4"
>> +  BUILD_IDENTIFIER: "5.4"
>> +
>> +build-5.4:board-qemu-amd64:
>> +  extends: .build:board-qemu-amd64
>> +
>> +lava-test-5.4:qemu-amd64:
>> +  needs: [ "build-5.4:board-qemu-amd64" ]
>> +  extends: .lava-test:qemu-amd64
>> +
>> +build-5.4:board-x86-64-efi:
>> +  extends: .build:board-x86-64-efi
>> +
>> +lava-test-5.4:board-x86-64-efi:
>> +  needs: [ "build-5.4:board-x86-64-efi" ]
>> +  extends: .lava-test:board-x86-64-efi
>> +
>> +
>> diff --git a/ci/artifacts.yml b/ci/artifacts.yml
>> index 510f903..cc42274 100644
>> --- a/ci/artifacts.yml
>> +++ b/ci/artifacts.yml
>> @@ -19,3 +19,7 @@
>>       expire_in: 1 week
>>   include:
>>     - local: '/ci/gitlab-ci-base.yml'
>> +  - local: '/ci/default-builds.yml'
>> +  - local: '/ci/4_19_builds.yml'
>> +  - local: '/ci/5_4_builds.yml'
>> +  - local: '/ci/xenomai_3_0_x.yml'
>> diff --git a/ci/default-builds.yml b/ci/default-builds.yml
>> new file mode 100644
>> index 0000000..6979dd3
>> --- /dev/null
>> +++ b/ci/default-builds.yml
>> @@ -0,0 +1,76 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +.build:board-qemu-amd64:
>> +  extends: .build
>> +  variables:
>> +    TARGET: qemu-amd64
>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> +
>> +.lava-test:qemu-amd64:
>> +  extends: .test
>> +  variables:
>> +    TARGET: qemu-amd64
>> +
>> +.build:board-qemu-armhf:
>> +  extends: .build
>> +  variables:
>> +    TARGET: qemu-armhf
>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> +
>> +.lava-test:qemu-armhf:
>> +  extends: .test
>> +  variables:
>> +    TARGET: qemu-armhf
>> +
>> +.build:board-qemu-arm64:
>> +  extends: .build
>> +  variables:
>> +    TARGET: qemu-arm64
>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> +
>> +.lava-test:qemu-arm64:
>> +  extends: .test
>> +  variables:
>> +    TARGET: qemu-arm64
>> +
>> +.build:board-hikey:
>> +  extends: .build
>> +  variables:
>> +    TARGET: hikey
>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>> +.lava-test:board-hikey:
>> +  extends: .test
>> +  variables:
>> +    TARGET: hikey
>> +
>> +.build:board-beagle-bone-black:
>> +  extends: .build
>> +  variables:
>> +    TARGET: beagle-bone-black
>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>> +.lava-test:board-beagle-bone-black:
>> +  extends: .test
>> +  variables:
>> +    TARGET: beagle-bone-black
>> +
>> +.build:board-x86-64-efi:
>> +  extends: .build
>> +  variables:
>> +    TARGET: x86-64-efi
>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>> +.lava-test:board-x86-64-efi:
>> +  extends: .test
>> +  variables:
>> +    TARGET: x86-64-efi
>> +
>> diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
>> index 18419a8..a766a9e 100644
>> --- a/ci/gitlab-ci-base.yml
>> +++ b/ci/gitlab-ci-base.yml
>> @@ -10,7 +10,7 @@
>>   #
>>   stages:
>>     - build
>> -  - lava-test
>> +  - test
>>   
>>   variables:
>>     GIT_STRATEGY: clone
>> @@ -37,119 +37,15 @@ default:
>>   
>>   .test:
>>     extends: .add-lava-ssh-config
>> -  stage: lava-test
>> +  stage: test
>>     script:
>>       - scripts/install-lavacli.sh
>>       - export BUILD_JOB_ID=$(scripts/get-build-id.sh ${BUILD_JOB_NAME})
>>       - scripts/run-lava-tests.sh ${TARGET}
>>     variables:
>> -    BUILD_JOB_NAME: "build:board-${TARGET}${TARGET_EXTENSION}"
>> +    BUILD_JOB_NAME: "build-${BUILD_IDENTIFIER}:board-${TARGET}${TARGET_EXTENSION}"
>>     only:
>>       variables:
>>         - $LAVA_SSH_USER
>>   
>>   
>> -build:board-qemu-amd64:
>> -  extends: .build
>> -  variables:
>> -    TARGET: qemu-amd64
>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> -
>> -lava-test:qemu-amd64:
>> -  needs: [ "build:board-qemu-amd64" ]
>> -  dependencies: [ "build:board-qemu-amd64" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: qemu-amd64
>> -
>> -build:board-qemu-armhf:
>> -  extends: .build
>> -  variables:
>> -    TARGET: qemu-armhf
>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> -
>> -lava-test:qemu-armhf:
>> -  needs: [ "build:board-qemu-armhf" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: qemu-armhf
>> -
>> -build:board-qemu-arm64:
>> -  extends: .build
>> -  variables:
>> -    TARGET: qemu-arm64
>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>> -
>> -lava-test:qemu-arm64:
>> -  needs: [ "build:board-qemu-arm64" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: qemu-arm64
>> -
>> -build:board-hikey:
>> -  extends: .build
>> -  variables:
>> -    TARGET: hikey
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>> -lava-test:board-hikey:
>> -  needs: [ "build:board-hikey" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: hikey
>> -
>> -build:board-beagle-bone-black:
>> -  extends: .build
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>> -lava-test:board-beagle-bone-black:
>> -  needs: [ "build:board-beagle-bone-black" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -
>> -build:board-x86-64-efi:
>> -  extends: .build
>> -  variables:
>> -    TARGET: x86-64-efi
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>> -lava-test:board-x86-64-efi:
>> -  needs: [ "build:board-x86-64-efi" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: x86-64-efi
>> -
>> -build:board-beagle-bone-black:xenomai-3.0.x:
>> -  extends: .build
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -
>> -lava-test:board-beagle-bone-black:xenomai-3.0.x:
>> -  needs: [ "build:board-beagle-bone-black:xenomai-3.0.x" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: beagle-bone-black
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -    TARGET_EXTENSION: ":xenomai-3.0.x"
>> -
>> -build:board-x86-64-efi:xenomai-3.0.x:
>> -  extends: .build
>> -  variables:
>> -    TARGET: x86-64-efi
>> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -
>> -lava-test:board-x86-64-efi:xenomai-3.0.x:
>> -  needs: [ "build:board-x86-64-efi:xenomai-3.0.x" ]
>> -  extends: .test
>> -  variables:
>> -    TARGET: x86-64-efi
>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> -    TARGET_EXTENSION: ":xenomai-3.0.x"
>> diff --git a/ci/no-artifacts.yml b/ci/no-artifacts.yml
>> index 02457de..517446e 100644
>> --- a/ci/no-artifacts.yml
>> +++ b/ci/no-artifacts.yml
>> @@ -19,3 +19,7 @@
>>         - $USE_GITLAB_ARTIFACTS
>>   include:
>>     - local: '/ci/gitlab-ci-base.yml'
>> +  - local: '/ci/default-builds.yml'
>> +  - local: '/ci/4_19_builds.yml'
>> +  - local: '/ci/5_4_builds.yml'
>> +  - local: '/ci/xenomai_3_0_x.yml'
>> diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
>> new file mode 100644
>> index 0000000..9dbd8d4
>> --- /dev/null
>> +++ b/ci/xenomai_3_0_x.yml
>> @@ -0,0 +1,36 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2019 - 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +build-4.4:board-beagle-bone-black:
>> +  extends: .build:board-beagle-bone-black
>> +  variables:
>> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +
>> +lava-test-4.4:board-beagle-bone-black:
>> +  needs: [ "build-4.4:board-beagle-bone-black" ]
>> +  extends: .lava-test:board-beagle-bone-black
>> +  variables:
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +    BUILD_IDENTIFIER: "4.4"
>> +
>> +build-4.4:board-x86-64-efi:
>> +  extends: .build:board-x86-64-efi
>> +  variables:
>> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +
>> +lava-test-4.4:board-x86-64-efi:
>> +  needs: [ "build-4.4:board-x86-64-efi" ]
>> +  extends: .lava-test:board-x86-64-efi
>> +  variables:
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>> +    BUILD_IDENTIFIER: "4.4"
>> diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
>> new file mode 100644
>> index 0000000..1613e1c
>> --- /dev/null
>> +++ b/opt-linux-4.19.yml
>> @@ -0,0 +1,17 @@
>> +#
>> +# Xenomai Real-Time System
>> +#
>> +# Copyright (c) Siemens AG, 2020
>> +#
>> +# Authors:
>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> +#
>> +# SPDX-License-Identifier: MIT
>> +#
>> +
>> +header:
>> +  version: 8
>> +
>> +local_conf_header:
>> +  linux-xenomai-latest: |
>> +    PREFERRED_VERSION_linux-xenomai = "4.19%"
>> diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
>> index 7cf291a..735c30e 100644
>> --- a/opt-linux-latest.yml
>> +++ b/opt-linux-latest.yml
>> @@ -12,6 +12,9 @@
>>   header:
>>     version: 8
>>   
>> +env:
>> +  LATEST_GIT_BRANCH: :LATEST_GIT_BRANCH
>> +
>>   local_conf_header:
>>     linux-xenomai-latest: |
>>       PREFERRED_VERSION_linux-xenomai = "9999-%"
>> diff --git a/recipes-kernel/linux/linux-xenomai_latest.bb b/recipes-kernel/linux/linux-xenomai_latest.bb
>> index 9fc6a63..b99a565 100644
>> --- a/recipes-kernel/linux/linux-xenomai_latest.bb
>> +++ b/recipes-kernel/linux/linux-xenomai_latest.bb
>> @@ -18,8 +18,12 @@ def is_xeno_3_0(d):
>>       xeno_ver = d.getVar('PREFERRED_VERSION_xenomai') or ''
>>       return xeno_ver.startswith('3.0') or xeno_ver == 'stable-3.0.x'
>>   
>> +def is_5_4_branch(d):
>> +    linux_ver = d.getVar('LATEST_GIT_BRANCH') or ''
>> +    return linux_ver.startswith('5.4')
>> +
>>   GIT_REPO_amd64 = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-x86.git'}"
>> -GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y'}"
>> +GIT_BRANCH_amd64 = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe-x86-5.4.y' if is_5_4_branch(d) else 'ipipe-x86-4.19.y'}"
>>   
>>   GIT_REPO_armhf = "${@'ipipe.git' if is_xeno_3_0(d) else 'ipipe-arm.git'}"
>>   GIT_BRANCH_armhf = "${@'ipipe-4.4.y-cip' if is_xeno_3_0(d) else 'ipipe/master'}"
>> diff --git a/scripts/get-build-id.sh b/scripts/get-build-id.sh
>> index ace70c6..71f4413 100755
>> --- a/scripts/get-build-id.sh
>> +++ b/scripts/get-build-id.sh
>> @@ -17,7 +17,7 @@ if [ -z "${name}" ]; then
>>       fi
>>   index=0
>>   JSON=$(curl -s --header "PRIVATE-TOKEN: ${API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/pipelines/${CI_PIPELINE_ID}/jobs?scope[]=success"  )
>> -while  [ ${index} -le ${MAX_TEST:-16} ]
>> +while  [ ${index} -le ${MAX_TEST:-26} ]
> 
> Where does MAX_TEST come from, BTW? CI env var?

MAX TEST can be an CI variable.
> 
> Why do we need that limit at all? Seems we should rather detect if the
> build_name extraction below starts to fail and terminate with an error then.
> 

I don't remember why i used the counting loop and will check if a check 
against null is enough.

>>   do
>>       build_name=$(echo "${JSON}"  | tr '\r\n' ' ' | jq -r ".[${index}].name")
>>       if [ "$build_name" = "${name}" ]; then
>>
> 
> Jan
> 
Quirin



^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 18:28   ` Jan Kiszka
@ 2020-11-05  9:30     ` Gylstorff Quirin
  2020-11-05  9:39       ` Jan Kiszka
  0 siblings, 1 reply; 15+ messages in thread
From: Gylstorff Quirin @ 2020-11-05  9:30 UTC (permalink / raw)
  To: Jan Kiszka, xenomai



On 11/4/20 7:28 PM, Jan Kiszka wrote:
> Would be good the express that correlation between kernel version and 
> Xenomai version somehow as well. Longer job names? Or is there some 
> better way?

We can use longer names or add tags.

Quirin


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-05  9:30     ` Gylstorff Quirin
@ 2020-11-05  9:39       ` Jan Kiszka
  2020-11-06 13:39         ` Gylstorff Quirin
  0 siblings, 1 reply; 15+ messages in thread
From: Jan Kiszka @ 2020-11-05  9:39 UTC (permalink / raw)
  To: Gylstorff Quirin, xenomai

On 05.11.20 10:30, Gylstorff Quirin wrote:
> 
> 
> On 11/4/20 7:28 PM, Jan Kiszka wrote:
>> Would be good the express that correlation between kernel version and 
>> Xenomai version somehow as well. Longer job names? Or is there some 
>> better way?
> 
> We can use longer names or add tags.
> 

If tags a well visible in the UI, I'm fine. Key point for me is that is 
clear by looking at the CI overviews what has been tested, conceptually 
(actual git IDs require a look into the log, I know).

Jan

-- 
Siemens AG, T RDA IOT
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-04 20:03     ` Jan Kiszka
@ 2020-11-05 11:18       ` Gylstorff Quirin
  0 siblings, 0 replies; 15+ messages in thread
From: Gylstorff Quirin @ 2020-11-05 11:18 UTC (permalink / raw)
  To: Jan Kiszka, xenomai



On 11/4/20 9:03 PM, Jan Kiszka wrote:
> On 04.11.20 20:44, Jan Kiszka via Xenomai wrote:
>> On 04.11.20 17:11, Q. Gylstorff wrote:
>>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>>
>>> Split the ci build description in 4.4(xenomai-3.0.x), 4.19 and 5.4.
>>> This allows the reuse of build descriptions and simplifies the adding
>>> of new builds.
>>>
>>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> ---
>>>   ci/4_19_builds.yml                           |  58 ++++++++++
>>>   ci/5_4_builds.yml                            |  30 +++++
>>>   ci/artifacts.yml                             |   4 +
>>>   ci/default-builds.yml                        |  76 +++++++++++++
>>>   ci/gitlab-ci-base.yml                        | 110 +------------------
>>>   ci/no-artifacts.yml                          |   4 +
>>>   ci/xenomai_3_0_x.yml                         |  36 ++++++
>>>   opt-linux-4.19.yml                           |  17 +++
>>>   opt-linux-latest.yml                         |   3 +
>>>   recipes-kernel/linux/linux-xenomai_latest.bb |   6 +-
>>>   scripts/get-build-id.sh                      |   2 +-
>>>   11 files changed, 237 insertions(+), 109 deletions(-)
>>>   create mode 100644 ci/4_19_builds.yml
>>>   create mode 100644 ci/5_4_builds.yml
>>>   create mode 100644 ci/default-builds.yml
>>>   create mode 100644 ci/xenomai_3_0_x.yml
>>>   create mode 100644 opt-linux-4.19.yml
>>>
>>> diff --git a/ci/4_19_builds.yml b/ci/4_19_builds.yml
>>> new file mode 100644
>>> index 0000000..25be0c5
>>> --- /dev/null
>>> +++ b/ci/4_19_builds.yml
>>> @@ -0,0 +1,58 @@
>>> +#
>>> +# Xenomai Real-Time System
>>> +#
>>> +# Copyright (c) Siemens AG, 2019 - 2020
>>> +#
>>> +# Authors:
>>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> +#
>>> +# SPDX-License-Identifier: MIT
>>> +#
>>> +variables:
>>> +  LATEST_GIT_BRANCH: "4.19"
>>> +  DEPLOY_DIR_EXTENSION: "4.19"
>>> +  BUILD_IDENTIFIER: "4.19"
>>> +
>>> +build-4.19:board-qemu-amd64:
>>> +  extends: .build:board-qemu-amd64
>>> +
>>> +lava-test-4.19:qemu-amd64:
>>> +  needs: [ "build-4.19:board-qemu-amd64" ]
>>> +  extends: .lava-test:qemu-amd64
>>> +
>>> +build-4.19:board-qemu-armhf:
>>> +  extends: .build:board-qemu-armhf
>>> +
>>> +lava-test-4.19:qemu-armhf:
>>> +  needs: [ "build-4.19:board-qemu-armhf" ]
>>> +  extends: .lava-test:qemu-armhf
>>> +
>>> +build-4.19:board-qemu-arm64:
>>> +  extends: .build:board-qemu-arm64
>>> +
>>> +lava-test-4.19:qemu-arm64:
>>> +  needs: [ "build-4.19:board-qemu-arm64" ]
>>> +  extends: .lava-test:qemu-arm64
>>> +
>>> +build-4.19:board-hikey:
>>> +  extends: .build:board-hikey
>>> +
>>> +lava-test-4.19:board-hikey:
>>> +  needs: [ "build-4.19:board-hikey" ]
>>> +  extends: .lava-test:board-hikey
>>> +
>>> +build-4.19:board-beagle-bone-black:
>>> +  extends: .build:board-beagle-bone-black
>>> +
>>> +lava-test-4.19:board-beagle-bone-black:
>>> +  needs: [ "build-4.19:board-beagle-bone-black" ]
>>> +  extends: .lava-test:board-beagle-bone-black
>>> +
>>> +build-4.19:board-x86-64-efi:
>>> +  extends: .build:board-x86-64-efi
>>> +
>>> +lava-test-4.19:board-x86-64-efi:
>>> +  needs: [ "build-4.19:board-x86-64-efi" ]
>>> +  extends: .lava-test:board-x86-64-efi
>>> +
>>> +
>>> diff --git a/ci/5_4_builds.yml b/ci/5_4_builds.yml
>>> new file mode 100644
>>> index 0000000..b5cfdb9
>>> --- /dev/null
>>> +++ b/ci/5_4_builds.yml
>>> @@ -0,0 +1,30 @@
>>> +#
>>> +# Xenomai Real-Time System
>>> +#
>>> +# Copyright (c) Siemens AG, 2019 - 2020
>>> +#
>>> +# Authors:
>>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> +#
>>> +# SPDX-License-Identifier: MIT
>>> +#
>>> +variables:
>>> +  LATEST_GIT_BRANCH: "5.4"
>>> +  DEPLOY_DIR_EXTENSION: "5.4"
>>> +  BUILD_IDENTIFIER: "5.4"
>>> +
>>> +build-5.4:board-qemu-amd64:
>>> +  extends: .build:board-qemu-amd64
>>> +
>>> +lava-test-5.4:qemu-amd64:
>>> +  needs: [ "build-5.4:board-qemu-amd64" ]
>>> +  extends: .lava-test:qemu-amd64
>>> +
>>> +build-5.4:board-x86-64-efi:
>>> +  extends: .build:board-x86-64-efi
>>> +
>>> +lava-test-5.4:board-x86-64-efi:
>>> +  needs: [ "build-5.4:board-x86-64-efi" ]
>>> +  extends: .lava-test:board-x86-64-efi
>>> +
>>> +
>>> diff --git a/ci/artifacts.yml b/ci/artifacts.yml
>>> index 510f903..cc42274 100644
>>> --- a/ci/artifacts.yml
>>> +++ b/ci/artifacts.yml
>>> @@ -19,3 +19,7 @@
>>>       expire_in: 1 week
>>>   include:
>>>     - local: '/ci/gitlab-ci-base.yml'
>>> +  - local: '/ci/default-builds.yml'
>>> +  - local: '/ci/4_19_builds.yml'
>>> +  - local: '/ci/5_4_builds.yml'
>>> +  - local: '/ci/xenomai_3_0_x.yml'
>>> diff --git a/ci/default-builds.yml b/ci/default-builds.yml
>>> new file mode 100644
>>> index 0000000..6979dd3
>>> --- /dev/null
>>> +++ b/ci/default-builds.yml
>>> @@ -0,0 +1,76 @@
>>> +#
>>> +# Xenomai Real-Time System
>>> +#
>>> +# Copyright (c) Siemens AG, 2019 - 2020
>>> +#
>>> +# Authors:
>>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> +#
>>> +# SPDX-License-Identifier: MIT
>>> +#
>>> +.build:board-qemu-amd64:
>>> +  extends: .build
>>> +  variables:
>>> +    TARGET: qemu-amd64
>>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>>> +
>>> +.lava-test:qemu-amd64:
>>> +  extends: .test
>>> +  variables:
>>> +    TARGET: qemu-amd64
>>> +
>>> +.build:board-qemu-armhf:
>>> +  extends: .build
>>> +  variables:
>>> +    TARGET: qemu-armhf
>>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>>> +
>>> +.lava-test:qemu-armhf:
>>> +  extends: .test
>>> +  variables:
>>> +    TARGET: qemu-armhf
>>> +
>>> +.build:board-qemu-arm64:
>>> +  extends: .build
>>> +  variables:
>>> +    TARGET: qemu-arm64
>>> +    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>>> +
>>> +.lava-test:qemu-arm64:
>>> +  extends: .test
>>> +  variables:
>>> +    TARGET: qemu-arm64
>>> +
>>> +.build:board-hikey:
>>> +  extends: .build
>>> +  variables:
>>> +    TARGET: hikey
>>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> +
>>> +.lava-test:board-hikey:
>>> +  extends: .test
>>> +  variables:
>>> +    TARGET: hikey
>>> +
>>> +.build:board-beagle-bone-black:
>>> +  extends: .build
>>> +  variables:
>>> +    TARGET: beagle-bone-black
>>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> +
>>> +.lava-test:board-beagle-bone-black:
>>> +  extends: .test
>>> +  variables:
>>> +    TARGET: beagle-bone-black
>>> +
>>> +.build:board-x86-64-efi:
>>> +  extends: .build
>>> +  variables:
>>> +    TARGET: x86-64-efi
>>> +    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> +
>>> +.lava-test:board-x86-64-efi:
>>> +  extends: .test
>>> +  variables:
>>> +    TARGET: x86-64-efi
>>> +
>>> diff --git a/ci/gitlab-ci-base.yml b/ci/gitlab-ci-base.yml
>>> index 18419a8..a766a9e 100644
>>> --- a/ci/gitlab-ci-base.yml
>>> +++ b/ci/gitlab-ci-base.yml
>>> @@ -10,7 +10,7 @@
>>>   #
>>>   stages:
>>>     - build
>>> -  - lava-test
>>> +  - test
>>>   variables:
>>>     GIT_STRATEGY: clone
>>> @@ -37,119 +37,15 @@ default:
>>>   .test:
>>>     extends: .add-lava-ssh-config
>>> -  stage: lava-test
>>> +  stage: test
>>>     script:
>>>       - scripts/install-lavacli.sh
>>>       - export BUILD_JOB_ID=$(scripts/get-build-id.sh ${BUILD_JOB_NAME})
>>>       - scripts/run-lava-tests.sh ${TARGET}
>>>     variables:
>>> -    BUILD_JOB_NAME: "build:board-${TARGET}${TARGET_EXTENSION}"
>>> +    BUILD_JOB_NAME: 
>>> "build-${BUILD_IDENTIFIER}:board-${TARGET}${TARGET_EXTENSION}"
>>>     only:
>>>       variables:
>>>         - $LAVA_SSH_USER
>>> -build:board-qemu-amd64:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: qemu-amd64
>>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>>> -
>>> -lava-test:qemu-amd64:
>>> -  needs: [ "build:board-qemu-amd64" ]
>>> -  dependencies: [ "build:board-qemu-amd64" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: qemu-amd64
>>> -
>>> -build:board-qemu-armhf:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: qemu-armhf
>>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>>> -
>>> -lava-test:qemu-armhf:
>>> -  needs: [ "build:board-qemu-armhf" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: qemu-armhf
>>> -
>>> -build:board-qemu-arm64:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: qemu-arm64
>>> -    BUILD_OPTIONS: ":opt-ext4-gz.yml"
>>> -
>>> -lava-test:qemu-arm64:
>>> -  needs: [ "build:board-qemu-arm64" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: qemu-arm64
>>> -
>>> -build:board-hikey:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: hikey
>>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> -
>>> -lava-test:board-hikey:
>>> -  needs: [ "build:board-hikey" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: hikey
>>> -
>>> -build:board-beagle-bone-black:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: beagle-bone-black
>>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> -
>>> -lava-test:board-beagle-bone-black:
>>> -  needs: [ "build:board-beagle-bone-black" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: beagle-bone-black
>>> -
>>> -build:board-x86-64-efi:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: x86-64-efi
>>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> -
>>> -lava-test:board-x86-64-efi:
>>> -  needs: [ "build:board-x86-64-efi" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: x86-64-efi
>>> -
>>> -build:board-beagle-bone-black:xenomai-3.0.x:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: beagle-bone-black
>>> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> -
>>> -lava-test:board-beagle-bone-black:xenomai-3.0.x:
>>> -  needs: [ "build:board-beagle-bone-black:xenomai-3.0.x" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: beagle-bone-black
>>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> -    TARGET_EXTENSION: ":xenomai-3.0.x"
>>> -
>>> -build:board-x86-64-efi:xenomai-3.0.x:
>>> -  extends: .build
>>> -  variables:
>>> -    TARGET: x86-64-efi
>>> -    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>>> -    BUILD_OPTIONS: ":opt-lava-test.yml"
>>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> -
>>> -lava-test:board-x86-64-efi:xenomai-3.0.x:
>>> -  needs: [ "build:board-x86-64-efi:xenomai-3.0.x" ]
>>> -  extends: .test
>>> -  variables:
>>> -    TARGET: x86-64-efi
>>> -    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> -    TARGET_EXTENSION: ":xenomai-3.0.x"
>>> diff --git a/ci/no-artifacts.yml b/ci/no-artifacts.yml
>>> index 02457de..517446e 100644
>>> --- a/ci/no-artifacts.yml
>>> +++ b/ci/no-artifacts.yml
>>> @@ -19,3 +19,7 @@
>>>         - $USE_GITLAB_ARTIFACTS
>>>   include:
>>>     - local: '/ci/gitlab-ci-base.yml'
>>> +  - local: '/ci/default-builds.yml'
>>> +  - local: '/ci/4_19_builds.yml'
>>> +  - local: '/ci/5_4_builds.yml'
>>> +  - local: '/ci/xenomai_3_0_x.yml'
>>> diff --git a/ci/xenomai_3_0_x.yml b/ci/xenomai_3_0_x.yml
>>> new file mode 100644
>>> index 0000000..9dbd8d4
>>> --- /dev/null
>>> +++ b/ci/xenomai_3_0_x.yml
>>> @@ -0,0 +1,36 @@
>>> +#
>>> +# Xenomai Real-Time System
>>> +#
>>> +# Copyright (c) Siemens AG, 2019 - 2020
>>> +#
>>> +# Authors:
>>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> +#
>>> +# SPDX-License-Identifier: MIT
>>> +#
>>> +
>>> +build-4.4:board-beagle-bone-black:
>>> +  extends: .build:board-beagle-bone-black
>>> +  variables:
>>> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> +
>>> +lava-test-4.4:board-beagle-bone-black:
>>> +  needs: [ "build-4.4:board-beagle-bone-black" ]
>>> +  extends: .lava-test:board-beagle-bone-black
>>> +  variables:
>>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> +    BUILD_IDENTIFIER: "4.4"
>>> +
>>> +build-4.4:board-x86-64-efi:
>>> +  extends: .build:board-x86-64-efi
>>> +  variables:
>>> +    XENOMAI_BUILD_OPTION: ":opt-xenomai-3.0.x.yml"
>>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> +
>>> +lava-test-4.4:board-x86-64-efi:
>>> +  needs: [ "build-4.4:board-x86-64-efi" ]
>>> +  extends: .lava-test:board-x86-64-efi
>>> +  variables:
>>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>> +    BUILD_IDENTIFIER: "4.4"
>>> diff --git a/opt-linux-4.19.yml b/opt-linux-4.19.yml
>>> new file mode 100644
>>> index 0000000..1613e1c
>>> --- /dev/null
>>> +++ b/opt-linux-4.19.yml
>>> @@ -0,0 +1,17 @@
>>> +#
>>> +# Xenomai Real-Time System
>>> +#
>>> +# Copyright (c) Siemens AG, 2020
>>> +#
>>> +# Authors:
>>> +#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> +#
>>> +# SPDX-License-Identifier: MIT
>>> +#
>>> +
>>> +header:
>>> +  version: 8
>>> +
>>> +local_conf_header:
>>> +  linux-xenomai-latest: |
>>> +    PREFERRED_VERSION_linux-xenomai = "4.19%"
>>> diff --git a/opt-linux-latest.yml b/opt-linux-latest.yml
>>> index 7cf291a..735c30e 100644
>>> --- a/opt-linux-latest.yml
>>> +++ b/opt-linux-latest.yml
>>> @@ -12,6 +12,9 @@
>>>   header:
>>>     version: 8
>>> +env:
>>> +  LATEST_GIT_BRANCH: :LATEST_GIT_BRANCH
> 
> Is that gitlab-ci syntax? That also breaks local builds.
> 
> We rather need to generate a kas command lines so that every build job 
> can easily be replicated locally.
> 
> I'm pulling this patch and patch 4 from next again. Patch 1 I will 
> update in place as I just released to new 4.4 ipipe versions.
> 
> Jan
> 

I will send a v2 with a fix

Quirin


^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds
  2020-11-05  9:39       ` Jan Kiszka
@ 2020-11-06 13:39         ` Gylstorff Quirin
  0 siblings, 0 replies; 15+ messages in thread
From: Gylstorff Quirin @ 2020-11-06 13:39 UTC (permalink / raw)
  To: Jan Kiszka, xenomai



On 11/5/20 10:39 AM, Jan Kiszka wrote:
> On 05.11.20 10:30, Gylstorff Quirin wrote:
>>
>>
>> On 11/4/20 7:28 PM, Jan Kiszka wrote:
>>> Would be good the express that correlation between kernel version and 
>>> Xenomai version somehow as well. Longer job names? Or is there some 
>>> better way?
>>
>> We can use longer names or add tags.
>>
> 
> If tags a well visible in the UI, I'm fine. Key point for me is that is 
> clear by looking at the CI overviews what has been tested, conceptually 
> (actual git IDs require a look into the log, I know).
> 
> Jan
> 

I tested tags and they are visible in the ui[1].
But you need to add the tags to the runner as their purpose is to select 
an specific runner.

I would go with longer names.

[1]: 
https://gitlab.com/Quirin.Gy/xenomai-images-test/-/pipelines/212770080/builds

Quirin


^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2020-11-06 13:39 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-04 16:11 [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Q. Gylstorff
2020-11-04 16:11 ` [xenomai-images][PATCH 1/4] linux-xenomai: update ipipe versions Q. Gylstorff
2020-11-04 16:11 ` [xenomai-images][PATCH 2/4] delete linux-xenomai_4.14 Q. Gylstorff
2020-11-04 16:11 ` [xenomai-images][PATCH 3/4] ci: Split build and add 5.4 builds Q. Gylstorff
2020-11-04 16:22   ` Jan Kiszka
2020-11-05  9:15     ` Gylstorff Quirin
2020-11-04 18:28   ` Jan Kiszka
2020-11-05  9:30     ` Gylstorff Quirin
2020-11-05  9:39       ` Jan Kiszka
2020-11-06 13:39         ` Gylstorff Quirin
2020-11-04 19:44   ` Jan Kiszka
2020-11-04 20:03     ` Jan Kiszka
2020-11-05 11:18       ` Gylstorff Quirin
2020-11-04 16:11 ` [xenomai-images][PATCH 4/4] tests: increase timeouts Q. Gylstorff
2020-11-04 16:49 ` [xenomai-images][PATCH 0/4] ci: update for 5.4 testing Jan Kiszka

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.