diff options
| author | Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> | 2023-05-15 14:41:18 -0700 |
|---|---|---|
| committer | Stefano Stabellini <stefano.stabellini@amd.com> | 2023-05-15 14:46:48 -0700 |
| commit | 3e02611fac8b238f99415b5b90dd31373ded2fac (patch) | |
| tree | cadebc1cc14b50abf92eb194a97efc29c5e67240 | |
| parent | be6aa637db95b1d7c50671fb30b79b3cd7e6dabf (diff) | |
| download | xen-3e02611fac8b238f99415b5b90dd31373ded2fac.tar.gz | |
automation: make console options configurable via variables
This makes the test script easier reusable for different runners, where
console may be connected differently. Include both console= option and
configuration for specific chosen console too (like com1= here) in the
'CONSOLE_OPTS' variable.
Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
| -rw-r--r-- | automation/gitlab-ci/test.yaml | 1 | ||||
| -rwxr-xr-x | automation/scripts/qubes-x86-64.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml index 9c0e08d456..d790bd36c7 100644 --- a/automation/gitlab-ci/test.yaml +++ b/automation/gitlab-ci/test.yaml @@ -96,6 +96,7 @@ LOGFILE: smoke-test.log PCIDEV: "03:00.0" PCIDEV_INTR: "MSI-X" + CONSOLE_OPTS: "console=com1 com1=115200,8n1" artifacts: paths: - smoke.serial diff --git a/automation/scripts/qubes-x86-64.sh b/automation/scripts/qubes-x86-64.sh index 4f17f1dd0b..98137bb772 100755 --- a/automation/scripts/qubes-x86-64.sh +++ b/automation/scripts/qubes-x86-64.sh @@ -189,7 +189,7 @@ TFTP=/scratch/gitlab-runner/tftp CONTROLLER=control@thor.testnet echo " -multiboot2 (http)/gitlab-ci/xen console=com1 com1=115200,8n1 loglvl=all guest_loglvl=all dom0_mem=4G $extra_xen_opts +multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G $extra_xen_opts module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 module2 (http)/gitlab-ci/initrd-dom0 " > $TFTP/grub.cfg |