diff --git a/plans/dirinstall.fmf b/plans/dirinstall.fmf deleted file mode 100644 index 395ae8a..0000000 --- a/plans/dirinstall.fmf +++ /dev/null @@ -1,18 +0,0 @@ -summary: Integration test - dirinstall on regular system -provision: - standard-inventory-qcow2: - qemu: - m: 2G -prepare: - how: install - package: - - anaconda - # gnome-kiosk is required for "vnc" mode -# - gnome-kiosk -execute: - script: - - ANACONDA_UI_MODE=text plans/dirinstall.sh - - plans/show_logs.sh -# - ANACONDA_UI_MODE=vnc plans/dirinstall.sh -# - plans/show_logs.sh - - journalctl -a diff --git a/plans/integration.fmf b/plans/integration.fmf new file mode 100644 index 0000000..b2e3dbe --- /dev/null +++ b/plans/integration.fmf @@ -0,0 +1,12 @@ +summary: Integration tests for anaconda + +discover: + how: fmf + filter: 'tag: integration' + +execute: + how: tmt + +finish: + how: shell + script: command -v journalctl && journalctl -a || true diff --git a/tests/dirinstall/dirinstall.fmf b/tests/dirinstall/dirinstall.fmf new file mode 100644 index 0000000..e49bfe1 --- /dev/null +++ b/tests/dirinstall/dirinstall.fmf @@ -0,0 +1,22 @@ +summary: Dirinstall test on regular os +contact: Radek Vykydal +path: /tests/dirinstall +test: ./dirinstall.sh +duration: 1h +tag: [integration] + +/text: + summary: Dirinstall test on regular os - text UI + require: + - anaconda + environment: + ANACONDA_UI_MODE: text + +/vnc: + summary: Dirinstall test on regular os - vnc UI + enabled: false + require: + - anaconda + - gnome-kiosk + environment: + ANACONDA_UI_MODE: vnc diff --git a/plans/dirinstall.sh b/tests/dirinstall/dirinstall.sh similarity index 87% rename from plans/dirinstall.sh rename to tests/dirinstall/dirinstall.sh index fcc0bc9..9bbae66 100755 --- a/plans/dirinstall.sh +++ b/tests/dirinstall/dirinstall.sh @@ -9,8 +9,8 @@ WORK_DIR=$(mktemp -d /var/tmp/dirinstall.XXXXXX) # Create kickstart KICKSTART_PATH=${WORK_DIR}/ks.cfg -source plans/repositories -TEST_KICKSTART=plans/ks.dirinstall.cfg +source ./repositories +TEST_KICKSTART=./ks.dirinstall.cfg # Dump URLs of installation repositories found in local repositories whose names are configured in 'repositories' file echo "url --metalink=$(dnf repoinfo $BASE_REPO | grep ^Repo-metalink | cut -d: -f2- | sed 's/^ *//')" > ${KICKSTART_PATH} @@ -35,3 +35,8 @@ anaconda --dirinstall ${INSTALL_DIR} --kickstart ${KICKSTART_PATH} --${ANACONDA_ # Remove test work directory rm -rf ${WORK_DIR} + + +# Show and remove the logs for this anaconda run + +./show_logs.sh diff --git a/plans/ks.dirinstall.cfg b/tests/dirinstall/ks.dirinstall.cfg similarity index 100% rename from plans/ks.dirinstall.cfg rename to tests/dirinstall/ks.dirinstall.cfg diff --git a/plans/repositories b/tests/dirinstall/repositories similarity index 100% rename from plans/repositories rename to tests/dirinstall/repositories diff --git a/plans/show_logs.sh b/tests/dirinstall/show_logs.sh similarity index 100% rename from plans/show_logs.sh rename to tests/dirinstall/show_logs.sh