From 9b8b8fb7a116a293814ed64cab9aa9daddb53301 Mon Sep 17 00:00:00 2001
From: Kristian Amlie <kristian.amlie@northern.tech>
Date: Tue, 22 Feb 2022 14:08:39 +0100
Subject: [PATCH] Some cleanups to naming of test labels.

* Standardize on "qemux86-64", not "qemux86_64", since the former is
  what is used everywhere else.

* Rename qemux86_64 to ubuntu-qemux86-64, since we now have more than
  one qemu configuration.

Changelog: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
---
 .gitlab-ci.yml                                   |  4 ++--
 configs/debian-qemux86-64_config                 |  4 ++--
 ...emux86-64_config => ubuntu-qemux86-64_config} |  4 ++--
 scripts/test/run-tests.sh                        | 16 ++++++++--------
 4 files changed, 14 insertions(+), 14 deletions(-)
 rename configs/{qemux86-64_config => ubuntu-qemux86-64_config} (93%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10237ba..25a2349 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -223,12 +223,12 @@ test_acceptance_prebuilt_raspberrypi4:
 test_acceptance_qemux86_64:
   <<: *test_acceptance
   script:
-    - ./scripts/test/run-tests.sh --config versions_override_config --only qemux86_64
+    - ./scripts/test/run-tests.sh --config versions_override_config --only ubuntu-qemux86-64
 
 test_acceptance_debian_qemux86_64:
   <<: *test_acceptance
   script:
-    - ./scripts/test/run-tests.sh --config versions_override_config --only debian-qemux86_64
+    - ./scripts/test/run-tests.sh --config versions_override_config --only debian-qemux86-64
 
 test_acceptance_raspberrypi:
   <<: *test_acceptance
diff --git a/configs/debian-qemux86-64_config b/configs/debian-qemux86-64_config
index d26fb19..5a31285 100644
--- a/configs/debian-qemux86-64_config
+++ b/configs/debian-qemux86-64_config
@@ -13,10 +13,10 @@
 #
 # and qemu is executed with the following command:
 #
-#    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Debian-11-x86-64-qemux86_64-mender.img
+#    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Debian-11-x86-64-qemux86-64-mender.img
 
 MENDER_STORAGE_DEVICE_BASE=/dev/sda
-MENDER_DEVICE_TYPE="qemux86_64"
+MENDER_DEVICE_TYPE="qemux86-64"
 
 # Nothing to copy
 MENDER_COPY_BOOT_GAP="n"
diff --git a/configs/qemux86-64_config b/configs/ubuntu-qemux86-64_config
similarity index 93%
rename from configs/qemux86-64_config
rename to configs/ubuntu-qemux86-64_config
index 2f21b14..f7ace3a 100644
--- a/configs/qemux86-64_config
+++ b/configs/ubuntu-qemux86-64_config
@@ -13,10 +13,10 @@
 #
 # and qemu is executed with the following command:
 #
-#    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img
+#    qemu-system-x86_64 -enable-kvm -m 512 -smp 2 -bios /usr/share/OVMF/OVMF_CODE.fd -drive format=raw,file=deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img
 
 MENDER_STORAGE_DEVICE_BASE=/dev/sda
-MENDER_DEVICE_TYPE="qemux86_64"
+MENDER_DEVICE_TYPE="qemux86-64"
 
 # Nothing to copy
 MENDER_COPY_BOOT_GAP="n"
diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh
index 416b06d..7a83ec3 100755
--- a/scripts/test/run-tests.sh
+++ b/scripts/test/run-tests.sh
@@ -88,13 +88,13 @@ if [ -n "$PREBUILT_IMAGE" ]; then
   exit $test_result
 
 else
-  if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "qemux86_64" ]; then
+  if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "ubuntu-qemux86-64" ]; then
     wget --progress=dot:giga -N ${UBUNTU_IMAGE_URL} -P input/
-    convert_and_test "qemux86_64" \
+    convert_and_test "qemux86-64" \
                      "release-1" \
                      "input/Ubuntu-Focal-x86-64.img.gz" \
                      "--overlay tests/ssh-public-key-overlay" \
-                     "--config configs/qemux86-64_config $EXTRA_CONFIG" \
+                     "--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" \
                      || test_result=$?
 
     echo >&2 "----------------------------------------"
@@ -104,10 +104,10 @@ else
     gunzip --force "input/Ubuntu-Focal-x86-64.img.gz"
     run_convert "release-2" \
                 "input/Ubuntu-Focal-x86-64.img" \
-                "--config configs/qemux86-64_config $EXTRA_CONFIG" || test_result=$?
+                "--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" || test_result=$?
     ret=0
-    test -f deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img || ret=$?
-    assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img"
+    test -f deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img || ret=$?
+    assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img"
   fi
 
   if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "raspberrypi3" ]; then
@@ -162,9 +162,9 @@ else
                      || test_result=$?
   fi
 
-  if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "debian-qemux86_64" ]; then
+  if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "debian-qemux86-64" ]; then
     wget --progress=dot:giga -N ${DEBIAN_IMAGE_URL} -P input/
-    convert_and_test "qemux86_64" \
+    convert_and_test "qemux86-64" \
                      "release-1" \
                      "input/Debian-11-x86-64.img.gz" \
                      "--overlay tests/ssh-public-key-overlay" \