Tests: adjust test parameters and broken modules

Author: igorpecovnik

.github/workflows/maintenance-unit-tests.yml

@@ -104,19 +104,13 @@ jobs:
 
       - name: "Initialize systemd"
         run: |
-          apt-get update
-          apt-get install -y systemd-sysv wget
           # Start systemd in the container
           /sbin/init &
           sleep 5
           # Make the container appear as if systemd is PID 1
           export SYSTEMD_IGNORE_CHROOT=1
           export container=docker
 
-      - name: "Install dependencies"
-        run: |
-          apt-get install -y jq figlet curl ca-certificates tree procps lsb-release dialog sudo iproute2 whiptail debconf libtext-iconv-perl gpg xz-utils pv systemd
-
       - name: "Checkout Armbian configuration tool"
         uses: actions/checkout@v6
         with:

tests/uptimekuma.conf

@@ -3,8 +3,7 @@ RELEASE="noble"
 TESTNAME="Uptimekuma install"
 
 testcase() {(
-	set -e
-	./bin/armbian-config --api module_uptimekuma remove
+	./bin/armbian-config --api module_uptimekuma purge
 	./bin/armbian-config --api module_uptimekuma install
 	./bin/armbian-config --api module_uptimekuma status
 )}

tools/modules/software/module_docker.sh

@@ -26,7 +26,12 @@ function module_docker() {
 			# Install docker from distribution maintained packages
 			pkg_update
 			pkg_install docker.io docker-cli docker-compose
-
+			if pkg_installed docker-ce; then pkg_remove docker-ce; fi
+			if pkg_installed docker-ce-cli; then pkg_remove docker-ce-cli; fi
+			if pkg_installed containerd.io; then pkg_remove containerd.io; fi
+			if pkg_installed docker-buildx-plugin; then pkg_remove docker-buildx-plugin; fi
+			if pkg_installed docker-compose-plugin; then pkg_remove docker-compose-plugin; fi
+			rm -f /etc/apt/sources.list.d/docker.list
 			groupadd docker 2>/dev/null || true
 			if [[ -n "${SUDO_USER}" ]]; then
 				usermod -aG docker "${SUDO_USER}"

tools/modules/software/module_uptime-kuma.sh

@@ -17,10 +17,9 @@ function module_uptimekuma () {
 	local title="uptimekuma"
 	local condition=$(which "$title" 2>/dev/null)
 
-	if pkg_installed docker-ce; then
-		local container=$(docker container ls -a | mawk '/uptime-kuma?( |$)/{print $1}')
-		local image=$(docker image ls -a | mawk '/uptime-kuma?( |$)/{print $3}')
-	fi
+	pkg_installed docker.io || module_docker install
+	local container=$(docker container ls -a --filter "name=uptime-kuma" --format '{{.ID}}')
+	local image=$(docker image ls -a --format '{{.Repository}} {{.ID}}' | grep 'uptime-kuma '| awk '{print $2}')
 
 	local commands
 	IFS=' ' read -r -a commands <<< "${module_options["module_uptimekuma,example"]}"
@@ -29,7 +28,6 @@ function module_uptimekuma () {
 
 	case "$1" in
 		"${commands[0]}")
-			pkg_installed docker-ce || module_docker install
 			[[ -d "$UPTIMEKUMA_BASE" ]] || mkdir -p "$UPTIMEKUMA_BASE" || { echo "Couldn't create storage directory: $UPTIMEKUMA_BASE"; exit 1; }
 			docker run -d \
 			--net=lsio \
@@ -39,26 +37,28 @@ function module_uptimekuma () {
 			-v "${UPTIMEKUMA_BASE}:/app/data" \
 			louislam/uptime-kuma:1
 			for i in $(seq 1 20); do
-				if docker inspect -f '{{ index .Config.Labels "build_version" }}' uptime-kuma >/dev/null 2>&1 ; then
-					break
-				else
-					sleep 3
+				state="$(docker inspect -f '{{.State.Status}}' uptime-kuma 2>/dev/null || true)"
+				if [[ "$state" == "running" ]]; then
+				break
 				fi
-				if [ $i -eq 20 ] ; then
-					echo -e "\nTimed out waiting for ${title} to start, consult your container logs for more info (\`docker logs uptimekuma\`)"
+				sleep 3
+				if [[ $i -eq 20 ]]; then
+					echo -e "\nTimed out waiting for ${title} to start, consult logs (\`docker logs uptime-kuma\`)"
 					exit 1
 				fi
 			done
 		;;
 		"${commands[1]}")
 			if [[ "${container}" ]]; then
-				docker container rm -f "$container" >/dev/null
-			fi
-			if [[ "${image}" ]]; then
-				docker image rm "$image" >/dev/null
+				echo "Removing container: $container"
+				docker container rm -f "$container"
 			fi
 		;;
 		"${commands[2]}")
+			${module_options["module_uptimekuma,feature"]} ${commands[1]}
+			if [[ "${image}" ]]; then
+				docker image rm "$image"
+			fi
 			${module_options["module_uptimekuma,feature"]} ${commands[1]}
 			if [[ -n "${UPTIMEKUMA_BASE}" && "${UPTIMEKUMA_BASE}" != "/" ]]; then
 				rm -rf "${UPTIMEKUMA_BASE}"