* [xenomai-images][PATCH 0/4] ci improvements
@ 2019-10-01 9:24 Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 1/4] ci: Use unique test ids Q. Gylstorff
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Q. Gylstorff @ 2019-10-01 9:24 UTC (permalink / raw)
To: xenomai
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Improve the ci by:
- Adding option --vm to successfully execute qemu tests.
- Fixing beaglebone tests after lava update.
- Compress rootfs to speed up the deployment
- use pipeline id to differ between test runs.
Quirin Gylstorff (4):
ci: Use unique test ids
ci: Use compression for rootfs
ci: Run qemu tests with --vm option
xenomai-beaglebone: remove context after update
scripts/deploy_for_testing.sh | 7 ++++++-
scripts/run-lava-tests.sh | 13 ++++++++++++-
tests/jobs/xenomai-beaglebone.yml | 9 +++------
tests/jobs/xenomai-minnow.yml | 6 +++---
tests/jobs/xenomai-qemu-amd64.yml | 12 +++++++-----
tests/jobs/xenomai-qemu-arm64.yml | 12 +++++++-----
tests/jobs/xenomai-qemu-armhf.yml | 12 +++++++-----
tests/jobs/xenomai-x86-64.yml | 6 +++---
8 files changed, 48 insertions(+), 29 deletions(-)
--
2.20.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [xenomai-images][PATCH 1/4] ci: Use unique test ids
2019-10-01 9:24 [xenomai-images][PATCH 0/4] ci improvements Q. Gylstorff
@ 2019-10-01 9:24 ` Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 2/4] ci: Use compression for rootfs Q. Gylstorff
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Q. Gylstorff @ 2019-10-01 9:24 UTC (permalink / raw)
To: xenomai
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
All test images are stored in one folder. If multiple agents
are used to build against the same machine it is no longer possible
to differentiate what was tested. Use the unique CI_PIPELINE_ID to
differ these builds in one gitlab instance.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
scripts/deploy_for_testing.sh | 4 +++-
scripts/run-lava-tests.sh | 13 ++++++++++++-
tests/jobs/xenomai-beaglebone.yml | 6 +++---
tests/jobs/xenomai-minnow.yml | 6 +++---
tests/jobs/xenomai-qemu-amd64.yml | 9 +++++----
tests/jobs/xenomai-qemu-arm64.yml | 9 +++++----
tests/jobs/xenomai-qemu-armhf.yml | 9 +++++----
tests/jobs/xenomai-x86-64.yml | 6 +++---
8 files changed, 39 insertions(+), 23 deletions(-)
diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh
index 4015b87..3bfe6bb 100755
--- a/scripts/deploy_for_testing.sh
+++ b/scripts/deploy_for_testing.sh
@@ -25,7 +25,9 @@ fi
LAVA_SSH_DESTINATION="${LAVA_SSH_USER}@${LAVA_SSH_HOST}"
-DEPLOY_DIR="/var/lib/lava/artifacts"
+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}'"'
#KERNEL
scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-vmlinuz \
${LAVA_SSH_DESTINATION}:${DEPLOY_DIR}
diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index 9195275..e52ae9c 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -33,9 +33,20 @@ do
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'}"
+
# connect to lava master
lavacli identities add --token ${LAVA_MASTER_TOKEN} --uri ${LAVA_MASTER_URI} --username ${LAVA_MASTER_ACCOUNT} default
-test_id=$(lavacli jobs submit tests/jobs/xenomai-${TARGET}.yml)
+
+#generate lava job description from template
+DEPLOY_URL="${artifact_url}/${CI_PIPELINE_ID}"
+template=$(cat tests/jobs/xenomai-${TARGET}.yml)
+test_id=$(eval "cat <<EOF ${template}
+EOF" | lavacli jobs submit -)
lavacli jobs logs ${test_id}
lavacli results ${test_id}
# change return code to generate a error in gitlab-ci if a test is failed
diff --git a/tests/jobs/xenomai-beaglebone.yml b/tests/jobs/xenomai-beaglebone.yml
index 85f2b88..138c8cb 100644
--- a/tests/jobs/xenomai-beaglebone.yml
+++ b/tests/jobs/xenomai-beaglebone.yml
@@ -35,12 +35,12 @@ actions:
minutes: 5
to: tftp
kernel:
- url: http://localhost/artifacts/demo-image-xenomai-demo-beagle-bone-black-vmlinuz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-beagle-bone-black-vmlinuz
type: zimage
dtb:
- url: http://localhost/artifacts/am335x-boneblack.dtb
+ url: ${DEPLOY_URL}/am335x-boneblack.dtb
nfsrootfs:
- url: http://localhost/artifacts/demo-image-xenomai-demo-beagle-bone-black.tar.gz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-beagle-bone-black.tar.gz
compression: gz
# BOOT_BLOCK
- boot:
diff --git a/tests/jobs/xenomai-minnow.yml b/tests/jobs/xenomai-minnow.yml
index d3b4a4d..27a0f81 100644
--- a/tests/jobs/xenomai-minnow.yml
+++ b/tests/jobs/xenomai-minnow.yml
@@ -31,13 +31,13 @@ actions:
minutes: 5
to: tftp
kernel:
- url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-vmlinuz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-x86-64-efi-vmlinuz
type: bzimage
ramdisk:
- url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-initrd.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-x86-64-efi-initrd.img
compression: gz
nfsrootfs:
- url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi.tar.gz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-x86-64-efi.tar.gz
compression: gz
# BOOT_BLOCK
- boot:
diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml
index 2976f89..8f1e071 100644
--- a/tests/jobs/xenomai-qemu-amd64.yml
+++ b/tests/jobs/xenomai-qemu-amd64.yml
@@ -47,14 +47,13 @@ actions:
images:
kernel:
image_arg: -kernel {kernel} -append "root=/dev/sdb console=ttyS0,115200 console=tty0"
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64-vmlinuz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-amd64-vmlinuz
initrd:
image_arg: -initrd {initrd}
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64-initrd.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-amd64-initrd.img
rootfs:
image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-amd64.ext4.img
-
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-amd64.ext4.img
# BOOT_BLOCK
- boot:
timeout:
@@ -69,6 +68,8 @@ actions:
password: root
- test:
+ timeout:
+ minutes: 30
definitions:
- repository: http://git.linaro.org/lava-team/lava-functional-tests.git
from: git
diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
index a5a9371..5099d95 100644
--- a/tests/jobs/xenomai-qemu-arm64.yml
+++ b/tests/jobs/xenomai-qemu-arm64.yml
@@ -54,14 +54,13 @@ actions:
images:
kernel:
image_arg: -kernel {kernel} -append "root=/dev/vda"
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64-vmlinuz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-arm64-vmlinuz
initrd:
image_arg: -initrd {initrd}
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64-initrd.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-arm64-initrd.img
rootfs:
image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-arm64.ext4.img
-
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-arm64.ext4.img
# BOOT_BLOCK
- boot:
timeout:
@@ -76,6 +75,8 @@ actions:
password: root
- test:
+ timeout:
+ minutes: 30
definitions:
- repository: http://git.linaro.org/lava-team/lava-functional-tests.git
from: git
diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml
index 238265b..5f36ca6 100644
--- a/tests/jobs/xenomai-qemu-armhf.yml
+++ b/tests/jobs/xenomai-qemu-armhf.yml
@@ -47,14 +47,13 @@ actions:
images:
kernel:
image_arg: -kernel {kernel} -append "root=/dev/vdb"
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf-vmlinuz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-armhf-vmlinuz
initrd:
image_arg: -initrd {initrd}
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf-initrd.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-armhf-initrd.img
rootfs:
image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw
- url: http://localhost/artifacts/demo-image-xenomai-demo-qemu-armhf.ext4.img
-
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-armhf.ext4.img
# BOOT_BLOCK
- boot:
timeout:
@@ -69,6 +68,8 @@ actions:
password: root
- test:
+ timeout:
+ minutes: 30
definitions:
- repository: http://git.linaro.org/lava-team/lava-functional-tests.git
from: git
diff --git a/tests/jobs/xenomai-x86-64.yml b/tests/jobs/xenomai-x86-64.yml
index 9d58c45..c7424c0 100644
--- a/tests/jobs/xenomai-x86-64.yml
+++ b/tests/jobs/xenomai-x86-64.yml
@@ -32,13 +32,13 @@ actions:
minutes: 5
to: tftp
kernel:
- url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-vmlinuz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-x86-64-efi-vmlinuz
type: bzimage
ramdisk:
- url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi-initrd.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-x86-64-efi-initrd.img
compression: gz
nfsrootfs:
- url: http://localhost/artifacts/demo-image-xenomai-demo-x86-64-efi.tar.gz
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-x86-64-efi.tar.gz
compression: gz
# BOOT_BLOCK
- boot:
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [xenomai-images][PATCH 2/4] ci: Use compression for rootfs
2019-10-01 9:24 [xenomai-images][PATCH 0/4] ci improvements Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 1/4] ci: Use unique test ids Q. Gylstorff
@ 2019-10-01 9:24 ` Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 3/4] ci: Run qemu tests with --vm option Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 4/4] xenomai-beaglebone: remove context after update Q. Gylstorff
3 siblings, 0 replies; 5+ messages in thread
From: Q. Gylstorff @ 2019-10-01 9:24 UTC (permalink / raw)
To: xenomai
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
The ext4 images are patted with zeros and are transmitted as full size images.
To increase the uploaded speed compress the rootfs.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
scripts/deploy_for_testing.sh | 3 +++
tests/jobs/xenomai-qemu-amd64.yml | 3 ++-
tests/jobs/xenomai-qemu-arm64.yml | 3 ++-
tests/jobs/xenomai-qemu-armhf.yml | 3 ++-
4 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/scripts/deploy_for_testing.sh b/scripts/deploy_for_testing.sh
index 3bfe6bb..f8f71e3 100755
--- a/scripts/deploy_for_testing.sh
+++ b/scripts/deploy_for_testing.sh
@@ -35,6 +35,9 @@ scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET
scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}-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}.*
+fi
scp -P ${LAVA_SSH_PORT} ${IMAGES_DIR}/${TARGET}/demo-image-xenomai-demo-${TARGET}.* \
${LAVA_SSH_DESTINATION}:${DEPLOY_DIR}
# DTB
diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml
index 8f1e071..26f42fa 100644
--- a/tests/jobs/xenomai-qemu-amd64.yml
+++ b/tests/jobs/xenomai-qemu-amd64.yml
@@ -53,7 +53,8 @@ actions:
url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-amd64-initrd.img
rootfs:
image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw
- url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-amd64.ext4.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-amd64.ext4.img.gz
+ compression: gz
# BOOT_BLOCK
- boot:
timeout:
diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
index 5099d95..a14c0b2 100644
--- a/tests/jobs/xenomai-qemu-arm64.yml
+++ b/tests/jobs/xenomai-qemu-arm64.yml
@@ -60,7 +60,8 @@ actions:
url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-arm64-initrd.img
rootfs:
image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw
- url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-arm64.ext4.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-arm64.ext4.img.gz
+ compression: gz
# BOOT_BLOCK
- boot:
timeout:
diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml
index 5f36ca6..f080d1a 100644
--- a/tests/jobs/xenomai-qemu-armhf.yml
+++ b/tests/jobs/xenomai-qemu-armhf.yml
@@ -53,7 +53,8 @@ actions:
url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-armhf-initrd.img
rootfs:
image_arg: -drive file={rootfs},discard=unmap,if=none,id=disk,format=raw
- url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-armhf.ext4.img
+ url: ${DEPLOY_URL}/demo-image-xenomai-demo-qemu-armhf.ext4.img.gz
+ compression: gz
# BOOT_BLOCK
- boot:
timeout:
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [xenomai-images][PATCH 3/4] ci: Run qemu tests with --vm option
2019-10-01 9:24 [xenomai-images][PATCH 0/4] ci improvements Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 1/4] ci: Use unique test ids Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 2/4] ci: Use compression for rootfs Q. Gylstorff
@ 2019-10-01 9:24 ` Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 4/4] xenomai-beaglebone: remove context after update Q. Gylstorff
3 siblings, 0 replies; 5+ messages in thread
From: Q. Gylstorff @ 2019-10-01 9:24 UTC (permalink / raw)
To: xenomai
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
To avoid failing test due to virtualization add the newly introduced
option --vm to the xeno-test execution.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
tests/jobs/xenomai-qemu-amd64.yml | 2 +-
tests/jobs/xenomai-qemu-arm64.yml | 2 +-
tests/jobs/xenomai-qemu-armhf.yml | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tests/jobs/xenomai-qemu-amd64.yml b/tests/jobs/xenomai-qemu-amd64.yml
index 26f42fa..9520e16 100644
--- a/tests/jobs/xenomai-qemu-amd64.yml
+++ b/tests/jobs/xenomai-qemu-amd64.yml
@@ -83,7 +83,7 @@ actions:
description: "runs the xenomai test suite"
run:
steps:
- - lava-test-case xenomai-test --shell xeno-test -k
+ - lava-test-case xenomai-test --shell xeno-test -k --vm
from: inline
path: inline/xenomai-test-suite.yaml
name: xenomai-test-suite
diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
index a14c0b2..44c8731 100644
--- a/tests/jobs/xenomai-qemu-arm64.yml
+++ b/tests/jobs/xenomai-qemu-arm64.yml
@@ -92,7 +92,7 @@ actions:
- quirin.gylstorff@siemens.org
run:
steps:
- - lava-test-case xenomai-smokey --shell xeno-test -k
+ - lava-test-case xenomai-smokey --shell xeno-test -k --vm
from: inline
path: inline/xenomai-test-suite.yaml
name: xenomai-test-suite
diff --git a/tests/jobs/xenomai-qemu-armhf.yml b/tests/jobs/xenomai-qemu-armhf.yml
index f080d1a..1c5cb2e 100644
--- a/tests/jobs/xenomai-qemu-armhf.yml
+++ b/tests/jobs/xenomai-qemu-armhf.yml
@@ -83,7 +83,7 @@ actions:
description: "runs the xenomai test suite"
run:
steps:
- - lava-test-case xenomai-test --shell xeno-test -k
+ - lava-test-case xenomai-test --shell xeno-test -k --vm
from: inline
path: inline/xenomai-test-suite.yaml
name: xenomai-test-suite
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [xenomai-images][PATCH 4/4] xenomai-beaglebone: remove context after update
2019-10-01 9:24 [xenomai-images][PATCH 0/4] ci improvements Q. Gylstorff
` (2 preceding siblings ...)
2019-10-01 9:24 ` [xenomai-images][PATCH 3/4] ci: Run qemu tests with --vm option Q. Gylstorff
@ 2019-10-01 9:24 ` Q. Gylstorff
3 siblings, 0 replies; 5+ messages in thread
From: Q. Gylstorff @ 2019-10-01 9:24 UTC (permalink / raw)
To: xenomai
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
After updating the lava environment to 2019.9 the option baud_rate
in the job context can no longer be overwritten. Remove the context
to ensure the job execution.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
tests/jobs/xenomai-beaglebone.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tests/jobs/xenomai-beaglebone.yml b/tests/jobs/xenomai-beaglebone.yml
index 138c8cb..ceb4d0d 100644
--- a/tests/jobs/xenomai-beaglebone.yml
+++ b/tests/jobs/xenomai-beaglebone.yml
@@ -25,9 +25,6 @@ metadata:
# please change these fields when modifying this job for your own tests.
docs-source: xenomai-beagleboneblack
docs-filename: pipeline-xenomai-beagleboneblack
-context:
- console_device: ttyO
- baud_rate: 115200
# ACTION_BLOCK
actions:
- deploy:
--
2.20.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-10-01 9:24 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-10-01 9:24 [xenomai-images][PATCH 0/4] ci improvements Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 1/4] ci: Use unique test ids Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 2/4] ci: Use compression for rootfs Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 3/4] ci: Run qemu tests with --vm option Q. Gylstorff
2019-10-01 9:24 ` [xenomai-images][PATCH 4/4] xenomai-beaglebone: remove context after update 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.