[PATCH v1 02/13] CI: unify hypervisor console parametrization

[dmukhin@xxxxxxxx]

From: Denis Mukhin <dmukhin@xxxxxxxx>

gitlab CI configuration uses different environment variables for
passing Xen console arguments to the test jobs.

Switch all tests uniformly to 'XEN_CONSOLE=' environment variable.

Not a functional change.

Signed-off-by: Denis Mukhin <dmukhin@xxxxxxxx>
---
 automation/gitlab-ci/test.yaml                 | 12 ++++++------
 automation/scripts/qubes-x86_64.sh             |  4 ++--
 automation/scripts/xilinx-smoke-dom0-x86_64.sh |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/automation/gitlab-ci/test.yaml b/automation/gitlab-ci/test.yaml
index 96127995d7be..f984c34a922e 100644
--- a/automation/gitlab-ci/test.yaml
+++ b/automation/gitlab-ci/test.yaml
@@ -121,7 +121,7 @@
   variables:
     CONTAINER: ubuntu:xilinx-hw-runner
     LOGFILE: xilinx-smoke-x86_64.log
-    XEN_CMD_CONSOLE: "console=com2 com2=57600,8n1,0x2F8,4"
+    XEN_CONSOLE: "console=com2 com2=57600,8n1,0x2F8,4"
     TEST_BOARD: "crater"
     TEST_TIMEOUT_OVERRIDE: 1000
   artifacts:
@@ -144,7 +144,7 @@
     LOGFILE: smoke-test.log
     PCIDEV: "03:00.0"
     PCIDEV_INTR: "MSI-X"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1"
+    XEN_CONSOLE: "console=com1 com1=115200,8n1"
     SUT_ADDR: test-2.testnet
   artifacts:
     paths:
@@ -165,7 +165,7 @@
   variables:
     PCIDEV: "00:1f.6"
     PCIDEV_INTR: "MSI"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,0"
+    XEN_CONSOLE: "console=com1 com1=115200,8n1,pci,0"
     SUT_ADDR: test-3.testnet
   tags:
     - qubes-hw3
@@ -176,7 +176,7 @@
   variables:
     PCIDEV: "56:00.0"
     PCIDEV_INTR: "MSI-X"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1"
+    XEN_CONSOLE: "console=com1 com1=115200,8n1"
     EXTRA_XEN_OPTS: "fred"
     SUT_ADDR: test-22.testnet
   tags:
@@ -188,7 +188,7 @@
   variables:
     PCIDEV: "01:00.0"
     PCIDEV_INTR: "MSI-X"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi,04:00.0"
+    XEN_CONSOLE: "console=com1 com1=115200,8n1,pci,msi,04:00.0"
     SUT_ADDR: test-1.testnet
   tags:
     - qubes-hw1
@@ -199,7 +199,7 @@
   variables:
     PCIDEV: "01:00.0"
     PCIDEV_INTR: "MSI-X"
-    CONSOLE_OPTS: "console=com1 com1=115200,8n1,pci,msi"
+    XEN_CONSOLE: "console=com1 com1=115200,8n1,pci,msi"
     SUT_ADDR: test-11.testnet
   tags:
     - qubes-hw11
diff --git a/automation/scripts/qubes-x86_64.sh 
b/automation/scripts/qubes-x86_64.sh
index 065f03931bea..73cbdff2be72 100755
--- a/automation/scripts/qubes-x86_64.sh
+++ b/automation/scripts/qubes-x86_64.sh
@@ -260,14 +260,14 @@ TFTP=/scratch/gitlab-runner/tftp
 CONTROLLER=control@thor.testnet
 
 echo "
-multiboot2 (http)/gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all 
dom0_mem=4G console_timestamps=boot watchdog ${EXTRA_XEN_OPTS-} $extra_xen_opts
+multiboot2 (http)/gitlab-ci/xen $XEN_CONSOLE loglvl=all guest_loglvl=all 
dom0_mem=4G console_timestamps=boot watchdog ${EXTRA_XEN_OPTS-} $extra_xen_opts
 module2 (http)/gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen
 module2 --nounzip (http)/gitlab-ci/initrd-dom0
 " > $TFTP/grub.cfg
 
 echo "#!ipxe
 
-kernel /gitlab-ci/xen $CONSOLE_OPTS loglvl=all guest_loglvl=all dom0_mem=4G 
console_timestamps=boot watchdog ${EXTRA_XEN_OPTS-} $extra_xen_opts || reboot
+kernel /gitlab-ci/xen $XEN_CONSOLE loglvl=all guest_loglvl=all dom0_mem=4G 
console_timestamps=boot watchdog ${EXTRA_XEN_OPTS-} $extra_xen_opts || reboot
 module /gitlab-ci/vmlinuz console=hvc0 root=/dev/ram0 earlyprintk=xen || reboot
 module /gitlab-ci/initrd-dom0 || reboot
 boot
diff --git a/automation/scripts/xilinx-smoke-dom0-x86_64.sh 
b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
index 5379738019a7..0fe96d62534b 100755
--- a/automation/scripts/xilinx-smoke-dom0-x86_64.sh
+++ b/automation/scripts/xilinx-smoke-dom0-x86_64.sh
@@ -146,7 +146,7 @@ cd ..
 
 # Load software into TFTP server directory.
 TFTP="/scratch/gitlab-runner/tftp"
-XEN_CMDLINE="${XEN_CMD_CONSOLE} ${XEN_CMD_XEN} ${XEN_CMD_DOM0} 
${XEN_CMD_EXTRA}"
+XEN_CMDLINE="${XEN_CONSOLE} ${XEN_CMD_XEN} ${XEN_CMD_DOM0} ${XEN_CMD_EXTRA}"
 cp -f binaries/xen ${TFTP}/${TEST_BOARD}/xen
 cp -f binaries/bzImage ${TFTP}/${TEST_BOARD}/vmlinuz
 cp -f binaries/dom0-rootfs.cpio.gz ${TFTP}/${TEST_BOARD}/initrd-dom0
-- 
2.55.0