diff options
| -rw-r--r-- | templates/boot/generic-qemu-tmpfs.jinja2 | 2 | ||||
| -rw-r--r-- | templates/machines/qemux86-64.jinja2 | 2 | ||||
| -rw-r--r-- | utils/agljobtemplate.py | 7 |
3 files changed, 8 insertions, 3 deletions
diff --git a/templates/boot/generic-qemu-tmpfs.jinja2 b/templates/boot/generic-qemu-tmpfs.jinja2 index b89ac60..ef8273a 100644 --- a/templates/boot/generic-qemu-tmpfs.jinja2 +++ b/templates/boot/generic-qemu-tmpfs.jinja2 @@ -24,7 +24,7 @@ context: {%- if guestfs_interface is defined %} guestfs_interface: {{ guestfs_interface }} {%- endif %} - extra_options: ["{{ qemu_args }}"] + extra_options: ["{{ qemu_args }} -vnc unix:/tmp/vnc-{{ uniqid }}"] {% endblock %} {%- block deploy -%} {{ super() }} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 6c9363e..8bea92c 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -6,7 +6,7 @@ {%- 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 -device virtio-rng-pci" %} +{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -smp 2 -m 2048 -soundhw hda -device usb-ehci -device virtio-rng-pci -vga virtio" %} {%- 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') or (build_type == 'prerelease') %} diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index 28e06ec..3f4d960 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -8,7 +8,7 @@ from urllib.parse import urlparse from urllib.parse import urljoin from urllib.parse import urlsplit import ast - +import random def get_extension(path): return path.split('.')[-1] @@ -107,6 +107,11 @@ class Agljobtemplate(object): job['build_type'] = build_type job['image_type'] = "AGL-%s" % build_type + if patchset != None: + job["uniqid"] = "AGL-%s-%s-%s-%d" % (machine, changeid, patchset, random.randint(1, 999999)) + else: + job["uniqid"] = "AGL-%s-%s-%s-%d" % (machine, branch, version, random.randint(1, 999999)) + defaults, infra = parse_cfg_file(self._template_path, 'default.cfg', build_type) # If the user doesn't specify an URL, use the default one from the build-type |