[kde-linux/os-autoinst-distri-kdelinux] /: update docs and build encrypted variant in gitlab CI
Bhushan Shah <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 4977b2ff6ed6a0726f5ea82602e9bf6991e2fa99 by Bhushan Shah.
Committed on 20/07/2026 at 11:58.
Pushed by bshah into branch 'master'.
update docs and build encrypted variant in gitlab CI
M +13 -0 .gitlab-ci.yml
M +5 -3 README.md
M +6 -3 worker.sh
https://invent.kde.org/kde-linux/os-autoinst-distri-kdelinux/-/commit/4977b2ff6ed6a0726f5ea82602e9bf6991e2fa99
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 834a8c0..11d0c73 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,3 +69,16 @@ test-upgrade:
stage: test-upgrade
variables:
WORKER_ARGS: --upgrade
+
+test-encrypt:
+ extends: .test-base
+ stage: test
+ variables:
+ WORKER_ARGS: --encrypt
+
+test-upgrade-encrypt:
+ extends: .test-base
+ stage: test-upgrade
+ variables:
+ WORKER_ARGS: --upgrade --encrypt
+
diff --git a/README.md b/README.md
index cb7454d..3414afa 100644
--- a/README.md
+++ b/README.md
@@ -7,12 +7,12 @@
| Test | What it does |
|---|---|
-| `kdelinux-live/bootup` | Powers on, checks UEFI screen, Plymouth, and live desktop loads |
+| `common/bootup` | Powers on, checks UEFI screen, Plymouth, and live desktop loads |
| `common/system_settings/disable_screen_dim_and_screen_off` | Disables screen dim/off via kconfig so subsequent tests aren't interrupted |
| `common/basic_test` | Checks if the system is blessed and no services have failed |
| `common/network` | Checks that networking works; a non-loopback link is up with a routable IP and a default route, DNS resolves, and HTTPS to the internet works |
| `kdelinux-live/calamares_install` | Runs the Calamares installer and installs the system, fatal |
-| `kdelinux-live/bootup_setup` | Powers on after install, checks Plymouth and Plasma Welcome screen appear |
+| `common/bootup` | Powers on after install, checks Plymouth and Plasma Welcome screen appear |
| `kdelinux/desktop/plasma_setup` | Completes the Plasma initial setup wizard |
| `kdelinux/sddm/sddm_password_login` | Types password at SDDM, checks desktop or welcome screen loads |
| `kdelinux/desktop/plasma_welcome` | Runs through the Plasma Welcome screen via Selenium |
@@ -83,6 +83,8 @@ The upgrade flow, verifies the current build can be upgraded to from the previou
install-system (previous build) -> upgrade-system -> sanity-test
```
+Both of these flows are also offered in encrypted install variant too.
+
### Running tests locally
Nota bene: if you change anything in `extensions/`, to re-create sysext image without restarting worker, run following,
@@ -106,7 +108,7 @@ Spins up a local OpenQA webui and worker together.
4. Open a shell in the container and submit jobs:
```bash
podman exec -it openqa-single-instance bash
- bash utils/jobs.sh # add --upgrade for the upgrade flow
+ bash utils/jobs.sh # add --upgrade for the upgrade flow, add --encrypt to test with full-disk-encryption
```
You can also edit `utils/jobs.sh` to comment out jobs and run only the ones you want. Note that
`sanity-test` needs `install-system` to have run first, because it installs the system to a virtual disk.
diff --git a/worker.sh b/worker.sh
index 5fff343..fd03908 100755
--- a/worker.sh
+++ b/worker.sh
@@ -7,11 +7,14 @@ set -eo pipefail
export CASEDIR="$(git rev-parse --show-toplevel)"
source "$CASEDIR"/utils/banner.sh
-# Parse cmdline to see if we're doing an upgrade job
+
+# Parse cmdline to see if we're doing an upgrade and/or encryption job
UPGRADE=0
+FDE=0
while [[ $# -gt 0 ]]; do
case "$1" in
--upgrade) UPGRADE=1; shift ;;
+ --encrypt) FDE=1; shift ;;
*) echo "[ERROR] Unknown argument: $1" >&2; exit 1 ;;
esac
done
@@ -113,13 +116,13 @@ fi
# Run test jobs
jobs_status=0
if [[ "$UPGRADE" -eq 1 ]]; then
- if bash "$CASEDIR/utils/jobs.sh" --upgrade; then
+ if bash "$CASEDIR/utils/jobs.sh" --upgrade $( [[ "$FDE" -eq 1 ]] && echo "--encrypt" ); then
:
else
jobs_status=$?
fi
else
- if bash "$CASEDIR/utils/jobs.sh"; then
+ if bash "$CASEDIR/utils/jobs.sh" $( [[ "$FDE" -eq 1 ]] && echo "--encrypt" ); then
:
else
jobs_status=$?