Merge pull request #17 from MonolithProjects/develop

Support for Fedora 32 and Ubuntu 20 Former-commit-id: 8408b67
MonolithProjects · May 17, 2020 · b024519 · b024519
2 parents 257132d + d0000a1
commit b024519
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 26 deletions.
diff --git a/.github/workflows/galaxy.yml b/.github/workflows/galaxy.yml
@@ -13,4 +13,5 @@ jobs:
       - name: galaxy
         uses: robertdebock/[email protected]
         with:
-          galaxy_api_key: ${{ secrets.galaxy_api_key }}
+          galaxy_api_key: ${{ secrets.galaxy_api_key }}
+
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -17,25 +17,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           path: "${{ github.repository }}"
-      - name: molecule
-        uses: robertdebock/molecule-action@2.0.0
+      - name: Molecule for Ansible
+        uses: MonolithProjects/action-molecule@v1.0.1
         env:
-          PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
-  # uninstall:
-  #   needs:
-  #     - test
-  #   runs-on: ubuntu-latest
-  #   strategy:
-  #     fail-fast: false
-  #   steps:
-  #     - name: checkout
-  #       uses: actions/checkout@v2
-  #       with:
-  #         path: "${{ github.repository }}"
-  #     - name: molecule
-  #       uses: robertdebock/[email protected]
-  #       with:
-  #         entrypoint: /usr/local/bin/molecule
-  #         optionst: "converge -- --tags uninstall"
-  #       env:
-          # PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
+          PERSONAL_ACCESS_TOKEN: ${{ secrets.PERSONAL_ACCESS_TOKEN }}
diff --git a/README.md b/README.md
@@ -13,8 +13,10 @@ This role will deploy or redeploy or uninstall and register or unregister local
 * Supported Linux distros:
   * CentOS/RHEL 7,8
   * Debian 9,10
-  * Fedora 31,30,29,28
-  * Ubuntu 16,18
+  * Fedora 32,31,30,29,28
+  * Ubuntu 16,18,20
+
+  **Note:** Fedora 32 and Ubuntu 20 must use Ansible 2.9.8+. Other distros/releases will work also with older 2.8.0+ Ansible.
 
 * System must have access to the GitHub.
 
@@ -26,7 +28,7 @@ Personal Access Token for GitHub account can be created [here](https://github.co
 * Runner user has to be pre-created.  
   Recommended role: `monolithprojects.user_management`
 
-* CentOS/Fedora systems require EPEL repository.  
+* CentOS systems require EPEL repository.  
   Recommended role: `robertdebock.epel`
 
 ## Role Variables

diff --git a/meta/main.yml b/meta/main.yml
@@ -5,18 +5,20 @@
     description: Deploy Github Actions private runner
     company: MonolithProjects
     license: "license (MIT)"
-    min_ansible_version: 2.8
+    min_ansible_version: 2.9.8
     platforms:
       - name: EL
         versions:
           - 6
           - 7
+          - 8
       - name: Fedora
         versions:
           - 28
           - 29
           - 30
           - 31
+          - 32
       - name: Debian
         versions:
           - buster
@@ -25,6 +27,7 @@
         versions:
           - xenial
           - bionic
+          - focal
     galaxy_tags:
       - github
       - actions

diff --git a/molecule/default/molecule.yml b/molecule/default/molecule.yml
@@ -2,7 +2,9 @@
 driver:
   name: docker
 lint: |
+  set -e
   yamllint .
+  ansible-lint
 platforms:
   - name: CentOS7
     image: monolithprojects/systemd-centos7:latest
@@ -34,6 +36,16 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: yes
     pre_build_image: yes
+  - name: Fedora32
+    image: monolithprojects/systemd-fedora32:latest
+    command: /sbin/init
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: yes
+    pre_build_image: yes
   - name: Ubuntu16
     image: monolithprojects/systemd-ubuntu16:latest
     command: /sbin/init
@@ -54,6 +66,16 @@ platforms:
       - /sys/fs/cgroup:/sys/fs/cgroup:ro
     privileged: yes
     pre_build_image: yes
+  - name: Ubuntu20
+    image: monolithprojects/systemd-ubuntu20:latest
+    command: /sbin/init
+    tmpfs:
+      - /run
+      - /tmp
+    volumes:
+      - /sys/fs/cgroup:/sys/fs/cgroup:ro
+    privileged: yes
+    pre_build_image: yes
   - name: Debian9
     image: monolithprojects/systemd-debian9:latest
     command: /sbin/init
@@ -83,6 +105,14 @@ provisioner:
   inventory:
     host_vars:
       CentOS8:
+        ansible_python_interpreter: /usr/bin/python3      
+      Debian9:
+        ansible_python_interpreter: /usr/bin/python3
+      Debian10:
+        ansible_python_interpreter: /usr/bin/python3
+      Ubuntu18:
+        ansible_python_interpreter: /usr/bin/python3
+      Ubuntu20:
         ansible_python_interpreter: /usr/bin/python3
 verifier:
   name: ansible

diff --git a/tasks/install_deps.yml b/tasks/install_deps.yml
@@ -55,6 +55,21 @@
   tags:
     - install
 
+- name: Install dependencies on Ubuntu Focal systems
+  package:
+    pkg:
+      - liblttng-ust0
+      - libkrb5-3
+      - zlib1g
+      - libssl1.1
+      - libicu66
+    state: present
+    update_cache: yes
+  when: (ansible_distribution == "Ubuntu" and ansible_distribution_major_version == "20")
+  tags:
+    - install
+
+
 - name: Install dependencies on RHEL/CentOS/Fedora systems
   package:
     name: