Use roles from collection, add ubuntu 22.04 and various fixes.

ansible/.ansible-lint → .ansible-lint

@@ -57,6 +57,8 @@ warn_list:
   - skip_this_tag
   - git-latest
   - experimental  # experimental is included in the implicit list
+  - yaml[commas]
+  - yaml[line-length]
   # - role-name
 
 # Offline mode disables installation of requirements.yml

.github/workflows/main.yml

@@ -19,13 +19,16 @@ on:
 
 jobs:
 
-  test:
-    name: Test on docker
+  test_end_to_end:
+    name: Test on various OSes
+
+    runs-on: ubuntu-latest
 
-    runs-on: ${{ matrix.os }}
     strategy:
+      fail-fast: true
       matrix:
-        os: [ubuntu-20.04]
+        os: ["ubuntu-20.04", 'ubuntu-22.04']
+        python: ["python3.7", "python3.8", "python3.9", "python3.10"]
 
     steps:
       - uses: actions/checkout@v2
@@ -37,5 +40,27 @@ jobs:
           GIT_BRANCH=${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}
           echo "GIT_BRANCH=$GIT_BRANCH" >> $GITHUB_ENV
 
-      - name: Build
-        run: ./docker-entrypoint.sh
+          echo "REPOSITORY=${GITHUB_REPOSITORY#*/}" >> $GITHUB_ENV
+
+      - name: Build docker image
+        run: >
+          docker build \
+            -t automation:${{ matrix.os }} \
+            -f docker/Dockerfile.${{ matrix.os }} \
+            .
+
+      - name: End to end test using locally checkedout code
+        run: >
+          docker run automation:${{ matrix.os }} \
+            -e GIT_BRANCH=$GIT_BRANCH \
+            -e REPOSITORY=$REPOSITORY \
+            -e PYTHON_VERSION=${{ matrix.python }}
+
+      - name: End to end test with code fetch from remote
+        run: >
+          docker run automation:${{ matrix.os }} \
+            -e GIT_BRANCH=$GIT_BRANCH \
+            -e REPOSITORY=$REPOSITORY \
+            -e PYTHON_VERSION=${{ matrix.python }} \
+            rm -f "/opt/automated-workstation/app/scripts/add-cronjob-debian.sh"; \
+            /opt/docker/docker-entrypoint.sh

ansible/.gitignore → .gitignore

@@ -1 +1,3 @@
+# Ansible
 .ansibleFactsCacheDir/*
+*.retry

.yamllint.yml

@@ -0,0 +1,14 @@
+---
+
+extends: default
+
+rules:
+  braces:
+    max-spaces-inside: -1
+
+  commas:
+    # Disable check for space after commas so that we can align our values visually.
+    max-spaces-after: -1
+
+  line-length:
+    max: 160

Makefile

@@ -0,0 +1,16 @@
+run:
+	./scripts/one-time-debian.sh
+	./scripts/scheduled-debian.sh
+
+lint:
+	. ./.venv/bin/activate
+	ansible-lint -c .ansible-lint
+
+prepare_env:
+	python3.9 -m venv .venv && \
+		. ./.venv/bin/activate && \
+		pip install --upgrade \
+			pip \
+			ansible \
+			ansible-lint \
+			yamllint

README.md

@@ -1,6 +1,6 @@
 # Overview
 
-This is an effort to provide scripts to setup my workstation in an automated, reproducible way.
+This is an effort to provide scripts to setup my workstation in an automated, reproducible way. The scripts are meant to be generic and parameterised based on the provided group_vars.
 
 ## Status
 [![ubuntu-ci status](https://github.com/amolofos/automated-workstation-setup/workflows/ubuntu-ci/badge.svg)](https://github.com/amolofos/automated-workstation-setup/actions)

ansible/ansible.cfg

@@ -61,11 +61,12 @@ gathering = smart
 #inject_facts_as_vars = True
 
 # Paths to search for collections, colon separated
-# collections_paths = ~/.ansible/collections:/usr/share/ansible/collections
+#collections_paths = ~/.ansible/collections:/usr/share/ansible/collections
+collections_paths = ./collections:~/.ansible/collections
 
 # Paths to search for roles, colon separated
 #roles_path = ~/.ansible/roles:/usr/share/ansible/roles:/etc/ansible/roles
-roles_path = ./roles
+roles_path = ./roles:~/.ansible/roles
 
 # Host key checking is enabled by default
 #host_key_checking = True
@@ -86,7 +87,7 @@ roles_path = ./roles
 #
 # Enable callback plugins, they can output to stdout but cannot be 'stdout' type.
 #callback_whitelist = timer, mail
-callback_whitelist = profile_tasks
+callbacks_enabled = profile_tasks
 
 # Determine whether includes in tasks and handlers are "static" by
 # default. As of 2.0, includes are dynamic by default. Setting these

ansible/group_vars/all/software-debian.yml

@@ -168,6 +168,10 @@ software:
         - python3.9-dev
         - python3.9-distutils
         - python3.9-venv
+        - python3.10
+        - python3.10-dev
+        - python3.10-distutils
+        - python3.10-venv
         - python3-apt
         - python3-pip
     media:
@@ -189,7 +193,7 @@ software:
         - xmltodict
         - yamllint
 
-# Each command should output "Changed" to stdout so the task reports it as changed.
+  # Each command should output "Changed" to stdout so the task reports it as changed. yaml[line-length]
   custom:
     # Should we create a role to install the latest go version?
     - "if [ ! -d /usr/local/go ] || [ \"`/usr/local/go/bin/go version | grep go1.17 | wc -l`\" -eq 0 ]; then sudo rm -rf /usr/local/go && wget --quiet https://dl.google.com/go/go1.17.linux-amd64.tar.gz -O - | sudo tar -xz -C /usr/local; echo Changed; fi"
@@ -211,6 +215,10 @@ software:
         path: "/usr/bin/python3.8"
         link: "/usr/bin/python"
         priority: 1000
+      - name: "python"
+        path: "/usr/bin/python3.9"
+        link: "/usr/bin/python"
+        priority: 1000
       - name: "vi"
         path: "/usr/bin/nvim"
         link: "/bin/vi"

ansible/inventory/workstation/workstation_inventory

@@ -2,4 +2,4 @@
 localhost ansible_host=127.0.0.1 ansible_connection=local
 
 [workstation:vars]
-ansible_python_interpreter=/usr/bin/python3.8
+ansible_python_interpreter=/usr/bin/python3

ansible/requirements.yml

@@ -0,0 +1,10 @@
+---
+
+collections:
+
+  - community.docker
+
+  - name: amolofos.ansible_collection_workstation
+    type: git
+    source: "https://github.com/amolofos/ansible_collection_workstation.git"
+    version: "feature/re-structure"