Merged in ITPLT-3650-ansible-core-216 (pull request #212)

ITPLT-3650 ansible-core 2.16

Approved-by: Geoff Jacobs

.pre-commit-config.yaml

@@ -3,7 +3,7 @@ default_install_hook_types: [pre-commit, prepare-commit-msg]
 default_stages: [pre-commit]
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-executables-have-shebangs
       - id: check-merge-conflict
@@ -12,21 +12,21 @@ repos:
         exclude: '(vault.yml.template|filter_catalina.yaml.j2)'
       - id: trailing-whitespace
   - repo: https://github.com/avilaton/add-msg-issue-prefix-hook
-    rev: v0.0.9
+    rev: v0.0.11
     hooks:
       - id: add-msg-issue-prefix
         args:
           - --template={}
           - --pattern=[a-zA-Z0-9]{1,10}-[0-9]{1,6}
   - repo: https://github.com/ansible/ansible-lint.git
-    rev: v6.12.2
+    rev: v24.2.2
     hooks:
       - id: ansible-lint
         additional_dependencies:
           - .
-          - ansible-core==2.13.10
+          - ansible-core==2.16.6
           - jmespath
-        language_version: python3.8
+        language_version: python3.11
   - repo: https://github.com/IamTheFij/ansible-pre-commit.git
     rev: v0.1.2
     hooks:

DEVELOPMENT.md

@@ -1,9 +1,7 @@
 ## Prerequisites
 
 You should have the following software installed:
-* Python; 3.8 or newer
-  * You may also need the Python development packages depending on how it’s installed
-  * Note that the runtime still requires Python 2 for certain tasks on Amazon Linux 2, but is not necessary for local development
+* Python; 3.10 or newer (you may also need the Python development packages depending on how it’s installed)
 * Python Virtualenv
 * Docker
 * Cloudtoken
@@ -19,24 +17,22 @@ All other requirements will be installed under Virtualenv.
 ### Step 1.2: Install development environment dependencies
 
 To ensure compatibility we specify a specific Ansible version; currently
-ansible-core 2.13.x. We do this with [Pipenv](https://docs.pipenv.org/) to lock
+ansible-core 2.16.x. We do this with [Pipenv](https://docs.pipenv.org/) to lock
 the dependency tree. There are 2 main ways to do this; either directly if
 packaged, or via pip...
 
-    # Ubuntu 22.04+, Debian 11+
-    sudo apt-get install python3-dev python3-pip
+    # Ubuntu 22.04+, Debian 12+
+    sudo apt-get install python3-dev python3-pip pipenv
 
-    # Amazon Linux 2
-    sudo amazon-linux-extras enable python3.8
-    sudo yum install python38 python38-pip python38-devel python-lxml
+    # Amazon Linux 2023
+    sudo dnf install python3.11 python3.11-pip python3.11-devel
+    pip3.11 install pipenv
 
     # Mac via Homebrew
-    brew install libpq openssl@3 python@X.x  # (where "X.x") is 3.8 or newer
+    brew install libpq openssl@3 python@X.x  # (where "X.x") is 3.1 or newer
     export PATH="/opt/homebrew/opt/libpq/bin:$PATH"
     export LDFLAGS="-L/opt/homebrew/opt/openssl@3/lib"
     export CPPFLAGS="-I/opt/homebrew/opt/openssl@3/include"
-
-    # Finally
     pip3 install pipenv
 
 ### Step 1.3: Enter the development environment
@@ -62,7 +58,7 @@ when collections are installed via `ansible-galaxy`:
 
 [Molecule](https://molecule.readthedocs.io/en/stable/) is a testing framework for
 Ansible. We use this to test the functionality of individual and groups of roles,
-and to ensure cross-platform compatibility (currently Amazon Linux 2 and Ubuntu LTS).
+and to ensure cross-platform compatibility (currently Amazon Linux 2023 and Ubuntu LTS).
 
 We’re going to check that the role that downloads the products works for both
 Jira Core and Confluence, on boths supported Linux distributions. So run the

Pipfile

@@ -4,18 +4,19 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-ansible-core = "==2.13.10"
-cryptography = "==41.0.6"
-boto3 = "==1.26.158"
-botocore = "==1.29.158"
-lxml = "==4.9.2"
-psycopg2-binary = "==2.9.6"
+ansible-core = "==2.16.6"
+cryptography = "==42.0.5"
+boto3 = "==1.34.92"
+botocore = "==1.34.92"
+lxml = "==5.2.1"
+psycopg2-binary = "==2.9.9"
 
 [dev-packages]
-molecule = "==4.0.4"
+molecule = "==24.2.1"
 molecule-docker = "==2.1.0"
-ansible-compat = "==3.0.2"
-docker = "==6.0.0"
+molecule-plugins = {extras = ["docker"], version = "==23.5.3"}
+ansible-compat = "==4.1.11"
+docker = "==7.0.0"
 pytest = "*"
 pytest-testinfra = "*"
 

README.md

@@ -61,6 +61,20 @@ them in the `Custom command-line parameters for Ansible` field:
 
     -e atl_product_download_url=http://s3.amazon.com/atlassian/jira-9.0.0-PRE-TEST.tar.gz -e atl_use_system_jdk=true -e atl_download_format=tarball
 
+## Operating system/environment requirements
+
+The roles in this repository currently target:
+
+* Ansible-core 2.16
+* Python >= 3.10 (as required by ansible-core 2.16)
+* Amazon Linux 2023 and Debian 12+ (including derivatives, i.e., Ubuntu 22.04+) where the system-installable Python meets the above requirement
+
+To use a previous version of this repository and the roles/playbooks within, your application nodes must clone/checkout
+a previous commit that supports the desired OS and/or Ansible version. For instance, to continue using Ansible 2.13 on
+Amazon Linux 2, use branch "ansible-core-2.13" and/or commit ID `e5af2cf649f72bb5c9d50d0057ddae4a5c99b6f9`. If using one
+of the previously-provided AWS CloudFormation templates, you must set set the **Deployment Automation Branch** parameter
+to "ansible-core-2.13" and/or manually set the stack's "pinned-ansible-sha" SSM Parameter to the referenced commit ID.
+
 ### Other customizable parameters
 
 For more deployment customization options, consult the following files for parameters you can 

ansible.cfg

@@ -1,4 +1,4 @@
 [defaults]
 retry_files_enabled = False
 callbacks_enabled = profile_tasks
-collections_paths = ./
+collections_path = ./

bin/install-ansible

@@ -2,38 +2,31 @@
 
 set -e
 
-PIP_BIN="pip3"
 PIPENV_PYTHON="3"
 
 source /etc/os-release
 if [[ $ID = "amzn" ]] && [[ $VERSION = "2" ]]; then
-    amazon-linux-extras enable python3.8
-    yum clean metadata
-    yum install -y \
-        python2-pip \
-        python38 \
-        python38-pip \
-        python38-devel
+    echo "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."
+    exit 1
 elif [[ $ID = "amzn" ]] && [[ $VERSION = "2023" ]]; then
     dnf install -y \
         python3.11 \
         python3.11-pip \
         python3.11-devel
-    PIP_BIN="pip3.11"
+    echo "Installing pipenv..."
+    pip3.11 install pipenv
     PIPENV_PYTHON="3.11"
 else
     # FIXME: Currently assumes Debian-based
     apt-get update && \
     apt-get install -y \
             python3-dev \
-            python3-pip
+            python3-pip \
+            pipenv
 fi
 export PATH=/usr/local/bin:$PATH
 export PIP_DEFAULT_TIMEOUT=60
 
-echo "Installing pipenv..."
-$PIP_BIN install pipenv
-
 echo "Installing ansible and dependencies..."
 PIPENV_NOSPIN=1 PIPENV_HIDE_EMOJIS=1 pipenv --python $PIPENV_PYTHON sync 2>&1 | iconv -c -f utf-8 -t ascii
 

bitbucket-pipelines.yml

@@ -4,7 +4,7 @@
 #
 #    make > ../bitbucket-pipelines.yml
 
-image: debian:bullseye
+image: debian:bookworm
 options:
   size: 2x
 

pipeline_generator/templates/bitbucket-pipelines.yml.j2

@@ -4,7 +4,7 @@
 #
 #    make > ../bitbucket-pipelines.yml
 
-image: debian:bullseye
+image: debian:bookworm
 options:
   size: 2x
 

requirements.yml

@@ -1,12 +1,12 @@
 ---
 collections:
   - name: amazon.aws
-    version: "6.1.0"
+    version: "7.5.0"
   - name: ansible.posix
     version: "1.5.4"
   - name: community.docker
-    version: "3.4.8"
+    version: "3.9.0"
   - name: community.general
-    version: "7.1.0"
+    version: "8.6.0"
   - name: community.postgresql
-    version: "3.0.0"
+    version: "3.4.0"

roles/aws_common/handlers/main.yml

@@ -1,14 +1,14 @@
 ---
 
 - name: Enable CloudWatch Agent
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
     name: "amazon-cloudwatch-agent.service"
     daemon_reload: true
     enabled: true
   when: atl_aws_agent_restart | bool
 
 - name: Restart CloudWatch Agent
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
     name: "amazon-cloudwatch-agent.service"
     enabled: true
     state: restarted

roles/aws_common/molecule/cw-disabled/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/aws_common/molecule/cw-disabled/molecule.yml

@@ -2,20 +2,16 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
 # - name: ubuntu_lts
-#   image: ubuntu:bionic
+#   image: ubuntu:jammy
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   inventory:
     links:
       group_vars: ../../../../group_vars/

roles/aws_common/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/aws_common/molecule/default/molecule.yml

@@ -2,20 +2,16 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
 # - name: ubuntu_lts
-#   image: ubuntu:bionic
+#   image: ubuntu:jammy
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   inventory:
     links:
       group_vars: ../../../../group_vars/

roles/aws_common/molecule/logs-disabled/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/aws_common/molecule/logs-disabled/molecule.yml

@@ -2,20 +2,16 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
 # - name: ubuntu_lts
-#   image: ubuntu:bionic
+#   image: ubuntu:jammy
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   inventory:
     links:
       group_vars: ../../../../group_vars/

roles/aws_common/tasks/amazon-2.yml

@@ -1,22 +1,5 @@
 ---
 
-- name: Install AWS support packages
-  ansible.builtin.yum:
-    name:
-      - amazon-efs-utils
-      - amazon-ssm-agent
-      - awscli
-      - git
-      - ec2-utils
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
-
-- name: Install CloudWatch Agent
-  ansible.builtin.yum:
-    name:
-      - "{{ aws_cloudwatch_agent_rpm }}"
-  when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool
-  notify:
-    - Enable CloudWatch Agent
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."

roles/bitbucket_config/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/bitbucket_config/molecule/default/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/bitbucket_config/molecule/iam_elasticsearch/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/confluence_config/molecule/aurora/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/confluence_config/molecule/aurora/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/confluence_config/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/confluence_config/molecule/default/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/confluence_config/molecule/password_char_escaping/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/confluence_config/molecule/password_char_escaping/molecule.yml

@@ -3,22 +3,20 @@ driver:
   name: docker
 
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/confluence_config/molecule/system_jdk/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/confluence_config/molecule/system_jdk/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/confluence_config/tasks/amazon-2023_fonts.yml

@@ -10,6 +10,5 @@
   ansible.builtin.shell:
     cmd: "ln -sf /usr/share/fonts/google-noto*/* {{ item }}/"
     creates: "{{ item }}/NotoSansJavanese-Regular.ttf"
-    warn: false
   with_items: "{{ atl_fonts_fallback_dirs }}"
   changed_when: false  # For Molecule idempotence check

roles/confluence_config/tasks/amazon-2_fonts.yml

@@ -1,17 +1,5 @@
 ---
 
-- name: Install Google Noto fonts for language coverage
-  ansible.builtin.yum:
-    name:
-      - "google-noto-*"
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
-
-- name: Link the language fonts into the JDK
-  # Not idiomatic, but cleaner than messing with nested lookups...
-  ansible.builtin.shell:
-    cmd: "ln -sf /usr/share/fonts/google-noto*/* {{ item }}/"
-    creates: "{{ item }}/NotoSansJavanese-Regular.ttf"
-    warn: false
-  with_items: "{{ atl_fonts_fallback_dirs }}"
-  changed_when: false  # For Molecule idempotence check
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."

roles/confluence_config/tasks/ubuntu_fonts.yml

@@ -10,6 +10,5 @@
   ansible.builtin.shell:
     cmd: "ln -sf /usr/share/fonts/truetype/noto/* {{ item }}/"
     creates: "{{ item }}/NotoSansJavanese-Regular.ttf"
-    warn: false
   with_items: "{{ atl_fonts_fallback_dirs }}"
   changed_when: false  # For Molecule idempotence check

roles/diy_backup/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/diy_backup/molecule/default/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/jira_config/molecule/aurora/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/jira_config/molecule/aurora/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/jira_config/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/jira_config/molecule/default/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/jira_config/molecule/jira_config_props/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/jira_config/molecule/jira_config_props/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/jira_config/molecule/password_char_escaping/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/jira_config/molecule/password_char_escaping/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/linux_common/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/linux_common/molecule/default/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   inventory:
     links:
       group_vars: ../../../../group_vars/

roles/linux_common/tasks/amazon-2.yml

@@ -1,22 +1,5 @@
 ---
 
-- name: Install Amazon-Linux-2-specific support packages
-  ansible.builtin.yum:
-    name:
-      - dejavu-sans-fonts
-      - file
-      - git-{{ git_version }}
-      - libxml2
-      - shadow-utils
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
-
-- name: Limit the SSH ciphers
-  ansible.builtin.lineinfile:
-    path: "/etc/ssh/sshd_config"
-    # Drop insecure ciphers, currently 3des-cbc only. You can get the
-    # full list with `sshd -T | grep -i ciphers`
-    regexp: '^[Cc]iphers'
-    line: "Ciphers chacha20-poly1305@openssh.com,aes128-ctr,aes192-ctr,aes256-ctr,aes128-gcm@openssh.com,aes256-gcm@openssh.com,aes128-cbc,aes192-cbc,aes256-cbc,blowfish-cbc,cast128-cbc"
-    insertbefore: "BOF"
-  ignore_errors: yes  # No sshd == no problem
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."

roles/linux_common/tasks/main.yml

@@ -41,7 +41,7 @@
   register: systemd_config_changed
 
 - name: Force systemd to reload daemon configuration
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
     daemon_reload: yes
   when:
     - systemd_config_changed is defined

roles/nfs_server/tasks/amazon-2.yml

@@ -1,8 +1,5 @@
 ---
 
-- name: Install Amazon-Linux-2-specific NFS packages
-  ansible.builtin.yum:
-    name:
-      - nfs-utils
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."

roles/nfs_server/tasks/amazon-2023.yml

@@ -14,5 +14,5 @@
     state: link
 
 - name: Reload systemd services
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
     daemon_reload: yes

roles/product_common/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_common/molecule/default/molecule.yml

@@ -2,15 +2,13 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
   - name: amazon_linux2023
     image: amazonlinux:2023
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
 verifier:
   name: testinfra

roles/product_common/molecule/system_jdk/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_common/molecule/system_jdk/molecule.yml

@@ -2,15 +2,13 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
   - name: amazon_linux2023
     image: amazonlinux:2023
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
 verifier:
   name: testinfra

roles/product_common/tasks/amazon-2.yml

@@ -1,45 +1,5 @@
 ---
 
-- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux 2
-  block:
-
-    - name: Add Adoptium yum repository
-      ansible.builtin.yum_repository:
-        name: Adoptium
-        file: adoptium
-        description: Adoptium Repo
-        baseurl:
-          - "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}"
-          - "{{ atl_adoptium_alternate_url is defined | ternary(atl_adoptium_alternate_url, '') }}"
-        gpgkey:
-          - https://packages.adoptium.net/artifactory/api/gpg/key/public
-          - "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, '') }}"
-        gpgcheck: yes
-        state: present
-      tags:
-        - molecule-idempotence-notest
-
-    - name: Install Eclipse Temurin JDK
-      ansible.builtin.yum:
-        name: "temurin-{{ java_major_version }}-jdk"
-        state: present
-      vars:
-        ansible_python_interpreter: /usr/bin/python2
-
-    - name: Ensure common JDK symlink exists
-      community.general.alternatives:
-        link: "/usr/lib/jvm/java"
-        name: "java_sdk"
-        path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk"
-        priority: 99
-
-  when: atl_use_system_jdk | bool
-  tags:
-    - runtime_pkg
-
-- name: Install other base packages on Amazon Linux 2
-  ansible.builtin.yum:
-    name:
-      - dejavu-fonts-common  # Required by the installer
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."

roles/product_install/molecule/bitbucket_latest/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/bitbucket_latest/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/confluence_latest/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/confluence_latest/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/confluence_version_with_uppercase/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/crowd_latest/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/crowd_latest/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/default/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_all/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_all/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_cached_with_downgrade/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     vvv: true
     skip-tags: runtime_pkg

roles/product_install/molecule/jira_cached_with_upgrade/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     vvv: true
     skip-tags: runtime_pkg

roles/product_install/molecule/jira_software_latest/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_software_latest/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_tarball/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_tarball/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_tarball_download_url/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_tarball_download_url/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_version_from_file/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_version_from_file/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_version_latest/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_version_latest/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/jira_version_override/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/jira_version_override/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_install/molecule/servicedesk3/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/servicedesk3/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     vv: true
     skip-tags: runtime_pkg

roles/product_install/molecule/servicedesk4/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/servicedesk4/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     vv: true
     skip-tags: runtime_pkg

roles/product_install/molecule/servicedesk_latest/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_install/molecule/servicedesk_latest/molecule.yml

@@ -2,22 +2,20 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     vv: true
     skip-tags: runtime_pkg

roles/product_startup/molecule/bitbucket/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_startup/molecule/bitbucket/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_startup/molecule/default/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_startup/molecule/default/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory:

roles/product_startup/molecule/startup_restart_false/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_startup/molecule/startup_restart_false/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
     ATL_STARTUP_RESTART: "false"
   options:
     skip-tags: runtime_pkg

roles/product_startup/molecule/synchrony/Dockerfile.j2

@@ -6,8 +6,8 @@ FROM {{ item.registry.url }}/{{ item.image }}
 FROM {{ item.image }}
 {% endif %}
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
-    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python3 sudo bash ca-certificates file && apt-get clean; \
+    elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python3.11 sudo python3.11-devel python*-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml && zypper clean -a; \
     elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \

roles/product_startup/molecule/synchrony/molecule.yml

@@ -2,28 +2,24 @@
 driver:
   name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
   - name: amazon_linux2023
     image: amazonlinux:2023
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
   - name: ubuntu_lts
-    image: ubuntu:bionic
+    image: ubuntu:jammy
     groups:
       - aws_node_local
+    platform: linux/amd64
     ulimits:
       - nofile:262144:262144
 provisioner:
   name: ansible
   env:
-    ANSIBLE_COLLECTIONS_PATH: "../../"
+    ANSIBLE_COLLECTIONS_PATH: "../../../../"
   options:
     skip-tags: runtime_pkg
   inventory: