All of lore.kernel.org
 help / color / mirror / Atom feed
* [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci
@ 2020-02-14  7:32 Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 01/11] ci: remove code duplications Q. Gylstorff
                   ` (8 more replies)
  0 siblings, 9 replies; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Add testing for Xenomai 3.0.x and 4.4. Also clean up the ci scripts
to avoid code duplications. Add new target ipc227e for 4.4 testing.

Quirin Gylstorff (11):
  ci: remove code duplications
  ci: Use gitlab extends instead of YAML Anchors
  scripts: Allow other layers to reuse scripts
  recipes-kernel/linux: Add 4.4
  ci: Add linux-4.4 build and tests
  ci: add option for 4.19
  ci: Remove proxy settings
  ci: add new build options
  recipes-xenomai/xenomai.inc: Add missing libxenomai-dev
  recipes-xenomai/xenomai.inc:  add exception handling
  ci: Add target ipc227e for testing 4.4

 .gitlab-ci.yml                             | 205 ++++++++++++---------
 opt-linux-4.19.yml                         |  17 ++
 opt-linux-4.4.yml                          |  17 ++
 recipes-kernel/linux/files/amd64_defconfig |   3 +-
 recipes-xenomai/xenomai/xenomai.inc        |  11 +-
 scripts/deploy_for_testing.sh              |  42 +++--
 scripts/run-lava-tests.sh                  |  58 +++---
 tests/jobs/xenomai-ipc227e.yml             |  74 ++++++++
 8 files changed, 295 insertions(+), 132 deletions(-)
 create mode 100644 opt-linux-4.19.yml
 create mode 100644 opt-linux-4.4.yml
 create mode 100644 tests/jobs/xenomai-ipc227e.yml

-- 
2.20.1



^ permalink raw reply	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 01/11] ci: remove code duplications
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 02/11] ci: Use gitlab extends instead of YAML Anchors Q. Gylstorff
                   ` (7 subsequent siblings)
  8 siblings, 0 replies; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml | 130 +++++++++++++++++++++----------------------------
 1 file changed, 55 insertions(+), 75 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33f97ec..e5dd3c1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2020
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -18,7 +18,8 @@ variables:
   https_proxy: "$HTTPS_PROXY"
   ftp_proxy: "$FTP_PROXY"
   no_proxy: "$NO_PROXY"
-  BUILD_OPTIONS: ":opt-xenomai-next.yml:opt-linux-latest.yml"
+  XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
+  LINUX_BUILD_OPTION: ":opt-linux-latest.yml"
 default:
   image: kasproject/kas-isar:latest
 
@@ -30,111 +31,90 @@ default:
     - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
     - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config
     - echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
-build:qemu-amd64:
+
+.build: &build-job
   <<: *lava-ssh-key
   stage: build
   script:
-    - kas build kas.yml:board-qemu-amd64.yml${BUILD_OPTIONS}
-    - scripts/deploy_for_testing.sh qemu-amd64
+    - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}
+    - scripts/deploy_for_testing.sh ${TARGET}
 
-lava-test:qemu-amd64:
+.test: &test-job
   <<: *lava-ssh-key
   stage: lava-test
   script:
     - scripts/install-lavacli.sh
-    - scripts/run-lava-tests.sh qemu-amd64
-  needs: [ "build:qemu-amd64" ]
+    - scripts/run-lava-tests.sh ${TARGET}
   only:
     variables:
       - $LAVA_SSH_USER
 
+
+build:qemu-amd64:
+  <<: *build-job
+  variables:
+    TARGET: qemu-amd64
+
+lava-test:qemu-amd64:
+  needs: [ "build:qemu-amd64" ]
+  <<: *test-job
+  variables:
+    TARGET: qemu-amd64
+
 build:qemu-armhf:
-  <<: *lava-ssh-key
-  stage: build
-  script:
-    - kas build kas.yml:board-qemu-armhf.yml${BUILD_OPTIONS}
-    - scripts/deploy_for_testing.sh qemu-armhf
+  <<: *build-job
+  variables:
+    TARGET: qemu-armhf
 
 lava-test:qemu-armhf:
-  <<: *lava-ssh-key
-  stage: lava-test
-  script:
-    - scripts/install-lavacli.sh
-    - scripts/run-lava-tests.sh qemu-armhf
   needs: [ "build:qemu-armhf" ]
-  only:
-    variables:
-      - $LAVA_SSH_USER
+  <<: *test-job
+  variables:
+    TARGET: qemu-armhf
 
 build:qemu-arm64:
-  <<: *lava-ssh-key
-  stage: build
-  script:
-    - kas build kas.yml:board-qemu-arm64.yml${BUILD_OPTIONS}
-    - scripts/deploy_for_testing.sh qemu-arm64
+  <<: *build-job
+  variables:
+    TARGET: qemu-arm64
 
 lava-test:qemu-arm64:
-  <<: *lava-ssh-key
-  stage: lava-test
-  script:
-    - scripts/install-lavacli.sh
-    - scripts/run-lava-tests.sh qemu-arm64
   needs: [ "build:qemu-arm64" ]
-  only:
-    variables:
-      - $LAVA_SSH_USER
+  <<: *test-job
+  variables:
+    TARGET: qemu-arm64
 
 build:board-hikey:
-  <<: *lava-ssh-key
-  stage: build
-  script:
-    - kas build kas.yml:board-hikey.yml:opt-lava-test.yml${BUILD_OPTIONS}
-    - scripts/deploy_for_testing.sh hikey
-
+  <<: *build-job
+  variables:
+    TARGET: hikey
+    BUILD_OPTIONS: ":opt-lava-test.yml"
 lava-test:board-hikey:
-  <<: *lava-ssh-key
-  stage: lava-test
-  script:
-    - scripts/install-lavacli.sh
-    - scripts/run-lava-tests.sh hikey
   needs: [ "build:board-hikey" ]
-  only:
-    variables:
-      - $LAVA_SSH_USER
-
+  <<: *test-job
+  variables:
+    TARGET: hikey
 
 build:board-beaglebone:
-  <<: *lava-ssh-key
-  stage: build
-  script:
-    - kas build kas.yml:board-beagle-bone-black.yml:opt-lava-test.yml${BUILD_OPTIONS}
-    - scripts/deploy_for_testing.sh beagle-bone-black
+  <<: *build-job
+  variables:
+    TARGET: beagle-bone-black
+    BUILD_OPTIONS: ":opt-lava-test.yml"
+
 
 lava-test:board-beaglebone:
-  <<: *lava-ssh-key
-  stage: lava-test
-  script:
-    - scripts/install-lavacli.sh
-    - scripts/run-lava-tests.sh beaglebone
   needs: [ "build:board-beaglebone" ]
-  only:
-    variables:
-      - $LAVA_SSH_USER
+  <<: *test-job
+  variables:
+    TARGET: beaglebone
 
 build:board-x86-64-efi:
-  <<: *lava-ssh-key
-  stage: build
-  script:
-    - kas build kas.yml:board-x86-64-efi.yml:opt-lava-test.yml${BUILD_OPTIONS}
-    - scripts/deploy_for_testing.sh x86-64-efi
+  <<: *build-job
+  variables:
+    TARGET: x86-64-efi
+    BUILD_OPTIONS: ":opt-lava-test.yml"
 
 lava-test:board-x86-64-efi:
-  <<: *lava-ssh-key
-  stage: lava-test
-  script:
-    - scripts/install-lavacli.sh
-    - scripts/run-lava-tests.sh x86-64
   needs: [ "build:board-x86-64-efi" ]
-  only:
-    variables:
-      - $LAVA_SSH_USER
+  <<: *test-job
+  variables:
+    TARGET: x86-64
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 02/11] ci: Use gitlab extends instead of YAML Anchors
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 01/11] ci: remove code duplications Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 03/11] scripts: Allow other layers to reuse scripts Q. Gylstorff
                   ` (6 subsequent siblings)
  8 siblings, 0 replies; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Gitlab uses extends as an alternative to YAML Anchors since 11.3.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml | 35 ++++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e5dd3c1..4b3f970 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,22 +25,23 @@ default:
 
 # add lavacli to the container and install the ssh keys
 # for the test infrastructure
-.add-lava-ssh-config: &lava-ssh-key
+.add-lava-ssh-config:
   before_script:
     - mkdir -p -m=700 ~/.ssh
     - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
     - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config
     - echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
 
-.build: &build-job
-  <<: *lava-ssh-key
+.build:
+  extends: .add-lava-ssh-config
   stage: build
   script:
     - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh ${TARGET}
 
-.test: &test-job
-  <<: *lava-ssh-key
+.test:
+  extends: .add-lava-ssh-config
+  image: kasproject/kas-isar:latest
   stage: lava-test
   script:
     - scripts/install-lavacli.sh
@@ -51,51 +52,51 @@ default:
 
 
 build:qemu-amd64:
-  <<: *build-job
+  extends: .build
   variables:
     TARGET: qemu-amd64
 
 lava-test:qemu-amd64:
   needs: [ "build:qemu-amd64" ]
-  <<: *test-job
+  extends: .test
   variables:
     TARGET: qemu-amd64
 
 build:qemu-armhf:
-  <<: *build-job
+  extends: .build
   variables:
     TARGET: qemu-armhf
 
 lava-test:qemu-armhf:
   needs: [ "build:qemu-armhf" ]
-  <<: *test-job
+  extends: .test
   variables:
     TARGET: qemu-armhf
 
 build:qemu-arm64:
-  <<: *build-job
+  extends: .build
   variables:
     TARGET: qemu-arm64
 
 lava-test:qemu-arm64:
   needs: [ "build:qemu-arm64" ]
-  <<: *test-job
+  extends: .test
   variables:
     TARGET: qemu-arm64
 
 build:board-hikey:
-  <<: *build-job
+  extends: .build
   variables:
     TARGET: hikey
     BUILD_OPTIONS: ":opt-lava-test.yml"
 lava-test:board-hikey:
   needs: [ "build:board-hikey" ]
-  <<: *test-job
+  extends: .test
   variables:
     TARGET: hikey
 
 build:board-beaglebone:
-  <<: *build-job
+  extends: .build
   variables:
     TARGET: beagle-bone-black
     BUILD_OPTIONS: ":opt-lava-test.yml"
@@ -103,18 +104,18 @@ build:board-beaglebone:
 
 lava-test:board-beaglebone:
   needs: [ "build:board-beaglebone" ]
-  <<: *test-job
+  extends: .test
   variables:
     TARGET: beaglebone
 
 build:board-x86-64-efi:
-  <<: *build-job
+  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" ]
-  <<: *test-job
+  extends: .test
   variables:
     TARGET: x86-64
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 03/11] scripts: Allow other layers to reuse scripts
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 01/11] ci: remove code duplications Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 02/11] ci: Use gitlab extends instead of YAML Anchors Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 04/11] recipes-kernel/linux: Add 4.4 Q. Gylstorff
                   ` (5 subsequent siblings)
  8 siblings, 0 replies; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

- add ssh identity file
- add support for local build
- add variables for IMAGE and DISTRO_NAME to deploy from derived layers
- use sed instead eval to replace placeholders for clarity

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml                |  5 +++-
 scripts/deploy_for_testing.sh | 40 ++++++++++++++------------
 scripts/run-lava-tests.sh     | 53 +++++++++++++++++++----------------
 3 files changed, 55 insertions(+), 43 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4b3f970..fdc24e1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,6 +20,9 @@ variables:
   no_proxy: "$NO_PROXY"
   XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
   LINUX_BUILD_OPTION: ":opt-linux-latest.yml"
+  ISAR_IMAGE: demo-image
+  ISAR_DISTRIBUTION: xenomai-demo
+
 default:
   image: kasproject/kas-isar:latest
 
@@ -28,8 +31,8 @@ default:
 .add-lava-ssh-config:
   before_script:
     - mkdir -p -m=700 ~/.ssh
-    - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/id_rsa && chmod 600 ~/.ssh/id_rsa
     - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config
+    - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/lava_id_rsa && chmod 600 ~/.ssh/lava_id_rsa
     - echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
 
 .build:
diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh
index f8f71e3..db19e5f 100755
--- a/scripts/deploy_for_testing.sh
+++ b/scripts/deploy_for_testing.sh
@@ -11,37 +11,41 @@
 # SPDX-License-Identifier: MIT
 #
 set -e
-TARGET="$1"
+target="$1"
 
-if [ -z "${TARGET}" ]; then
+if [ -z "${target}" ]; then
     exit -1
 fi
-IMAGES_DIR=build/tmp/deploy/images
+images_dir=build/tmp/deploy/images
 
 if [ -z "${LAVA_SSH_USER}" ] || [ -z "${LAVA_SSH_HOST}" ]  || [ -z "${LAVA_SSH_PORT}" ]; then
     echo "Lava environment not available or incomplete - do not deploy"
     exit 0
 fi
 
-LAVA_SSH_DESTINATION="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
+lava_ssh_destination="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
 
-LAVA_DEPLOY_DIR=${LAVA_DEPLOY_DIR:-"/var/lib/lava/artifacts"}
-DEPLOY_DIR="${LAVA_DEPLOY_DIR}/${CI_PIPELINE_ID}"
-ssh -p ${LAVA_SSH_PORT} ${LAVA_SSH_DESTINATION} 'install -d -m 755 "'${DEPLOY_DIR}'"'
+isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}"
+lava_deploy_dir="${LAVA_DEPLOY_DIR:-/var/lib/lava/artifacts}"
+deploy_dir="${lava_deploy_dir}/${CI_PIPELINE_ID}"
+lava_identity="-i ${LAVA_SSH_KEY_PATH:-~/.ssh/lava_id_rsa}"
+if [ -n "${CI_PIPELINE_ID}" ]; then
+    ssh -p ${LAVA_SSH_PORT} ${lava_identity} ${lava_ssh_destination} 'install -d -m 755 "'${deploy_dir}'"'
+fi
 #KERNEL
-scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-vmlinuz \
-    ${LAVA_SSH_DESTINATION}:${DEPLOY_DIR}
+scp -P ${LAVA_SSH_PORT} ${lava_identity} ${images_dir}/${target}/${isar_base_name}-vmlinuz \
+    ${lava_ssh_destination}:${deploy_dir}
 # INITRD
-scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-initrd.img \
-    ${LAVA_SSH_DESTINATION}:${DEPLOY_DIR}
+scp -P ${LAVA_SSH_PORT} ${lava_identity} ${images_dir}/${target}/${isar_base_name}-initrd.img \
+    ${lava_ssh_destination}:${deploy_dir}
 # ROOTFS
-if [ -n ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}.*.gz  ]; then
-    gzip ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}.*
+if [ -n ${images_dir}/${target}/${isar_base_name}.*.gz  ]; then
+    gzip ${images_dir}/${target}/${isar_base_name}.*
 fi
-scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}.* \
-    ${LAVA_SSH_DESTINATION}:${DEPLOY_DIR}
+scp -P ${LAVA_SSH_PORT} ${lava_identity} ${images_dir}/${target}/${isar_base_name}.* \
+    ${lava_ssh_destination}:${deploy_dir}
 # DTB
-DTB="${IMAGES_DIR}/${TARGET}/*.dtb"
-if [ -e ${DTB} ]; then
-    scp -P ${LAVA_SSH_PORT} ${DTB} ${LAVA_SSH_DESTINATION}:${DEPLOY_DIR}
+dtb="${images_dir}/${target}/*.dtb"
+if [ -e ${dtb} ]; then
+    scp -P ${LAVA_SSH_PORT} ${lava_identity} ${dtb} ${lava_ssh_destination}:${deploy_dir}
 fi
diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index 03119f1..59cf14e 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -11,48 +11,53 @@
 #
 set -e
 TARGET=$1
+if [ -z "${TARGET}" ]; then
+    echo "no target was given"
+    exit -1
+fi
 
-LAVA_MASTER_PORT=28080
+lava_master_port="${LAVA_MASTER_PORT:-28080}"
 if [ -n "${LAVA_SSH_PORT}" ]; then
-    LAVA_SSH_PORT="-p ${LAVA_SSH_PORT}"
+    lava_ssh_port="-p ${LAVA_SSH_PORT}"
 fi
-LAVA_SSH_DESTINATION="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
+lava_identity="-i ${LAVA_SSH_KEY_PATH:-~/.ssh/lava_id_rsa}"
+lava_ssh_destination="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
 # open connection for ssh port forwarding
-ssh -N ${LAVA_SSH_PORT} -o 'LocalForward localhost:'${LAVA_MASTER_PORT}' localhost:80' ${LAVA_SSH_DESTINATION} &
-SSH_PID=$!
+ssh -N ${lava_ssh_port} ${lava_identity} -o 'LocalForward localhost:'${lava_master_port}' localhost:80' ${lava_ssh_destination} &
+ssh_pid=$!
 # wait for connection
-INTERVAL=1
-TIMEOUT=60
-until ss -tulw | grep -q "${LAVA_MASTER_PORT}"
+interval=1
+timeout=60
+until ss -tulw | grep -q "${lava_master_port}"
 do
-    if [ ${TIMEOUT} -le 0 ]; then
+    if [ ${timeout} -le 0 ]; then
         echo "could not open connection to LAVA Master"
         exit 1
     fi
-    sleep ${INTERVAL}
-    TIMEOUT=$(expr ${TIMEOUT} - ${INTERVAL})
+    sleep ${interval}
+    timeout=$(expr ${timeout} - ${interval})
 done
-LAVA_MASTER_URI=http://localhost:${LAVA_MASTER_PORT}
-
-if [ -z "${TARGET}" ]; then
-    echo "no target was given"
-    exit -1
-fi
-artifact_url="${LAVA_ARTIFACTS_URL:-http://localhost/artifacts}"
+lava_master_uri=http://localhost:${lava_master_port}
 
 # connect to lava master
-lavacli identities add --token ${LAVA_MASTER_TOKEN} --uri ${LAVA_MASTER_URI} --username ${LAVA_MASTER_ACCOUNT} default
-
+lavacli identities add --token ${LAVA_MASTER_TOKEN} --uri ${lava_master_uri} --username ${LAVA_MASTER_ACCOUNT} default
 #generate lava job description from template
+artifact_url="${LAVA_ARTIFACTS_URL:-http://localhost/artifacts}"
 DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}"
-template=$(cat tests/jobs/xenomai-${TARGET}.yml)
-test_id=$(eval "cat <<EOF ${template}
-EOF" | lavacli jobs submit -)
+job_template_path="${JOB_TEMPLATE_PATH:-tests/jobs/xenomai}"
+tmp_dir=$(mktemp -d)
+template=${tmp_dir}/job_${TARGET}_${CI_PIPELINE_ID}.yml
+cp ${job_template_path}-${TARGET}.yml ${template}
+sed -i "s|\${TARGET}|${TARGET}|g" $template
+sed -i "s|\${DEPLOY_URL}|${DEPLOY_URL}|g" $template
+sed -i "s|\${ISAR_IMAGE}|${ISAR_IMAGE}|g" $template
+sed -i "s|\${ISAR_DISTRIBUTION}|${ISAR_DISTRIBUTION}|g" $template
+test_id=$(lavacli jobs submit ${template})
 lavacli jobs logs ${test_id}
 lavacli results ${test_id}
 # change return code to generate a error in gitlab-ci if a test is failed
 number_of_fails=$(lavacli results ${test_id} | grep fail | wc -l)
-kill ${SSH_PID}
+kill ${ssh_pid}
 if [ "${number_of_fails}" -gt "0" ]; then
     exit 1
 fi
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 04/11] recipes-kernel/linux: Add 4.4
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
                   ` (2 preceding siblings ...)
  2020-02-14  7:32 ` [xenomai-images PATCH 03/11] scripts: Allow other layers to reuse scripts Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  8:41   ` Jan Kiszka
  2020-02-14  7:32 ` [xenomai-images PATCH 05/11] ci: Add linux-4.4 build and tests Q. Gylstorff
                   ` (4 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Add recipe for linux 4.4.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 opt-linux-4.4.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 opt-linux-4.4.yml

diff --git a/opt-linux-4.4.yml b/opt-linux-4.4.yml
new file mode 100644
index 0000000..bb24a04
--- /dev/null
+++ b/opt-linux-4.4.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.4%"
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 05/11] ci: Add linux-4.4 build and tests
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
                   ` (3 preceding siblings ...)
  2020-02-14  7:32 ` [xenomai-images PATCH 04/11] recipes-kernel/linux: Add 4.4 Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  8:44   ` Jan Kiszka
  2020-02-14  7:32 ` [xenomai-images PATCH 06/11] ci: add option for 4.19 Q. Gylstorff
                   ` (3 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Add a new CI variable DEPLOY_DIR_EXTENSION to differ
between kernel builds for the same target as the kernel
version is not visibly before bootup

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml                | 31 ++++++++++++++++++++++++++++++-
 scripts/deploy_for_testing.sh |  4 ++--
 scripts/run-lava-tests.sh     |  4 ++--
 3 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdc24e1..b8dbbc5 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2020
+# Copyright (c) Siemens AG, 2019 - 2020
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -122,3 +122,32 @@ lava-test:board-x86-64-efi:
   extends: .test
   variables:
     TARGET: x86-64
+
+build:qemu-amd64:linux-4.4:
+  extends: .build
+  variables:
+    TARGET: qemu-amd64
+    LINUX_BUILD_OPTION: ":opt-linux-4.4.yml"
+    DEPLOY_DIR_EXTENSION: "4.4"
+
+lava-test:qemu-amd64:linux-4.4:
+  needs: [ "build:qemu-amd64:linux-4.4" ]
+  extends: .test
+  variables:
+    TARGET: qemu-amd64
+    DEPLOY_DIR_EXTENSION: "4.4"
+
+build:board-x86-64-efi:linux-4.4:
+  extends: .build
+  variables:
+    TARGET: x86-64-efi
+    BUILD_OPTIONS: ":opt-lava-test.yml"
+    LINUX_BUILD_OPTION: ":opt-linux-4.4.yml"
+    DEPLOY_DIR_EXTENSION: "4.4"
+
+lava-test:board-x86-64-efi:linux-4.4:
+  needs: [ "build:board-x86-64-efi:linux-4.4" ]
+  extends: .test
+  variables:
+    TARGET: x86-64
+    DEPLOY_DIR_EXTENSION: "4.4"
diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh
index db19e5f..b3d565f 100755
--- a/scripts/deploy_for_testing.sh
+++ b/scripts/deploy_for_testing.sh
@@ -3,7 +3,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2020
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -27,7 +27,7 @@ lava_ssh_destination="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
 
 isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}"
 lava_deploy_dir="${LAVA_DEPLOY_DIR:-/var/lib/lava/artifacts}"
-deploy_dir="${lava_deploy_dir}/${CI_PIPELINE_ID}"
+deploy_dir="${lava_deploy_dir}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}"
 lava_identity="-i ${LAVA_SSH_KEY_PATH:-~/.ssh/lava_id_rsa}"
 if [ -n "${CI_PIPELINE_ID}" ]; then
     ssh -p ${LAVA_SSH_PORT} ${lava_identity} ${lava_ssh_destination} 'install -d -m 755 "'${deploy_dir}'"'
diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index 59cf14e..e02385a 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -2,7 +2,7 @@
 #
 # Xenomai Real-Time System
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2020
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -43,7 +43,7 @@ lava_master_uri=http://localhost:${lava_master_port}
 lavacli identities add --token ${LAVA_MASTER_TOKEN} --uri ${lava_master_uri} --username ${LAVA_MASTER_ACCOUNT} default
 #generate lava job description from template
 artifact_url="${LAVA_ARTIFACTS_URL:-http://localhost/artifacts}"
-DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}"
+DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}"
 job_template_path="${JOB_TEMPLATE_PATH:-tests/jobs/xenomai}"
 tmp_dir=$(mktemp -d)
 template=${tmp_dir}/job_${TARGET}_${CI_PIPELINE_ID}.yml
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 06/11] ci: add option for 4.19
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
                   ` (4 preceding siblings ...)
  2020-02-14  7:32 ` [xenomai-images PATCH 05/11] ci: Add linux-4.4 build and tests Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  8:45   ` Jan Kiszka
  2020-02-14  7:32 ` [xenomai-images PATCH 07/11] ci: Remove proxy settings Q. Gylstorff
                   ` (2 subsequent siblings)
  8 siblings, 1 reply; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 opt-linux-4.19.yml | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 opt-linux-4.19.yml

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%"
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 07/11] ci: Remove proxy settings
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
                   ` (5 preceding siblings ...)
  2020-02-14  7:32 ` [xenomai-images PATCH 06/11] ci: add option for 4.19 Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  8:47   ` Jan Kiszka
  2020-02-14  7:32 ` [xenomai-images PATCH 08/11] ci: add new build options Q. Gylstorff
  2020-02-14  7:32 ` [xenomai-images PATCH 09/11] recipes-xenomai/xenomai.inc: Add missing libxenomai-dev Q. Gylstorff
  8 siblings, 1 reply; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b8dbbc5..54542b1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,10 +14,6 @@ stages:
 
 variables:
   GIT_STRATEGY: clone
-  http_proxy: "$HTTP_PROXY"
-  https_proxy: "$HTTPS_PROXY"
-  ftp_proxy: "$FTP_PROXY"
-  no_proxy: "$NO_PROXY"
   XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
   LINUX_BUILD_OPTION: ":opt-linux-latest.yml"
   ISAR_IMAGE: demo-image
@@ -31,13 +27,13 @@ default:
 .add-lava-ssh-config:
   before_script:
     - mkdir -p -m=700 ~/.ssh
-    - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config
     - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/lava_id_rsa && chmod 600 ~/.ssh/lava_id_rsa
     - echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
 
 .build:
   extends: .add-lava-ssh-config
   stage: build
+  image: kasproject/kas-isar:latest
   script:
     - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh ${TARGET}
@@ -92,6 +88,7 @@ build:board-hikey:
   variables:
     TARGET: hikey
     BUILD_OPTIONS: ":opt-lava-test.yml"
+
 lava-test:board-hikey:
   needs: [ "build:board-hikey" ]
   extends: .test
@@ -104,7 +101,6 @@ build:board-beaglebone:
     TARGET: beagle-bone-black
     BUILD_OPTIONS: ":opt-lava-test.yml"
 
-
 lava-test:board-beaglebone:
   needs: [ "build:board-beaglebone" ]
   extends: .test
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 08/11] ci: add new build options
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
                   ` (6 preceding siblings ...)
  2020-02-14  7:32 ` [xenomai-images PATCH 07/11] ci: Remove proxy settings Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  2020-02-14  8:48   ` Jan Kiszka
  2020-02-14  7:32 ` [xenomai-images PATCH 09/11] recipes-xenomai/xenomai.inc: Add missing libxenomai-dev Q. Gylstorff
  8 siblings, 1 reply; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 54542b1..608d5db 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -147,3 +147,33 @@ lava-test:board-x86-64-efi:linux-4.4:
   variables:
     TARGET: x86-64
     DEPLOY_DIR_EXTENSION: "4.4"
+
+build:board-beaglebone: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-beaglebone:xenomai-3.0.x:
+  needs: [ "build:board-beaglebone:xenomai-3.0.x" ]
+  extends: .test
+  variables:
+    TARGET: beaglebone
+    DEPLOY_DIR_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
+    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* [xenomai-images PATCH 09/11] recipes-xenomai/xenomai.inc: Add missing libxenomai-dev
  2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
                   ` (7 preceding siblings ...)
  2020-02-14  7:32 ` [xenomai-images PATCH 08/11] ci: add new build options Q. Gylstorff
@ 2020-02-14  7:32 ` Q. Gylstorff
  8 siblings, 0 replies; 17+ messages in thread
From: Q. Gylstorff @ 2020-02-14  7:32 UTC (permalink / raw)
  To: xenomai

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

To build against libxenomai headers are necessary.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 recipes-xenomai/xenomai/xenomai.inc | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/recipes-xenomai/xenomai/xenomai.inc b/recipes-xenomai/xenomai/xenomai.inc
index bd07347..3df635c 100644
--- a/recipes-xenomai/xenomai/xenomai.inc
+++ b/recipes-xenomai/xenomai/xenomai.inc
@@ -11,8 +11,7 @@
 
 inherit dpkg
 
-PROVIDES += "xenomai-kernel-source xenomai-runtime xenomai-runtime-dbgsym libxenomai1-dbgsym"
-
+PROVIDES += "xenomai-kernel-source xenomai-runtime xenomai-runtime-dbgsym libxenomai1 libxenomai-dev libxenomai1-dbgsym"
 # use bitbake get_srcrev to get the current commit id
 COMMIT="${@bb.fetch2.get_srcrev(d).strip('AUTOINC+')}"
 do_prepare_build() {
-- 
2.20.1



^ permalink raw reply related	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 04/11] recipes-kernel/linux: Add 4.4
  2020-02-14  7:32 ` [xenomai-images PATCH 04/11] recipes-kernel/linux: Add 4.4 Q. Gylstorff
@ 2020-02-14  8:41   ` Jan Kiszka
  0 siblings, 0 replies; 17+ messages in thread
From: Jan Kiszka @ 2020-02-14  8:41 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 14.02.20 08:32, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Add recipe for linux 4.4.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   opt-linux-4.4.yml | 17 +++++++++++++++++
>   1 file changed, 17 insertions(+)
>   create mode 100644 opt-linux-4.4.yml
> 
> diff --git a/opt-linux-4.4.yml b/opt-linux-4.4.yml
> new file mode 100644
> index 0000000..bb24a04
> --- /dev/null
> +++ b/opt-linux-4.4.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.4%"
> 

Subject and content no longer matches. This is just allowing to select a 
4.4 release, the recipe is already there (in next).

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 05/11] ci: Add linux-4.4 build and tests
  2020-02-14  7:32 ` [xenomai-images PATCH 05/11] ci: Add linux-4.4 build and tests Q. Gylstorff
@ 2020-02-14  8:44   ` Jan Kiszka
  0 siblings, 0 replies; 17+ messages in thread
From: Jan Kiszka @ 2020-02-14  8:44 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 14.02.20 08:32, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Add a new CI variable DEPLOY_DIR_EXTENSION to differ
> between kernel builds for the same target as the kernel
> version is not visibly before bootup
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   .gitlab-ci.yml                | 31 ++++++++++++++++++++++++++++++-
>   scripts/deploy_for_testing.sh |  4 ++--
>   scripts/run-lava-tests.sh     |  4 ++--
>   3 files changed, 34 insertions(+), 5 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index fdc24e1..b8dbbc5 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -1,7 +1,7 @@
>   #
>   # Xenomai Real-Time System
>   #
> -# Copyright (c) Siemens AG, 2020
> +# Copyright (c) Siemens AG, 2019 - 2020
>   #
>   # Authors:
>   #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> @@ -122,3 +122,32 @@ lava-test:board-x86-64-efi:
>     extends: .test
>     variables:
>       TARGET: x86-64
> +
> +build:qemu-amd64:linux-4.4:
> +  extends: .build
> +  variables:
> +    TARGET: qemu-amd64
> +    LINUX_BUILD_OPTION: ":opt-linux-4.4.yml"

I would prefer having opt-xenomai-3.0.x.yml:opt-linux-latest.yml for the 
4.4 test. Our test matrix explodes if we also check latest Xenomai 
against oldest maintained kernel.

Jan

> +    DEPLOY_DIR_EXTENSION: "4.4"
> +
> +lava-test:qemu-amd64:linux-4.4:
> +  needs: [ "build:qemu-amd64:linux-4.4" ]
> +  extends: .test
> +  variables:
> +    TARGET: qemu-amd64
> +    DEPLOY_DIR_EXTENSION: "4.4"
> +
> +build:board-x86-64-efi:linux-4.4:
> +  extends: .build
> +  variables:
> +    TARGET: x86-64-efi
> +    BUILD_OPTIONS: ":opt-lava-test.yml"
> +    LINUX_BUILD_OPTION: ":opt-linux-4.4.yml"
> +    DEPLOY_DIR_EXTENSION: "4.4"
> +
> +lava-test:board-x86-64-efi:linux-4.4:
> +  needs: [ "build:board-x86-64-efi:linux-4.4" ]
> +  extends: .test
> +  variables:
> +    TARGET: x86-64
> +    DEPLOY_DIR_EXTENSION: "4.4"
> diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh
> index db19e5f..b3d565f 100755
> --- a/scripts/deploy_for_testing.sh
> +++ b/scripts/deploy_for_testing.sh
> @@ -3,7 +3,7 @@
>   #
>   # Xenomai Real-Time System
>   #
> -# Copyright (c) Siemens AG, 2019
> +# Copyright (c) Siemens AG, 2019-2020
>   #
>   # Authors:
>   #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> @@ -27,7 +27,7 @@ lava_ssh_destination="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
>   
>   isar_base_name="${ISAR_IMAGE}-${ISAR_DISTRIBUTION}-${target}"
>   lava_deploy_dir="${LAVA_DEPLOY_DIR:-/var/lib/lava/artifacts}"
> -deploy_dir="${lava_deploy_dir}/${CI_PIPELINE_ID}"
> +deploy_dir="${lava_deploy_dir}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}"
>   lava_identity="-i ${LAVA_SSH_KEY_PATH:-~/.ssh/lava_id_rsa}"
>   if [ -n "${CI_PIPELINE_ID}" ]; then
>       ssh -p ${LAVA_SSH_PORT} ${lava_identity} ${lava_ssh_destination} 'install -d -m 755 "'${deploy_dir}'"'
> diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
> index 59cf14e..e02385a 100755
> --- a/scripts/run-lava-tests.sh
> +++ b/scripts/run-lava-tests.sh
> @@ -2,7 +2,7 @@
>   #
>   # Xenomai Real-Time System
>   #
> -# Copyright (c) Siemens AG, 2019
> +# Copyright (c) Siemens AG, 2019-2020
>   #
>   # Authors:
>   #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> @@ -43,7 +43,7 @@ lava_master_uri=http://localhost:${lava_master_port}
>   lavacli identities add --token ${LAVA_MASTER_TOKEN} --uri ${lava_master_uri} --username ${LAVA_MASTER_ACCOUNT} default
>   #generate lava job description from template
>   artifact_url="${LAVA_ARTIFACTS_URL:-http://localhost/artifacts}"
> -DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}"
> +DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}/${DEPLOY_DIR_EXTENSION}"
>   job_template_path="${JOB_TEMPLATE_PATH:-tests/jobs/xenomai}"
>   tmp_dir=$(mktemp -d)
>   template=${tmp_dir}/job_${TARGET}_${CI_PIPELINE_ID}.yml
> 

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 06/11] ci: add option for 4.19
  2020-02-14  7:32 ` [xenomai-images PATCH 06/11] ci: add option for 4.19 Q. Gylstorff
@ 2020-02-14  8:45   ` Jan Kiszka
  0 siblings, 0 replies; 17+ messages in thread
From: Jan Kiszka @ 2020-02-14  8:45 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 14.02.20 08:32, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   opt-linux-4.19.yml | 17 +++++++++++++++++
>   1 file changed, 17 insertions(+)
>   create mode 100644 opt-linux-4.19.yml
> 
> 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%"
> 

What for, at this point? 3.1 uses 4.19 already, 3.0 does not support it. 
Let's add that when there is actually a use case.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 07/11] ci: Remove proxy settings
  2020-02-14  7:32 ` [xenomai-images PATCH 07/11] ci: Remove proxy settings Q. Gylstorff
@ 2020-02-14  8:47   ` Jan Kiszka
  2020-02-14  9:21     ` Gylstorff Quirin
  0 siblings, 1 reply; 17+ messages in thread
From: Jan Kiszka @ 2020-02-14  8:47 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 14.02.20 08:32, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   .gitlab-ci.yml | 8 ++------
>   1 file changed, 2 insertions(+), 6 deletions(-)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index b8dbbc5..54542b1 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -14,10 +14,6 @@ stages:
>   
>   variables:
>     GIT_STRATEGY: clone
> -  http_proxy: "$HTTP_PROXY"
> -  https_proxy: "$HTTPS_PROXY"
> -  ftp_proxy: "$FTP_PROXY"
> -  no_proxy: "$NO_PROXY"

Even if we no longer need it, let's keep this as pattern

>     XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
>     LINUX_BUILD_OPTION: ":opt-linux-latest.yml"
>     ISAR_IMAGE: demo-image
> @@ -31,13 +27,13 @@ default:
>   .add-lava-ssh-config:
>     before_script:
>       - mkdir -p -m=700 ~/.ssh
> -    - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config

This should likely be fixed to take empty proxies into account. Then it 
can stay.

>       - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/lava_id_rsa && chmod 600 ~/.ssh/lava_id_rsa
>       - echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod 644 ~/.ssh/known_hosts
>   
>   .build:
>     extends: .add-lava-ssh-config
>     stage: build
> +  image: kasproject/kas-isar:latest

Unrelated - and incorrect - change.

>     script:
>       - kas build kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS}
>       - scripts/deploy_for_testing.sh ${TARGET}
> @@ -92,6 +88,7 @@ build:board-hikey:
>     variables:
>       TARGET: hikey
>       BUILD_OPTIONS: ":opt-lava-test.yml"
> +
>   lava-test:board-hikey:
>     needs: [ "build:board-hikey" ]
>     extends: .test
> @@ -104,7 +101,6 @@ build:board-beaglebone:
>       TARGET: beagle-bone-black
>       BUILD_OPTIONS: ":opt-lava-test.yml"
>   
> -
>   lava-test:board-beaglebone:
>     needs: [ "build:board-beaglebone" ]
>     extends: .test
> 

Unrelated changes.

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 08/11] ci: add new build options
  2020-02-14  7:32 ` [xenomai-images PATCH 08/11] ci: add new build options Q. Gylstorff
@ 2020-02-14  8:48   ` Jan Kiszka
  2020-02-14  9:19     ` Gylstorff Quirin
  0 siblings, 1 reply; 17+ messages in thread
From: Jan Kiszka @ 2020-02-14  8:48 UTC (permalink / raw)
  To: Q. Gylstorff, xenomai

On 14.02.20 08:32, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>   .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++
>   1 file changed, 30 insertions(+)
> 
> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
> index 54542b1..608d5db 100644
> --- a/.gitlab-ci.yml
> +++ b/.gitlab-ci.yml
> @@ -147,3 +147,33 @@ lava-test:board-x86-64-efi:linux-4.4:
>     variables:
>       TARGET: x86-64
>       DEPLOY_DIR_EXTENSION: "4.4"
> +
> +build:board-beaglebone: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-beaglebone:xenomai-3.0.x:
> +  needs: [ "build:board-beaglebone:xenomai-3.0.x" ]
> +  extends: .test
> +  variables:
> +    TARGET: beaglebone
> +    DEPLOY_DIR_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
> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
> 

See my comment on the other patch: A set of xenomai-3.0.x/linux-latest 
for x86 and arm would be good enough for now

Jan

-- 
Siemens AG, Corporate Technology, CT RDA IOT SES-DE
Corporate Competence Center Embedded Linux


^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 08/11] ci: add new build options
  2020-02-14  8:48   ` Jan Kiszka
@ 2020-02-14  9:19     ` Gylstorff Quirin
  0 siblings, 0 replies; 17+ messages in thread
From: Gylstorff Quirin @ 2020-02-14  9:19 UTC (permalink / raw)
  To: Jan Kiszka, xenomai



On 2/14/20 9:48 AM, Jan Kiszka wrote:
> On 14.02.20 08:32, Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   .gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++
>>   1 file changed, 30 insertions(+)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index 54542b1..608d5db 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -147,3 +147,33 @@ lava-test:board-x86-64-efi:linux-4.4:
>>     variables:
>>       TARGET: x86-64
>>       DEPLOY_DIR_EXTENSION: "4.4"
>> +
>> +build:board-beaglebone: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-beaglebone:xenomai-3.0.x:
>> +  needs: [ "build:board-beaglebone:xenomai-3.0.x" ]
>> +  extends: .test
>> +  variables:
>> +    TARGET: beaglebone
>> +    DEPLOY_DIR_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
>> +    DEPLOY_DIR_EXTENSION: "xenomai-3.0.x"
>>
> 
> See my comment on the other patch: A set of xenomai-3.0.x/linux-latest 
> for x86 and arm would be good enough for now
> 
> Jan
> 

I will remove 4.4 and let xenomai-3.0.x stay. v2 will be posted as soon
as the tests are run.

Quirin



^ permalink raw reply	[flat|nested] 17+ messages in thread
* Re: [xenomai-images PATCH 07/11] ci: Remove proxy settings
  2020-02-14  8:47   ` Jan Kiszka
@ 2020-02-14  9:21     ` Gylstorff Quirin
  0 siblings, 0 replies; 17+ messages in thread
From: Gylstorff Quirin @ 2020-02-14  9:21 UTC (permalink / raw)
  To: Jan Kiszka, xenomai



On 2/14/20 9:47 AM, Jan Kiszka wrote:
> On 14.02.20 08:32, Q. Gylstorff wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   .gitlab-ci.yml | 8 ++------
>>   1 file changed, 2 insertions(+), 6 deletions(-)
>>
>> diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
>> index b8dbbc5..54542b1 100644
>> --- a/.gitlab-ci.yml
>> +++ b/.gitlab-ci.yml
>> @@ -14,10 +14,6 @@ stages:
>>   variables:
>>     GIT_STRATEGY: clone
>> -  http_proxy: "$HTTP_PROXY"
>> -  https_proxy: "$HTTPS_PROXY"
>> -  ftp_proxy: "$FTP_PROXY"
>> -  no_proxy: "$NO_PROXY"
> 
> Even if we no longer need it, let's keep this as pattern
Sure
> 
>>     XENOMAI_BUILD_OPTION: ":opt-xenomai-next.yml"
>>     LINUX_BUILD_OPTION: ":opt-linux-latest.yml"
>>     ISAR_IMAGE: demo-image
>> @@ -31,13 +27,13 @@ default:
>>   .add-lava-ssh-config:
>>     before_script:
>>       - mkdir -p -m=700 ~/.ssh
>> -    - echo "ProxyCommand socat - PROXY:$(echo $https_proxy | sed 
>> 's|.*://\([^:]*\).*|\1|'):%h:%p,proxyport=$(echo $https_proxy | sed 
>> 's|.*:\([0-9]*\)$|\1|')" >> ~/.ssh/config && chmod 600 ~/.ssh/config
> 
> This should likely be fixed to take empty proxies into account. Then it 
> can stay.

That will be a long line in the ci file, but the alternative to use a 
extra script is IHMO not much better.

Quirin
> 
>>       - echo "$LAVA_SSH_UPLOAD_KEY" | tr -d '\r' > ~/.ssh/lava_id_rsa 
>> && chmod 600 ~/.ssh/lava_id_rsa
>>       - echo "$LAVA_SSH_KNOWN_HOSTS" >> ~/.ssh/known_hosts && chmod 
>> 644 ~/.ssh/known_hosts
>>   .build:
>>     extends: .add-lava-ssh-config
>>     stage: build
>> +  image: kasproject/kas-isar:latest
> 
> Unrelated - and incorrect - change.
> 
>>     script:
>>       - kas build 
>> kas.yml:board-${TARGET}.yml${XENOMAI_BUILD_OPTION}${LINUX_BUILD_OPTION}${BUILD_OPTIONS} 
>>
>>       - scripts/deploy_for_testing.sh ${TARGET}
>> @@ -92,6 +88,7 @@ build:board-hikey:
>>     variables:
>>       TARGET: hikey
>>       BUILD_OPTIONS: ":opt-lava-test.yml"
>> +
>>   lava-test:board-hikey:
>>     needs: [ "build:board-hikey" ]
>>     extends: .test
>> @@ -104,7 +101,6 @@ build:board-beaglebone:
>>       TARGET: beagle-bone-black
>>       BUILD_OPTIONS: ":opt-lava-test.yml"
>> -
>>   lava-test:board-beaglebone:
>>     needs: [ "build:board-beaglebone" ]
>>     extends: .test
>>
> 
> Unrelated changes.
> 
> Jan
> 



^ permalink raw reply	[flat|nested] 17+ messages in thread
end of thread, other threads:[~2020-02-14  9:21 UTC | newest]

Thread overview: 17+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-14  7:32 [xenomai-images PATCH 00/11] Add 4.4 testing and cleanup ci Q. Gylstorff
2020-02-14  7:32 ` [xenomai-images PATCH 01/11] ci: remove code duplications Q. Gylstorff
2020-02-14  7:32 ` [xenomai-images PATCH 02/11] ci: Use gitlab extends instead of YAML Anchors Q. Gylstorff
2020-02-14  7:32 ` [xenomai-images PATCH 03/11] scripts: Allow other layers to reuse scripts Q. Gylstorff
2020-02-14  7:32 ` [xenomai-images PATCH 04/11] recipes-kernel/linux: Add 4.4 Q. Gylstorff
2020-02-14  8:41   ` Jan Kiszka
2020-02-14  7:32 ` [xenomai-images PATCH 05/11] ci: Add linux-4.4 build and tests Q. Gylstorff
2020-02-14  8:44   ` Jan Kiszka
2020-02-14  7:32 ` [xenomai-images PATCH 06/11] ci: add option for 4.19 Q. Gylstorff
2020-02-14  8:45   ` Jan Kiszka
2020-02-14  7:32 ` [xenomai-images PATCH 07/11] ci: Remove proxy settings Q. Gylstorff
2020-02-14  8:47   ` Jan Kiszka
2020-02-14  9:21     ` Gylstorff Quirin
2020-02-14  7:32 ` [xenomai-images PATCH 08/11] ci: add new build options Q. Gylstorff
2020-02-14  8:48   ` Jan Kiszka
2020-02-14  9:19     ` Gylstorff Quirin
2020-02-14  7:32 ` [xenomai-images PATCH 09/11] recipes-xenomai/xenomai.inc: Add missing libxenomai-dev Q. Gylstorff

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.