From 1fb288761cf44197c2767bb8bd11d386eebb5e64 Mon Sep 17 00:00:00 2001 From: Jan-Simon Moeller Date: Thu, 23 May 2024 10:49:18 +0200 Subject: Update image names Change-Id: I43800a769a87d6782d30724b288e59c1b0283594 Signed-off-by: Jan-Simon Moeller --- templates/machines/dra7xx-evm.jinja2 | 4 ++-- templates/machines/h3ulcb-kf.jinja2 | 6 +++--- templates/machines/intel-corei7-64.jinja2 | 2 +- templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 | 6 +++--- templates/machines/qemuarm.jinja2 | 4 ++-- templates/machines/qemuarm64.jinja2 | 4 ++-- templates/machines/qemux86-64.jinja2 | 4 ++-- templates/machines/r8a7795-agl-refhw.jinja2 | 6 +++--- templates/machines/raspberrypi3.jinja2 | 4 ++-- templates/machines/raspberrypi4.jinja2 | 4 ++-- templates/machines/upsquare.jinja2 | 4 ++-- utils/create-jobs.py | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2 index 23ca0cd..030df0f 100644 --- a/templates/machines/dra7xx-evm.jinja2 +++ b/templates/machines/dra7xx-evm.jinja2 @@ -7,9 +7,9 @@ {%- set kernel_image = kernel_image|default("zImage") %} {%- set rootfs_type = rootfs_type|default("nbd") %} {%- 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") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-dra7xx-evm.ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-dra7xx-evm.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-dra7xx-evm.ext4.xz") %} {%- endif %} {%- set uboot_type = "bootz" %} diff --git a/templates/machines/h3ulcb-kf.jinja2 b/templates/machines/h3ulcb-kf.jinja2 index 7b3e31c..b533768 100644 --- a/templates/machines/h3ulcb-kf.jinja2 +++ b/templates/machines/h3ulcb-kf.jinja2 @@ -16,11 +16,11 @@ {%- set rfs_image = "agl-image-ivi-h3ulcb.ext4.xz" %} {%- endif %} {% else %} -#{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %} +#{%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-h3ulcb.ext4.xz") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} - {%- set rfs_image = "agl-demo-platform-crosssdk-h3ulcb.ext4.xz" %} + {%- set rfs_image = "agl-ivi-demo-qt-crosssdk-h3ulcb.ext4.xz" %} {%- else %} - {%- set rfs_image = "agl-demo-platform-h3ulcb.ext4.xz" %} + {%- set rfs_image = "agl-ivi-demo-qt-h3ulcb.ext4.xz" %} {%- endif %} {% endif %} diff --git a/templates/machines/intel-corei7-64.jinja2 b/templates/machines/intel-corei7-64.jinja2 index 335c0a0..b0cccd2 100644 --- a/templates/machines/intel-corei7-64.jinja2 +++ b/templates/machines/intel-corei7-64.jinja2 @@ -5,4 +5,4 @@ {%- set device_type = "x86" %} {%- set kernel_image = kernel_image|default("bzImage") %} {%- set rootfs_type = rootfs_type|default("nbd") %} -{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-intel-corei7-64.ext4.xz") %} +{%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-intel-corei7-64.ext4.xz") %} diff --git a/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 b/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 index 79b071a..a7a263d 100644 --- a/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 +++ b/templates/machines/machines-branch/h3ulcb-kf-lamprey.jinja2 @@ -16,11 +16,11 @@ {%- set rfs_image = "agl-image-ivi-h3ulcb.ext4.xz" %} {%- endif %} {% else %} -#{%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-h3ulcb.ext4.xz") %} +#{%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-h3ulcb.ext4.xz") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} - {%- set rfs_image = "agl-demo-platform-crosssdk-h3ulcb.ext4.xz" %} + {%- set rfs_image = "agl-ivi-demo-qt-crosssdk-h3ulcb.ext4.xz" %} {%- else %} - {%- set rfs_image = "agl-demo-platform-h3ulcb.ext4.xz" %} + {%- set rfs_image = "agl-ivi-demo-qt-h3ulcb.ext4.xz" %} {%- endif %} {% endif %} diff --git a/templates/machines/qemuarm.jinja2 b/templates/machines/qemuarm.jinja2 index 29c217c..736b276 100644 --- a/templates/machines/qemuarm.jinja2 +++ b/templates/machines/qemuarm.jinja2 @@ -15,9 +15,9 @@ {%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} {%- 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") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-qemuarm.ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-qemuarm.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-qemuarm.ext4.xz") %} {%- endif %} {% set qemu_binary = 'qemu-system-arm' %} {% set qemu_docker = True %} diff --git a/templates/machines/qemuarm64.jinja2 b/templates/machines/qemuarm64.jinja2 index 5425934..f6b7b11 100644 --- a/templates/machines/qemuarm64.jinja2 +++ b/templates/machines/qemuarm64.jinja2 @@ -15,7 +15,7 @@ {%- set guestfs_interface = "virtio" %} {%- set rootfs_type = rootfs_type|default("rootvd") %} {%- 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") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-qemuarm64.ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-qemuarm64.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-qemuarm64.ext4.xz") %} {%- endif %} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 45dc936..cd91f0c 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -11,7 +11,7 @@ {%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/sda 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') or (build_type == 'prerelease') %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-qemux86-64.ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-qemux86-64.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-qemux86-64.ext4.xz") %} {%- endif %} diff --git a/templates/machines/r8a7795-agl-refhw.jinja2 b/templates/machines/r8a7795-agl-refhw.jinja2 index f2cadb4..8d4ba16 100644 --- a/templates/machines/r8a7795-agl-refhw.jinja2 +++ b/templates/machines/r8a7795-agl-refhw.jinja2 @@ -17,11 +17,11 @@ {%- set rfs_image = "agl-image-ivi-h3ulcb.ext4.xz" %} {%- endif %} {% else %} -#{%- set rfs_image = rfs_image|default("agl-demo-platform-h3ulcb.ext4.xz") %} +#{%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-h3ulcb.ext4.xz") %} {%- if (build_type == 'daily') or (build_type == 'release') or (build_type == 'snapshot') or (build_type == 'prerelease') %} - {%- set rfs_image = "agl-demo-platform-crosssdk-h3ulcb.ext4.xz" %} + {%- set rfs_image = "agl-ivi-demo-qt-crosssdk-h3ulcb.ext4.xz" %} {%- else %} - {%- set rfs_image = "agl-demo-platform-h3ulcb.ext4.xz" %} + {%- set rfs_image = "agl-ivi-demo-qt-h3ulcb.ext4.xz" %} {%- endif %} {% endif %} diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2 index cda3c84..cb2c7f0 100644 --- a/templates/machines/raspberrypi3.jinja2 +++ b/templates/machines/raspberrypi3.jinja2 @@ -11,9 +11,9 @@ {%- endif %} {%- set dtb = dtb|default("bcm2710-rpi-3-b+vc4+ft5406.dtb") %} {%- 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") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-raspberrypi3.ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-raspberrypi3.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-raspberrypi3.ext4.xz") %} {%- endif %} {%- block main %} diff --git a/templates/machines/raspberrypi4.jinja2 b/templates/machines/raspberrypi4.jinja2 index 5c4ed27..7ddfe9e 100644 --- a/templates/machines/raspberrypi4.jinja2 +++ b/templates/machines/raspberrypi4.jinja2 @@ -11,9 +11,9 @@ {%- endif %} {%- set dtb = dtb|default("bcm2711-rpi-4-b+vc4.dtb") %} {%- if (build_type == 'snapshot') or (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") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-" + yocto_machine + ".ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-" + yocto_machine + ".ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-" + yocto_machine + ".ext4.xz") %} {%- endif %} {%- block main %} diff --git a/templates/machines/upsquare.jinja2 b/templates/machines/upsquare.jinja2 index 7ad8237..a58ab45 100644 --- a/templates/machines/upsquare.jinja2 +++ b/templates/machines/upsquare.jinja2 @@ -7,7 +7,7 @@ {%- 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') or (build_type == 'prerelease') %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-crosssdk-qemux86-64.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-crosssdk-qemux86-64.ext4.xz") %} {%- else %} - {%- set rfs_image = rfs_image|default("agl-demo-platform-qemux86-64.ext4.xz") %} + {%- set rfs_image = rfs_image|default("agl-ivi-demo-qt-qemux86-64.ext4.xz") %} {%- endif %} \ No newline at end of file diff --git a/utils/create-jobs.py b/utils/create-jobs.py index 1663035..d995254 100755 --- a/utils/create-jobs.py +++ b/utils/create-jobs.py @@ -44,7 +44,7 @@ def parse_cmdline(machines, tests, rfs_types): parser.add_argument('-n', '--name', dest='job_name', action='store', help="job name", default='AGL-short-smoke') parser.add_argument('--rootfs-img', dest='rootfs_img', action='store', - help="The name of the root file system image (such as agl-demo-platform-raspberrypi3.ext4.xz)") + help="The name of the root file system image (such as agl-ivi-demo-qt-raspberrypi3.ext4.xz)") parser.add_argument('--kernel-img', dest='kernel_img', action='store', help="The name of the kernel to boot (such as uImage)") parser.add_argument('--dtb-img', dest='dtb_img', action='store', -- cgit 1.2.3-korg