Merge pull request #23 from Oefenweb/consistency-changes

Consistency changes

Author: tersmitten

.github/workflows/ci.yml

@@ -15,12 +15,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.x'
+          python-version: '3 - 3.13'
 
       - name: Install test dependencies
         run: |
@@ -44,25 +44,27 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - distro: ubuntu1604
-            ansible-version: '>=2.10, <2.11'
-          - distro: ubuntu1604
           - distro: ubuntu1804
+            ansible-version: '>=9, <10'
           - distro: ubuntu2004
+            ansible-version: '>=12, <13'
+          - distro: ubuntu2204
+          - distro: ubuntu2404
 
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           path: "${{ github.repository }}"
 
       - name: Set up Python 3
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v6
         with:
-          python-version: '3.x'
+          python-version: '3 - 3.13'
 
       - name: Install test dependencies
-        run: pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
+        run: |
+          pip install 'ansible${{ matrix.ansible-version }}' molecule-plugins[docker] docker
 
       - name: Run Molecule tests
         run: |

.github/workflows/release.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out the codebase
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
 
       - name: Publish to Galaxy
         uses: robertdebock/galaxy-action@1.2.0

README.md

@@ -17,8 +17,9 @@ Set up (the latest version of) jenkins in Ubuntu systems.
 
 * `jenkins_install` [default: `[]`]: (Additional) Packages to install
 
-* `jenkins_assume_java_provided` [default: `false`]: Whether or not to assume that java (`jre` and `jdk`) is already installed
+* `jenkins_assume_java_provided` [default: `false`]: Whether to assume that java (`jre` and `jdk`) is already installed
 
+* `jenkins_java` [optional]: Java binary to use (e.g. `/usr/lib/jvm/java-21-openjdk-amd64/bin/java`)
 * `jenkins_java_args` [default: `['-Djava.awt.headless=true']`]: Java arguments to pass
 * `jenkins_user` [default: `jenkins`]: User to be invoked as
 * `jenkins_group` [default: `jenkins`]: Group to be invoked as
@@ -32,12 +33,12 @@ Set up (the latest version of) jenkins in Ubuntu systems.
 
 * `jenkins_plugins` [default: `[]`]: Plugins to install (**Does not work (for now)**)
 
-* `jenkins_tasks_mailer_manage` [default: `true`]: Whether or not to manage `hudson.tasks.Mailer.xml` (for sending notifications)
+* `jenkins_tasks_mailer_manage` [default: `true`]: Whether to manage `hudson.tasks.Mailer.xml` (for sending notifications)
 * `jenkins_tasks_mailer_default_suffix` [default: `'@localhost.localdomain'`]: Default user e-mail suffix
 * `jenkins_tasks_mailer_smtp_host` [default: `localhost`]: SMTP server
 * `jenkins_tasks_mailer_smtp_port` [default: `25`]: SMTP port
-* `jenkins_tasks_mailer_use_ssl` [default: `false`]: Whether or not to use ssl
-* `jenkins_tasks_mailer_use_smtp_auth` [default: `false`]: Whether or not to use SMTP Authentication
+* `jenkins_tasks_mailer_use_ssl` [default: `false`]: Whether to use ssl
+* `jenkins_tasks_mailer_use_smtp_auth` [default: `false`]: Whether to use SMTP Authentication
 * `jenkins_tasks_mailer_smtp_auth_username` [default: `''`]: SMTP Authentication username
 * `jenkins_tasks_mailer_smtp_auth_password` [default: `''`]: SMTP Authentication password
 * `jenkins_tasks_mailer_charset` [default: `UTF-8`]: Charset
@@ -49,6 +50,7 @@ None
 ## Recommended
 
 * `ansible-oracle-java` ([see](https://github.com/Oefenweb/ansible-oracle-java), when `jenkins_assume_java_provided` is `true`)
+* `ansible-openjdk` ([see](https://github.com/Oefenweb/ansible-openjdk), when `jenkins_assume_java_provided` is `true`)
 
 #### Example
 

Vagrantfile

@@ -4,13 +4,6 @@
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
 boxes = [
-  {
-    :name => "ubuntu-1604",
-    :box => "bento/ubuntu-16.04",
-    :ip => '10.0.0.12',
-    :cpu => "50",
-    :ram => "256"
-  },
   {
     :name => "ubuntu-1804",
     :box => "bento/ubuntu-18.04",
@@ -25,6 +18,20 @@ boxes = [
     :cpu => "50",
     :ram => "512"
   },
+  {
+    :name => "ubuntu-2204",
+    :box => "bento/ubuntu-22.04",
+    :ip => '10.0.0.15',
+    :cpu => "50",
+    :ram => "512"
+  },
+  {
+    :name => "ubuntu-2404",
+    :box => "bento/ubuntu-24.04",
+    :ip => '10.0.0.16',
+    :cpu => "50",
+    :ram => "512"
+  },
 ]
 
 Vagrant.configure("2") do |config|

meta/main.yml

@@ -11,9 +11,10 @@ galaxy_info:
   platforms:
     - name: Ubuntu
       versions:
-        - xenial
         - bionic
         - focal
+        - jammy
+        - noble
   galaxy_tags:
     - system
     - development

molecule/default/collections.yml

@@ -1,6 +1,2 @@
 ---
-collections:
-  - name: community.docker
-    version: '>=1.2.0,<2'
-  - name: community.general
-    version: '>=2,<3'
+collections: []

molecule/default/molecule.yml

@@ -5,7 +5,7 @@ driver:
   name: docker
 platforms:
   - name: instance
-    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu1604}-ansible:latest"
+    image: "geerlingguy/docker-${MOLECULE_DISTRO:-ubuntu2004}-ansible:latest"
     command: ${MOLECULE_DOCKER_COMMAND:-""}
     volumes:
       - /sys/fs/cgroup:/sys/fs/cgroup:rw

tasks/cli.yml

@@ -20,7 +20,7 @@
     state: directory
     owner: root
     group: root
-    mode: 0755
+    mode: '0755'
   tags:
     - jenkins-cli-directory
 
@@ -30,7 +30,7 @@
     dest: "{{ jenkins_cli_path }}"
     owner: root
     group: root
-    mode: 0644
+    mode: '0644'
   register: _jenkins_cli_download
   until: "'OK' in _jenkins_cli_download.msg or 'file already exists' in _jenkins_cli_download.msg"
   retries: 10

tasks/configure.yml

@@ -6,7 +6,7 @@
     dest: /etc/default/jenkins
     owner: root
     group: root
-    mode: 0644
+    mode: '0644'
   register: _jenkins_update_etc_default
   tags:
     - jenkins-configure-configuration
@@ -17,7 +17,7 @@
     dest: "{{ jenkins_home }}/hudson.tasks.Mailer.xml"
     owner: "{{ jenkins_user }}"
     group: "{{ jenkins_group }}"
-    mode: 0644
+    mode: '0644'
   notify: restart jenkins
   when: jenkins_tasks_mailer_manage | bool
   tags:

tasks/plugins.yml

@@ -6,7 +6,7 @@
     state: directory
     owner: "{{ jenkins_user }}"
     group: "{{ jenkins_group }}"
-    mode: 0755
+    mode: '0755'
   tags:
     - jenkins-plugins-directory