Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 0 additions & 9 deletions tmt/plans/main.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -42,12 +42,3 @@ execute:
- init
- build-qemu
- test-kola-upgrade

/kola-testiso:
summary: run kola testiso tests
discover+:
how: fmf
test:
- init
- build-iso
- test-iso
2 changes: 0 additions & 2 deletions tmt/tests/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,4 @@ source "utils.sh"

if [ "$TEST_CASE" = "build-qemu" ]; then
cosa osbuild qemu
elif [ "$TEST_CASE" = "build-iso" ]; then
cosa osbuild live metal metal4k
fi
Comment on lines 7 to 9

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

medium

With the removal of the build-iso case, this conditional check is now redundant. The entrypoint.sh script already ensures that build.sh is only invoked when TEST_CASE is build-qemu. Simplifying this to a direct command improves readability and maintains consistency with other scripts like init.sh.

Suggested change
if [ "$TEST_CASE" = "build-qemu" ]; then
cosa osbuild qemu
elif [ "$TEST_CASE" = "build-iso" ]; then
cosa osbuild live metal metal4k
fi
cosa osbuild qemu

4 changes: 2 additions & 2 deletions tmt/tests/entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ case "$TEST_CASE" in
"init")
./init.sh
;;
"build-qemu"|"build-iso")
"build-qemu")
./build.sh
;;
"test-qemu"|"test-kola-upgrade"|"test-iso")
"test-qemu"|"test-kola-upgrade")
./test.sh
;;
*)
Expand Down
12 changes: 0 additions & 12 deletions tmt/tests/kola.fmf
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,3 @@ test: ./entrypoint.sh
order: 80
environment:
TEST_CASE: test-kola-upgrade

/build-iso:
duration: 1h
order: 90
environment:
TEST_CASE: build-iso

/test-iso:
duration: 2h
order: 100
environment:
TEST_CASE: test-iso
9 changes: 0 additions & 9 deletions tmt/tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,4 @@ elif [ "$TEST_CASE" = "test-kola-upgrade" ]; then
)
run_kola
collect_kola_artifacts

elif [ "$TEST_CASE" = "test-iso" ]; then
export KOLA_ACTION="testiso"
export KOLA_ID="test-iso"
export KOLA_EXTRA_ARGS=(
--inst-insecure
)
run_kola
collect_kola_artifacts
fi