.gitlab-ci.yml

@@ -5,12 +5,12 @@ stages:
 
 Run Workstation playbook on fedora:
   stage: dnf_systems
-  image: fedora:latest
+  image: fedora
   script:
   - dnf install -y ansible python3-pip
   - pip3 install -r ci-requirements.txt
   - mkdir /tmp/artifacts
-  - bash play_workstation.sh
+  - ANSIBLE_CONFIG=$(pwd)/ansible.cfg JUNIT_OUTPUT_DIR=/tmp/artifacts ansible-playbook workstation.yml || (mv /tmp/artifacts/workstation-*.xml report.xml && exit 1)
   - cp /tmp/artifacts/workstation-*.xml report.xml
   - ls /tmp/artifacts
   artifacts:
@@ -20,13 +20,13 @@ Run Workstation playbook on fedora:
 
 Run Workstation playbook on ubuntu:
   stage: apt_systems
-  image: ubuntu:latest
+  image: ubuntu
   script:
   - apt-get update
   - apt-get install -y ansible python3-pip python3-apt
   - pip3 install -r ci-requirements.txt
   - mkdir /tmp/artifacts
-  - bash play_workstation.sh
+  - ANSIBLE_CONFIG=$(pwd)/ansible.cfg JUNIT_OUTPUT_DIR=/tmp/artifacts ansible-playbook workstation.yml || (mv /tmp/artifacts/workstation-*.xml report.xml && exit 1)
   - mv /tmp/artifacts/workstation-*.xml report.xml
   - ls /tmp/artifacts
   artifacts:

play_workstation.sh

@@ -1,5 +0,0 @@
-# Install Dependencies
-ansible-galaxy collection install community.general
-
-# Run Playbook
-ANSIBLE_CONFIG=$(pwd)/ansible.cfg JUNIT_OUTPUT_DIR=/tmp/artifacts ansible-playbook playbooks/workstation.yml || (mv /tmp/artifacts/workstation-*.xml report.xml && exit 1)

playbooks/roles/flatpaks/tasks/main.yml

@@ -1,22 +0,0 @@
----
-- name: Add the flathub flatpak repository remote
-  community.general.flatpak_remote:
-    name: flathub
-    state: present
-    flatpakrepo_url: https://dl.flathub.org/repo/flathub.flatpakrepo
-
-- name: Install multiple packages
-  community.general.flatpak:
-    name:
-    - org.gimp.GIMP
-    - org.telegram.desktop
-    - net.christianbeier.Gromit-MPX
-    - md.obsidian.Obsidian
-    - com.bitwarden.desktop
-    - com.github.tchx84.Flatseal
-    - com.github.alexr4535.siglo
-    - com.nextcloud.desktopclient.nextcloud
-    - com.github.unrud.VideoDownloader
-    - fyi.zoey.Boop-GTK
-    - nl.hjdskes.gcolor3
-    state: present

roles/base/tasks/main.yml

@@ -6,16 +6,9 @@
       - bat
       - wget
       - git
-      - flatpak
+#     - podman
     state: present
 
-- name: Some more packages (RedHat based)
-  become: true
-  package:
-    name:
-    - podman
-  when: ansible_facts['os_family'] == "RedHat"
-
 - name: Copy gitconfig base
   copy:
     src: dotfiles/gitconfig 

workstation.yml

@@ -9,4 +9,3 @@
     - vim_user
     - alacritty_user
     - lsd_user
-    - flatpaks