Add prerelease type to generatorjellyfish_9.99.1jellyfish/9.99.19.99.1

Allow the tool to generate jobs against the prerelease location.

Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I7f00ee52ad85b2aecc52679da4e98857a5dd59cb

13 files changed, 30 insertions, 20 deletions

diff --git a/templates/config/default.cfg b/templates/config/default.cfg
index 4177687..af2340b 100644
--- a/templates/config/default.cfg
+++ b/templates/config/default.cfg
@@ -6,6 +6,10 @@ style = AGL
 urlbase = http://download.automotivelinux.org/AGL/release/
 test_plan = ["release"]
 
+[prerelease]
+urlbase = http://download.automotivelinux.org/AGL/upload/ci/
+test_plan = ["release"]
+
 [weekly]
 [daily]
 [snapshot]
@@ -15,3 +19,4 @@ test_plan = ["release"]
 [ci]
 urlbase = http://download.automotivelinux.org/AGL/upload/ci/
 test_plan = ["ci"]
+
diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2
index 7241ab2..23ca0cd 100644
--- a/templates/machines/dra7xx-evm.jinja2
+++ b/templates/machines/dra7xx-evm.jinja2
@@ -6,7 +6,7 @@
 {%- set dtb = dtb|default("dra7-evm.dtb") %}
 {%- set kernel_image = kernel_image|default("zImage") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
-{%- if (build_type == 'daily') or (build_type == 'release') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-dra7xx-evm.ext4.xz") %}
 {%- else %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-dra7xx-evm.ext4.xz") %}
diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2
index 0c83380..16476ba 100644
--- a/templates/machines/qemuarm.jinja2
+++ b/templates/machines/qemuarm.jinja2
@@ -13,7 +13,7 @@
 {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %}
 {%- set guestfs_interface = "virtio" %}
 {%- set rootfs_type = rootfs_type|default("rootvd") %}
-{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemuarm.ext4.xz") %}
 {%- else %}
 	{%- set rfs_image = rfs_image|default("agl-demo-platform-qemuarm.ext4.xz") %}
diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2
index c29a667..eaa6ed2 100644
--- a/templates/machines/qemuarm64.jinja2
+++ b/templates/machines/qemuarm64.jinja2
@@ -13,7 +13,7 @@
 {%- set qemu_cmdline = "console=ttyAMA0,115200 root=/dev/vda verbose systemd.log_color=false " %}
 {%- set guestfs_interface = "virtio" %}
 {%- set rootfs_type = rootfs_type|default("rootvd") %}
-{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemuarm64.ext4.xz") %}
 {%- else %}
 	{%- set rfs_image = rfs_image|default("agl-demo-platform-qemuarm64.ext4.xz") %}
diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2
index a1e3f5c..6c9363e 100644
--- a/templates/machines/qemux86-64.jinja2
+++ b/templates/machines/qemux86-64.jinja2
@@ -9,7 +9,7 @@
 {%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci" %}
 {%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda verbose systemd.log_color=false rw fstab=no no_timer_check" %}
 {%- set rootfs_type = rootfs_type|default("rootvd") %}
-{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %}
 {%- else %}
 	{%- set rfs_image = rfs_image|default("agl-demo-platform-qemux86-64.ext4.xz") %}
diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2
index cef01c8..cda3c84 100644
--- a/templates/machines/raspberrypi3.jinja2
+++ b/templates/machines/raspberrypi3.jinja2
@@ -10,7 +10,7 @@
     {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %}
 {%- endif %}
 {%- set dtb = dtb|default("bcm2710-rpi-3-b+vc4+ft5406.dtb") %}
-{%- if (build_type == 'daily') or (build_type == 'release') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-raspberrypi3.ext4.xz") %}
 {%- else %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi3.ext4.xz") %}
diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2
index efa3e11..a73f257 100644
--- a/templates/machines/raspberrypi4.jinja2
+++ b/templates/machines/raspberrypi4.jinja2
@@ -10,7 +10,7 @@
     {%- set initrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz" %}
 {%- endif %}
 {%- set dtb = dtb|default("bcm2711-rpi-4-b.dtb") %}
-{%- if (build_type == 'daily') or (build_type == 'release') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-" + yocto_machine + ".ext4.xz") %}
 {%- else %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-" + yocto_machine + ".ext4.xz") %}
diff --git a/templates/machines/upsquare.jinja2 b/templates/machines/upsquare.jinja2
index 80aac30..7ad8237 100644
--- a/templates/machines/upsquare.jinja2
+++ b/templates/machines/upsquare.jinja2
@@ -6,7 +6,7 @@
 {%- set yocto_machine = "qemux86-64" %}
 {%- set kernel_image = kernel_image|default("bzImage") %}
 {%- set rootfs_type = rootfs_type|default("nbd") %}
-{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') %}
+{%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %}
 {%- else %}
     {%- set rfs_image = rfs_image|default("agl-demo-platform-qemux86-64.ext4.xz") %}
diff --git a/templates/tests/ci.jinja2 b/templates/tests/ci.jinja2
index 996fdcb..ad75f2f 100644
--- a/templates/tests/ci.jinja2
+++ b/templates/tests/ci.jinja2
@@ -7,17 +7,17 @@
       from: git
       history: False
       path: test-suites/short-smoke/busybox.yaml
-      name: busybox
+      name: ci-busybox
     - repository: https://git.automotivelinux.org/src/qa-testdefinitions
       from: git
       history: False
       path: test-suites/short-smoke/smoke-tests-basic.yaml
-      name: smoke-tests-basic
+      name: ci-smoke-tests-basic
     - repository: https://git.automotivelinux.org/src/qa-testdefinitions
       from: git
       history: False
       path: test-suites/short-smoke/service-check.yaml
-      name: service-check
+      name: ci-service-check
       parameters:
         BUILD_TAGS: "{{ BUILD_TAGS|join(' ')|lower }}"
         DEVICE_TAGS: "{{ DEVICE_TAGS|join(' ')|lower }}"
@@ -38,6 +38,6 @@
       from: git
       history: False
       path: automated/linux/ptest/ptest.yaml
-      name: linaro-ptest
+      name: ci-linaro-ptest
       parameters:
         TESTS: "xmlsec1 libxml2 lua"
diff --git a/templates/tests/release.jinja2 b/templates/tests/release.jinja2
index fdfe6bf..0848107 100644
--- a/templates/tests/release.jinja2
+++ b/templates/tests/release.jinja2
@@ -7,17 +7,17 @@
       from: git
       history: False
       path: test-suites/short-smoke/busybox.yaml
-      name: busybox
+      name: release-busybox
     - repository: https://git.automotivelinux.org/src/qa-testdefinitions
       from: git
       history: False
       path: test-suites/short-smoke/smoke-tests-basic.yaml
-      name: smoke-tests-basic
+      name: release-smoke-tests-basic
     - repository: https://git.automotivelinux.org/src/qa-testdefinitions
       from: git
       history: False
       path: test-suites/short-smoke/service-check.yaml
-      name: service-check
+      name: release-service-check
       parameters:
         BUILD_TAGS: "{{ BUILD_TAGS }}"
         DEVICE_TAGS: "{{ DEVICE_TAGS }}"
@@ -30,6 +30,6 @@
       from: git
       history: False
       path: automated/linux/ptest/ptest.yaml
-      name: linaro-ptest
+      name: release-linaro-ptest
       parameters:
         TESTS: "xmlsec1 libxml2 lua"
diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py
index 61fc82b..c9d07f5 100644
--- a/utils/agljobtemplate.py
+++ b/utils/agljobtemplate.py
@@ -134,11 +134,12 @@ class Agljobtemplate(object):
                     build_name = machine + '-nogfx'
                 if (machine == 'h3ulcb-kf'):
                     build_name = 'h3ulcb-nogfx'
+                    machine_frag_url = 'h3ulcb'
                 if (machine == 'm3ulcb'):
                     build_name = machine + '-nogfx'
                 if machine == "upsquare":
-                    machine_frag_url = "intel-corei7-64"
-                    build_name = "intel-corei7-64"
+                    machine_frag_url = "qemux86-64"
+                    build_name = "qemux86-64"
                 if vcs_branch == "master" and (machine == "raspberrypi4" or machine == "raspberrypi4-64"):
                     machine_frag_url = "raspberrypi4-64"
                     build_name = "raspberrypi4"
diff --git a/utils/create-jobs.py b/utils/create-jobs.py
index 28eb643..b2a7363 100755
--- a/utils/create-jobs.py
+++ b/utils/create-jobs.py
@@ -19,7 +19,7 @@ def parse_cmdline(machines, tests, rfs_types):
     parser.add_argument('--url', '-u', action='store', dest='url',
                         help="If using a custom URL specify it there. The files will be fetched from this URL.")
     parser.add_argument('--build-type', dest='build_type', action='store',
-                        help="The type of build, can be one of: {'ci', 'daily', 'weekly', 'release'}.",
+                        help="The type of build, can be one of: {'ci', 'daily', 'weekly', 'release', 'prerelease'}.",
                         default="default")
     parser.add_argument('--branch', dest='vcs_branch', action='store',
                         help='The build branch.')
@@ -81,7 +81,11 @@ def parse_cmdline(machines, tests, rfs_types):
 
     if (args.build_type == "release") and not args.url:
         if (not args.vcs_branch) or (not args.version):
-            parser.error("when using '--build-type' '--branch' and '--versiom' arguments needs to be set.")
+            parser.error("when using '--build-type' '--branch' and '--version' arguments needs to be set.")
+
+    if (args.build_type == "prerelease") and not args.url:
+        if (not args.vcs_branch) or (not args.version):
+            parser.error("when using '--build-type' '--branch' and '--version' arguments needs to be set.")
 
     return args
 
diff --git a/utils/job-prereq.py b/utils/job-prereq.py
index c04959b..08531cd 100755
--- a/utils/job-prereq.py
+++ b/utils/job-prereq.py
@@ -39,7 +39,7 @@ def parse_cmdline(machines):
     parser.add_argument('--nbdroot', action='store_true')
     parser.add_argument('--build-type', action='store', dest='build_type',
                         nargs=3,
-                        help="The type of build. It defines the URL to upload to.",
+                        help="The type of build. It defines the URL to upload to. (ci, release, prerelease)",
                         required=True)
     parser.add_argument('--branch', dest='vcs_branch', action='store', default='master',
                          help='The build branch.')