From 9f65834ede3dc27716ff0de154a23551d155dc18 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 2 May 2019 12:01:38 +0200 Subject: utils/agljobtemplate.py: Fix APPURL generation The generated APPURL was invalid: - it needed to be always using ci - it missed branch and arches path This patch move the generation of the application url in the jinja file for accessing the new sdk_arch Bug-AGL: SPEC-1850 Change-Id: Ie3ffff5f6181fdc89c3ebbd41078e4d60a06992b Signed-off-by: Corentin LABBE --- templates/machines/dra7xx-evm.jinja2 | 1 + templates/machines/intel-corei7-64.jinja2 | 1 + templates/machines/m3ulcb.jinja2 | 1 + templates/machines/qemux86-64.jinja2 | 1 + templates/machines/raspberrypi3.jinja2 | 1 + templates/machines/upsquare.jinja2 | 1 + templates/tests/application-lifecycle.jinja2 | 4 ++++ utils/agljobtemplate.py | 17 +++++++++-------- 8 files changed, 19 insertions(+), 8 deletions(-) diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2 index f430059..7241ab2 100644 --- a/templates/machines/dra7xx-evm.jinja2 +++ b/templates/machines/dra7xx-evm.jinja2 @@ -1,6 +1,7 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_type = "dra7-evm" %} {%- set device_arch = "arm" %} +{%- set sdk_arch = "arm" %} {%- set device_mach = "omap2" %} {%- set dtb = dtb|default("dra7-evm.dtb") %} {%- set kernel_image = kernel_image|default("zImage") %} diff --git a/templates/machines/intel-corei7-64.jinja2 b/templates/machines/intel-corei7-64.jinja2 index 2cbc072..335c0a0 100644 --- a/templates/machines/intel-corei7-64.jinja2 +++ b/templates/machines/intel-corei7-64.jinja2 @@ -1,5 +1,6 @@ {%- extends 'boot/generic-ipxe-tftp.jinja2' %} {%- set device_arch = "x86" %} +{%- set sdk_arch = "x86-64" %} {%- set device_mach = "intel" %} {%- set device_type = "x86" %} {%- set kernel_image = kernel_image|default("bzImage") %} diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2 index 72212d8..9bbaecd 100644 --- a/templates/machines/m3ulcb.jinja2 +++ b/templates/machines/m3ulcb.jinja2 @@ -1,5 +1,6 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_arch = "arm64" %} +{%- set sdk_arch = "aarch64" %} {%- set device_mach = "renesas" %} {%- set device_type = "r8a7796-m3ulcb" %} {%- set dtb = dtb|default("r8a7796-m3ulcb.dtb") %} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 1aa9b22..56b718b 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -3,6 +3,7 @@ {%- set device_type = "qemu" %} {%- set kernel_image = "bzImage" %} {%- set device_arch = "x86_64" %} +{%- set sdk_arch = "x86-64" %} {%- set device_mach = "x86" %} {%- set qemu_arch = "x86_64" %} {%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci" %} diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2 index 08affa7..3e2e683 100644 --- a/templates/machines/raspberrypi3.jinja2 +++ b/templates/machines/raspberrypi3.jinja2 @@ -1,5 +1,6 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_arch = "arm" %} +{%- set sdk_arch = "arm" %} {%- set device_mach = "broadcom" %} {%- set device_type = "bcm2837-rpi-3-b-32" %} {# Default boot method if not specified #} diff --git a/templates/machines/upsquare.jinja2 b/templates/machines/upsquare.jinja2 index 46ced27..5086ada 100644 --- a/templates/machines/upsquare.jinja2 +++ b/templates/machines/upsquare.jinja2 @@ -1,5 +1,6 @@ {%- extends 'boot/generic-grub-tftp.jinja2' %} {%- set device_arch = "x86" %} +{%- set sdk_arch = "x86-64" %} {%- set device_mach = "intel" %} {%- set device_type = "upsquare" %} {%- set yocto_machine = "intel-corei7-64" %} diff --git a/templates/tests/application-lifecycle.jinja2 b/templates/tests/application-lifecycle.jinja2 index 24cd26b..dc4f1b8 100644 --- a/templates/tests/application-lifecycle.jinja2 +++ b/templates/tests/application-lifecycle.jinja2 @@ -8,4 +8,8 @@ path: test-suites/short-smoke/application-lifecycle.yaml name: application-lifecycle parameters: +{%- if APPURL != 'automatic' %} APPURL: "{{ APPURL }}" +{%- else %} + APPURL: "{{app_url_base}}/{{ app_changeid }}/{{ app_patchset }}/{{ vcs_branch }}/{{ sdk_arch }}" +{%- endif %} diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index e18e10f..90ff82c 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -136,20 +136,21 @@ class Agljobtemplate(object): if applications_url is None: app_url_base = '' - for section in defaults: + # WGT will be always uploaded in ci + appdefaults, appinfra = parse_cfg_file(self._template_path, 'default.cfg', 'ci') + for section in appdefaults: if section[0] == "urlbase": app_url_base = section[1] - app_url_fragment = '' - - if app_changeid is not None: - app_url_fragment += app_changeid + '/' + app_patchset - applications_url = urlparse.urljoin(app_url_base, app_url_fragment) + job['app_changeid'] = app_changeid + job['app_patchset'] = app_patchset + job['app_url_base'] = app_url_base + job['APPURL'] = 'automatic' + else: + job['APPURL'] = applications_url device_tags = ' '.join(device_tags) job['DEVICE_TAGS'] = device_tags - if applications_url is not None: - job['APPURL'] = applications_url test_templates = [] # If the user doesn't specify tests, use the default ones from the build-type -- cgit 1.2.3-korg