lukechilds
/
mender-convert
mirror of https://github.com/lukechilds/mender-convert.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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>
change-dependabot-prefix
Kristian Amlie 3 years ago
parent
d6ffdcdb1b
commit
9b8b8fb7a1
No known key found for this signature in database GPG Key ID: F464407C996AF03F
4 changed files with 14 additions and 14 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .gitlab-ci.yml
  2. 4
      configs/debian-qemux86-64_config
  3. 4
      configs/ubuntu-qemux86-64_config
  4. 16
      scripts/test/run-tests.sh

4
.gitlab-ci.yml
View File

@ -223,12 +223,12 @@ test_acceptance_prebuilt_raspberrypi4:
test_acceptance_qemux86_64: test_acceptance_qemux86_64:
<<: *test_acceptance <<: *test_acceptance
script: 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_debian_qemux86_64:
<<: *test_acceptance <<: *test_acceptance
script: 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_raspberrypi:
<<: *test_acceptance <<: *test_acceptance

4
configs/debian-qemux86-64_config
View File

@ -13,10 +13,10 @@
# #
# and qemu is executed with the following command: # 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_STORAGE_DEVICE_BASE=/dev/sda
MENDER_DEVICE_TYPE="qemux86_64" MENDER_DEVICE_TYPE="qemux86-64"
# Nothing to copy # Nothing to copy
MENDER_COPY_BOOT_GAP="n" MENDER_COPY_BOOT_GAP="n"

4
configs/qemux86-64_config → configs/ubuntu-qemux86-64_config
View File

@ -13,10 +13,10 @@
# #
# and qemu is executed with the following command: # 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_STORAGE_DEVICE_BASE=/dev/sda
MENDER_DEVICE_TYPE="qemux86_64" MENDER_DEVICE_TYPE="qemux86-64"
# Nothing to copy # Nothing to copy
MENDER_COPY_BOOT_GAP="n" MENDER_COPY_BOOT_GAP="n"

16
scripts/test/run-tests.sh
View File

@ -88,13 +88,13 @@ if [ -n "$PREBUILT_IMAGE" ]; then
exit $test_result exit $test_result
else 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/ wget --progress=dot:giga -N ${UBUNTU_IMAGE_URL} -P input/
convert_and_test "qemux86_64" \ convert_and_test "qemux86-64" \
"release-1" \ "release-1" \
"input/Ubuntu-Focal-x86-64.img.gz" \ "input/Ubuntu-Focal-x86-64.img.gz" \
"--overlay tests/ssh-public-key-overlay" \ "--overlay tests/ssh-public-key-overlay" \
"--config configs/qemux86-64_config $EXTRA_CONFIG" \ "--config configs/ubuntu-qemux86-64_config $EXTRA_CONFIG" \
|| test_result=$? || test_result=$?
echo >&2 "----------------------------------------" echo >&2 "----------------------------------------"
@ -104,10 +104,10 @@ else
gunzip --force "input/Ubuntu-Focal-x86-64.img.gz" gunzip --force "input/Ubuntu-Focal-x86-64.img.gz"
run_convert "release-2" \ run_convert "release-2" \
"input/Ubuntu-Focal-x86-64.img" \ "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 ret=0
test -f deploy/Ubuntu-Focal-x86-64-qemux86_64-mender.img || ret=$? 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" assert "${ret}" "0" "Expected uncompressed file deploy/Ubuntu-Focal-x86-64-qemux86-64-mender.img"
fi fi
if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "raspberrypi3" ]; then if [ "$TEST_ALL" == "1" -o "$TEST_PLATFORM" == "raspberrypi3" ]; then
@ -162,9 +162,9 @@ else
|| test_result=$? || test_result=$?
fi 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/ wget --progress=dot:giga -N ${DEBIAN_IMAGE_URL} -P input/
convert_and_test "qemux86_64" \ convert_and_test "qemux86-64" \
"release-1" \ "release-1" \
"input/Debian-11-x86-64.img.gz" \ "input/Debian-11-x86-64.img.gz" \
"--overlay tests/ssh-public-key-overlay" \ "--overlay tests/ssh-public-key-overlay" \

Write Preview
Loading…
Cancel
Save