[xenomai-images][PATCH 0/3] ci build

[xenomai-images][PATCH 0/3] ci build

[Q. Gylstorff]

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

- Speed up and timeouts of arm64 qemu build
- fix url replacement
- allow empty build options

Quirin Gylstorff (3):
  ci: Speedup arm64 build
  ci: Allow empty Build options
  ci: fix url replacement in jobs.

 .gitlab-ci.yml                    | 14 +++++++-------
 scripts/run-lava-tests.sh         |  2 +-
 tests/jobs/xenomai-qemu-arm64.yml | 25 +++++++++++--------------
 3 files changed, 19 insertions(+), 22 deletions(-)

-- 
2.20.1

[xenomai-images][PATCH 1/3] ci: Speedup arm64 build

[Q. Gylstorff]

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

The arm64 qemu emulation slows during bootup increase the test execution time and
tune qemu settings.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 tests/jobs/xenomai-qemu-arm64.yml | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
index 44c8731..bcc3d81 100644
--- a/tests/jobs/xenomai-qemu-arm64.yml
+++ b/tests/jobs/xenomai-qemu-arm64.yml
@@ -27,18 +27,15 @@ context:
   # the template uses that to ensure that qemu-system-x86_64 is executed.
   arch: arm64
   extra_options:
-  - -global
-  - virtio-blk-device.scsi=off
-  - -smp
-  - 4
-  - -device
-  - virtio-serial-device
-  - -device
-  - virtconsole,chardev=con
-  - -chardev
-  - vc,id=con
-  - -device
-  - virtio-blk-device,drive=disk
+  - -cpu cortex-a57
+  - -global virtio-blk-device.scsi=off
+  - -smp 2
+  - -device virtio-serial-device
+  - -device virtconsole,chardev=con
+  - -chardev vc,id=con
+  - -device virtio-blk-device,drive=disk
+  - -device virtio-net-pci,netdev=net
+  - -netdev user,id=net
   guestfs_interface: virtio
 metadata:
   # please change these fields when modifying this job for your own tests.
@@ -65,7 +62,7 @@ actions:
 # BOOT_BLOCK
 - boot:
     timeout:
-      minutes: 2
+      minutes: 15
     method: qemu
     media: tmpfs
     prompts: ["root@demo:"]
@@ -77,7 +74,7 @@ actions:
 
 - test:
     timeout:
-      minutes: 30
+      minutes: 45
     definitions:
     - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
       from: git
-- 
2.20.1

[xenomai-images][PATCH 2/3] ci: Allow empty Build options

[Q. Gylstorff]

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

Move seperator into variable to allow empty build options.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7de99ee..0974548 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,7 +18,7 @@ variables:
   https_proxy: "$HTTPS_PROXY"
   ftp_proxy: "$FTP_PROXY"
   no_proxy: "$NO_PROXY"
-  BUILD_OPTIONS: "opt-xenomai-next.yml"
+  BUILD_OPTIONS: ":opt-xenomai-next.yml"
 default:
   image: kasproject/kas-isar:latest
 
@@ -34,7 +34,7 @@ build:qemu-amd64:
   <<: *lava-ssh-key
   stage: build
   script:
-    - kas build kas.yml:board-qemu-amd64.yml:${BUILD_OPTIONS}
+    - kas build kas.yml:board-qemu-amd64.yml${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh qemu-amd64
 
 lava-test:qemu-amd64:
@@ -52,7 +52,7 @@ build:qemu-armhf:
   <<: *lava-ssh-key
   stage: build
   script:
-    - kas build kas.yml:board-qemu-armhf.yml:${BUILD_OPTIONS}
+    - kas build kas.yml:board-qemu-armhf.yml${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh qemu-armhf
 
 lava-test:qemu-armhf:
@@ -70,7 +70,7 @@ build:qemu-arm64:
   <<: *lava-ssh-key
   stage: build
   script:
-    - kas build kas.yml:board-qemu-arm64.yml:${BUILD_OPTIONS}
+    - kas build kas.yml:board-qemu-arm64.yml${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh qemu-arm64
 
 lava-test:qemu-arm64:
@@ -88,7 +88,7 @@ build:board-hikey:
   <<: *lava-ssh-key
   stage: build
   script:
-    - kas build kas.yml:board-hikey.yml:opt-lava-test.yml:${BUILD_OPTIONS}
+    - kas build kas.yml:board-hikey.yml:opt-lava-test.yml${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh hikey
 # hikey is currently not part of the testlab
 
@@ -96,7 +96,7 @@ build:board-beaglebone:
   <<: *lava-ssh-key
   stage: build
   script:
-    - kas build kas.yml:board-beagle-bone-black.yml:opt-lava-test.yml:${BUILD_OPTIONS}
+    - kas build kas.yml:board-beagle-bone-black.yml:opt-lava-test.yml${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh beagle-bone-black
 
 lava-test:board-beaglebone:
@@ -114,7 +114,7 @@ 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}
+    - kas build kas.yml:board-x86-64-efi.yml:opt-lava-test.yml${BUILD_OPTIONS}
     - scripts/deploy_for_testing.sh x86-64-efi
 
 lava-test:board-x86-64-efi:
-- 
2.20.1

[xenomai-images][PATCH 3/3] ci: fix url replacement in jobs.

[Q. Gylstorff]

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

Shell substitution will use the complete default string. Remove
the quotation marks to fix call of lavacli.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 scripts/run-lava-tests.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/run-lava-tests.sh b/scripts/run-lava-tests.sh
index 870f1f9..f714b78 100755
--- a/scripts/run-lava-tests.sh
+++ b/scripts/run-lava-tests.sh
@@ -37,7 +37,7 @@ if [ -z "${TARGET}" ]; then
     echo "no target was given"
     exit -1
 fi
-artifact_url="${LAVA_ARTIFACTS_URL:-'http://localhost/artifacts'}"
+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
-- 
2.20.1

Re: [xenomai-images][PATCH 1/3] ci: Speedup arm64 build

[Jan Kiszka]

On 08.10.19 15:14, Q. Gylstorff wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> The arm64 qemu emulation slows during bootup increase the test execution time and
> tune qemu settings.
> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  tests/jobs/xenomai-qemu-arm64.yml | 25 +++++++++++--------------
>  1 file changed, 11 insertions(+), 14 deletions(-)
> 
> diff --git a/tests/jobs/xenomai-qemu-arm64.yml b/tests/jobs/xenomai-qemu-arm64.yml
> index 44c8731..bcc3d81 100644
> --- a/tests/jobs/xenomai-qemu-arm64.yml
> +++ b/tests/jobs/xenomai-qemu-arm64.yml
> @@ -27,18 +27,15 @@ context:
>    # the template uses that to ensure that qemu-system-x86_64 is executed.
>    arch: arm64
>    extra_options:
> -  - -global
> -  - virtio-blk-device.scsi=off
> -  - -smp
> -  - 4
> -  - -device
> -  - virtio-serial-device
> -  - -device
> -  - virtconsole,chardev=con
> -  - -chardev
> -  - vc,id=con
> -  - -device
> -  - virtio-blk-device,drive=disk
> +  - -cpu cortex-a57
> +  - -global virtio-blk-device.scsi=off
> +  - -smp 2
> +  - -device virtio-serial-device
> +  - -device virtconsole,chardev=con
> +  - -chardev vc,id=con
> +  - -device virtio-blk-device,drive=disk
> +  - -device virtio-net-pci,netdev=net
> +  - -netdev user,id=net
>    guestfs_interface: virtio
>  metadata:
>    # please change these fields when modifying this job for your own tests.
> @@ -65,7 +62,7 @@ actions:
>  # BOOT_BLOCK
>  - boot:
>      timeout:
> -      minutes: 2
> +      minutes: 15
>      method: qemu
>      media: tmpfs
>      prompts: ["root@demo:"]
> @@ -77,7 +74,7 @@ actions:
>  
>  - test:
>      timeout:
> -      minutes: 30
> +      minutes: 45
>      definitions:
>      - repository: http://git.linaro.org/lava-team/lava-functional-tests.git
>        from: git
> 

I'm doing "s/build/test/" with the subject on merge.

Jan

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