continuing work on hyprland build

tests/cleanup.sh

@@ -1,12 +1,16 @@
 #!/usr/bin/env zsh
 
+set -x
+
 [[ -f ./lib.sh ]] && source ./lib.sh || exit 1
 
+ssh-keygen -R "[127.0.0.1]:2222"
+
 for os in ${OSBUILDS[@]}
 do
-  if podman container exists ${IMAGE}:${os}
+  if podman container exists ${CONTAINER}_${os}
   then
-    podman stop ${IMAGE}:${os}
+    podman stop ${CONTAINER}_${os}
   fi
 done
 

tests/setup.sh

@@ -1,5 +1,7 @@
 #!/usr/bin/env zsh
 
+set -x
+
 [[ -f ./lib.sh ]] && source ./lib.sh || exit 1
 
 if [ "$HOSTOS" = "Darwin" ]

tests/test.sh

@@ -1,17 +1,13 @@
 #!/usr/bin/env zsh
 
+set -x
+
 [[ -f ./lib.sh ]] && source ./lib.sh || exit 1
 
 for os in ${OSBUILDS[@]}
 do
-  if ! podman container exists ${IMAGE}:${os}
-  then
-    podman run --rm -it -d --platform linux/amd64 --name ${IMAGE}:${os} -p 2222:22 packagetest
-  fi
-  ansible-playbook test_not_local.yml -i inventory.yml
-  if [ $? -eq 0 ]
-  then
-    podman stop ${IMAGE}:${os}
-    ssh-keygen -R "[127.0.0.1]:2222"
+  if ! podman container exists ${CONTAINER}_${os}; then
+    podman run --rm -it -d --platform linux/amd64 --name ${CONTAINER}_${os} -p 2222:22 ${IMAGE}:${os}
   fi
+  ansible-playbook "test.yml" -i inventory.yml
 done

tests/test.yml

@@ -0,0 +1,12 @@
+---
+- hosts: localhost
+  vars:
+    testpkgs:
+      - hyprland
+  tasks:
+    - name: Test all packages with use_local=false
+      ansible.builtin.include_role:
+        name: ansible_role_package
+      vars:
+        use_local: false
+        packages: "{{ testpkgs }}"

tests/test_not_local.yml

@@ -1,113 +0,0 @@
----
-- hosts: localhost
-  vars:
-    testpkgs:
-      - hyprland
-      # - air
-      # - alacritty
-      # - ansible-language-server
-      # - ansible-lint
-      # - ansible
-      # - bashls
-      # - bat
-      # - bitwarden
-      # - blender
-      # - broot
-      # - btop
-      # - buf
-      # - bufls
-      # - carapace
-      # - cheat
-      # - checkmake
-      # - choose
-      # - clangd
-      # - cmake
-      # - cmakelang
-      # - commitlint-cli
-      # - commitlint-config-conventional
-      # - consul
-      # - cssls
-      # - curlie
-      # - dbeaver
-      # - direnv
-      # - dockerls
-      # - dotenv-linter
-      # - duf
-      # - dust
-      # - editorconfig
-      # - eslint
-      # - eza
-      # - fd
-      # - firefox
-      # - flatpak
-      # - fzf
-      # - ghostty
-      # - git
-      # - glow
-      # - go
-      # - godot
-      # - gopls
-      # - gping
-      # - heroic
-      # - htmlls
-      # - htmx-lsp
-      # - httpie
-      # - hugo
-      # - hyperfine
-      # - intelephense
-      # - jinja-lsp
-      # - jq
-      # - jsonls
-      # - kitty
-      # - lazygit
-      # - libreoffice
-      # - lua-language-server
-      # - markdownlint-cli
-      # - mcfly
-      # - neovide
-      # - neovim
-      # - nerdfonts
-      # - nextcloud
-      # - nginxls
-      # - nodejs
-      # - nomad
-      # - packer
-      # - pandoc
-      # - pgadmin
-      # - pipx
-      # - podman
-      # - pyright
-      # - python3
-      # - quobix-vacuum
-      # - revive
-      # - ripgrep
-      # - rust
-      # - sd
-      # - sqlfluff
-      # - sqlls
-      # - starship
-      # - stow
-      # - tailscale
-      # - tailwindcss-languageserver
-      # - templ
-      # - terraform
-      # - terraformls
-      # - thunderbird
-      # - tidy
-      # - tldr
-      # - tmux
-      # - vault
-      # - xh
-      # - yamlls
-      # - zfs
-      # - zig
-      # - zls
-      # - zoxide
-      # - zsh
-  tasks:
-    - name: Test all packages with use_local=false
-      ansible.builtin.include_role:
-        name: ansible_role_package
-      vars:
-        use_local: false
-        packages: "{{ testpkgs }}"