From 22bdcada4adaf126dfabfcb5770204d912102d1e Mon Sep 17 00:00:00 2001 From: Georg Pfuetzenreuter Date: Wed, 24 May 2023 00:26:09 +0200 Subject: [PATCH] Update test configs - link to box metadata instead of .box - add suite for Salt test test Signed-off-by: Georg Pfuetzenreuter --- tests/configs/complete.ini | 6 ++---- tests/configs/missing_box_name.ini | 2 +- tests/configs/missing_suite_box.ini | 4 ++-- tests/configs/salt.ini | 7 +++---- tests/configs/undefined_suite_box.ini | 4 ++-- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/tests/configs/complete.ini b/tests/configs/complete.ini index 0f29c07..3dc7434 100644 --- a/tests/configs/complete.ini +++ b/tests/configs/complete.ini @@ -1,16 +1,14 @@ [box] bootstrap=tests/scripts/bootstrap.sh -image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/Tumbleweed.x86_64-libvirt.box +name=Tumbleweed.x86_64 +image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/boxes/Tumbleweed.x86_64.json [box.tumbleweed] -name=tumbleweed [box.tumbleweed_bootstrap] -name=tumbleweed_bootstrap bootstrap=tests/scripts/bootstrap_hello_world.sh [box.tumbleweed_salt] -name=tumbleweed_salt bootstrap=tests/scripts/bootstrap_salt.sh [suite.one_minion] diff --git a/tests/configs/missing_box_name.ini b/tests/configs/missing_box_name.ini index 039bc79..524179b 100644 --- a/tests/configs/missing_box_name.ini +++ b/tests/configs/missing_box_name.ini @@ -2,7 +2,7 @@ bootstrap=scripts/bootstrap.sh [box.tumbleweed] -image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/Tumbleweed.x86_64-libvirt.box +image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/boxes/Tumbleweed.x86_64.json [suite.one_minion] minions=1 diff --git a/tests/configs/missing_suite_box.ini b/tests/configs/missing_suite_box.ini index ba224b4..7a97cef 100644 --- a/tests/configs/missing_suite_box.ini +++ b/tests/configs/missing_suite_box.ini @@ -2,8 +2,8 @@ bootstrap=scripts/bootstrap.sh [box.tumbleweed] -name=tumblweed -image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/Tumbleweed.x86_64-libvirt.box +name=Tumbleweed.x86_64 +image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/boxes/Tumbleweed.x86_64.json [suite.one_minion] minions=1 diff --git a/tests/configs/salt.ini b/tests/configs/salt.ini index 3b2aa11..671083d 100644 --- a/tests/configs/salt.ini +++ b/tests/configs/salt.ini @@ -1,9 +1,8 @@ [box] -bootstrap=tests/scripts/bootstrap_salt.sh -image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/Tumbleweed.x86_64-libvirt.box - [box.tumbleweed] -name=tumbleweed +bootstrap=tests/scripts/bootstrap_salt.sh +name=Tumbleweed.x86_64 +image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/boxes/Tumbleweed.x86_64.json [suite.one_minion] minions=1 diff --git a/tests/configs/undefined_suite_box.ini b/tests/configs/undefined_suite_box.ini index a490f09..29ff2e9 100644 --- a/tests/configs/undefined_suite_box.ini +++ b/tests/configs/undefined_suite_box.ini @@ -2,8 +2,8 @@ bootstrap=scripts/bootstrap.sh [box.tumbleweed] -name=tumblweed -image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/Tumbleweed.x86_64-libvirt.box +name=Tumbleweed.x86_64 +image=https://download.opensuse.org/repositories/home:/crameleon:/appliances/openSUSE_Tumbleweed/boxes/Tumbleweed.x86_64.json [suite.one_minion] minions=1