From 9ec397abd5b38d7f4a8d524597d37ad1b1504f2e Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Fri, 26 Apr 2024 13:50:17 -0500 Subject: [PATCH] ITPLT-3650 update test execution environments to newer versions of debian, ubuntu, and python --- bitbucket-pipelines.yml | 2 +- pipeline_generator/templates/bitbucket-pipelines.yml.j2 | 2 +- roles/aws_common/molecule/cw-disabled/Dockerfile.j2 | 4 ++-- roles/aws_common/molecule/cw-disabled/molecule.yml | 2 +- roles/aws_common/molecule/default/Dockerfile.j2 | 4 ++-- roles/aws_common/molecule/default/molecule.yml | 2 +- roles/aws_common/molecule/logs-disabled/Dockerfile.j2 | 4 ++-- roles/aws_common/molecule/logs-disabled/molecule.yml | 2 +- roles/bitbucket_config/molecule/default/Dockerfile.j2 | 4 ++-- roles/bitbucket_config/molecule/default/molecule.yml | 2 +- .../bitbucket_config/molecule/iam_elasticsearch/Dockerfile.j2 | 4 ++-- .../bitbucket_config/molecule/iam_elasticsearch/molecule.yml | 2 +- roles/confluence_config/molecule/aurora/Dockerfile.j2 | 4 ++-- roles/confluence_config/molecule/aurora/molecule.yml | 2 +- roles/confluence_config/molecule/default/Dockerfile.j2 | 4 ++-- roles/confluence_config/molecule/default/molecule.yml | 2 +- .../molecule/password_char_escaping/Dockerfile.j2 | 4 ++-- .../molecule/password_char_escaping/molecule.yml | 2 +- roles/confluence_config/molecule/system_jdk/Dockerfile.j2 | 4 ++-- roles/confluence_config/molecule/system_jdk/molecule.yml | 2 +- roles/diy_backup/molecule/default/Dockerfile.j2 | 4 ++-- roles/diy_backup/molecule/default/molecule.yml | 2 +- roles/jira_config/molecule/aurora/Dockerfile.j2 | 4 ++-- roles/jira_config/molecule/aurora/molecule.yml | 2 +- roles/jira_config/molecule/default/Dockerfile.j2 | 4 ++-- roles/jira_config/molecule/default/molecule.yml | 2 +- roles/jira_config/molecule/jira_config_props/Dockerfile.j2 | 4 ++-- roles/jira_config/molecule/jira_config_props/molecule.yml | 2 +- .../jira_config/molecule/password_char_escaping/Dockerfile.j2 | 4 ++-- .../jira_config/molecule/password_char_escaping/molecule.yml | 2 +- roles/linux_common/molecule/default/Dockerfile.j2 | 4 ++-- roles/linux_common/molecule/default/molecule.yml | 2 +- roles/product_common/molecule/default/Dockerfile.j2 | 4 ++-- roles/product_common/molecule/default/molecule.yml | 2 +- roles/product_common/molecule/system_jdk/Dockerfile.j2 | 4 ++-- roles/product_common/molecule/system_jdk/molecule.yml | 2 +- roles/product_install/molecule/bitbucket_latest/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/bitbucket_latest/molecule.yml | 2 +- .../product_install/molecule/confluence_latest/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/confluence_latest/molecule.yml | 2 +- .../molecule/confluence_version_with_uppercase/Dockerfile.j2 | 4 ++-- .../molecule/confluence_version_with_uppercase/molecule.yml | 2 +- roles/product_install/molecule/crowd_latest/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/crowd_latest/molecule.yml | 2 +- roles/product_install/molecule/default/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/default/molecule.yml | 2 +- roles/product_install/molecule/jira_all/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/jira_all/molecule.yml | 2 +- .../molecule/jira_cached_with_downgrade/Dockerfile.j2 | 4 ++-- .../molecule/jira_cached_with_downgrade/molecule.yml | 2 +- .../molecule/jira_cached_with_upgrade/Dockerfile.j2 | 4 ++-- .../molecule/jira_cached_with_upgrade/molecule.yml | 2 +- .../molecule/jira_software_latest/Dockerfile.j2 | 4 ++-- .../molecule/jira_software_latest/molecule.yml | 2 +- roles/product_install/molecule/jira_tarball/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/jira_tarball/molecule.yml | 2 +- .../molecule/jira_tarball_download_url/Dockerfile.j2 | 4 ++-- .../molecule/jira_tarball_download_url/molecule.yml | 2 +- .../molecule/jira_version_from_file/Dockerfile.j2 | 4 ++-- .../molecule/jira_version_from_file/molecule.yml | 2 +- .../molecule/jira_version_latest/Dockerfile.j2 | 4 ++-- .../product_install/molecule/jira_version_latest/molecule.yml | 2 +- .../molecule/jira_version_override/Dockerfile.j2 | 4 ++-- .../molecule/jira_version_override/molecule.yml | 2 +- roles/product_install/molecule/servicedesk3/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/servicedesk3/molecule.yml | 2 +- roles/product_install/molecule/servicedesk4/Dockerfile.j2 | 4 ++-- roles/product_install/molecule/servicedesk4/molecule.yml | 2 +- .../product_install/molecule/servicedesk_latest/Dockerfile.j2 | 4 ++-- .../product_install/molecule/servicedesk_latest/molecule.yml | 2 +- roles/product_startup/molecule/bitbucket/Dockerfile.j2 | 4 ++-- roles/product_startup/molecule/bitbucket/molecule.yml | 2 +- roles/product_startup/molecule/default/Dockerfile.j2 | 4 ++-- roles/product_startup/molecule/default/molecule.yml | 2 +- .../molecule/startup_restart_false/Dockerfile.j2 | 4 ++-- .../molecule/startup_restart_false/molecule.yml | 2 +- roles/product_startup/molecule/synchrony/Dockerfile.j2 | 4 ++-- roles/product_startup/molecule/synchrony/molecule.yml | 2 +- 78 files changed, 116 insertions(+), 116 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index c9a71cc..cd9ffc9 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -4,7 +4,7 @@ # # make > ../bitbucket-pipelines.yml -image: debian:bullseye +image: debian:bookworm options: size: 2x diff --git a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 index cdd3874..6b0135a 100644 --- a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 +++ b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 @@ -4,7 +4,7 @@ # # make > ../bitbucket-pipelines.yml -image: debian:bullseye +image: debian:bookworm options: size: 2x diff --git a/roles/aws_common/molecule/cw-disabled/Dockerfile.j2 b/roles/aws_common/molecule/cw-disabled/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/aws_common/molecule/cw-disabled/Dockerfile.j2 +++ b/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; \ diff --git a/roles/aws_common/molecule/cw-disabled/molecule.yml b/roles/aws_common/molecule/cw-disabled/molecule.yml index 91a9ed0..fa1afb4 100644 --- a/roles/aws_common/molecule/cw-disabled/molecule.yml +++ b/roles/aws_common/molecule/cw-disabled/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local # - name: ubuntu_lts -# image: ubuntu:bionic +# image: ubuntu:jammy provisioner: name: ansible env: diff --git a/roles/aws_common/molecule/default/Dockerfile.j2 b/roles/aws_common/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/aws_common/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/aws_common/molecule/default/molecule.yml b/roles/aws_common/molecule/default/molecule.yml index 91a9ed0..fa1afb4 100644 --- a/roles/aws_common/molecule/default/molecule.yml +++ b/roles/aws_common/molecule/default/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local # - name: ubuntu_lts -# image: ubuntu:bionic +# image: ubuntu:jammy provisioner: name: ansible env: diff --git a/roles/aws_common/molecule/logs-disabled/Dockerfile.j2 b/roles/aws_common/molecule/logs-disabled/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/aws_common/molecule/logs-disabled/Dockerfile.j2 +++ b/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; \ diff --git a/roles/aws_common/molecule/logs-disabled/molecule.yml b/roles/aws_common/molecule/logs-disabled/molecule.yml index 91a9ed0..fa1afb4 100644 --- a/roles/aws_common/molecule/logs-disabled/molecule.yml +++ b/roles/aws_common/molecule/logs-disabled/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local # - name: ubuntu_lts -# image: ubuntu:bionic +# image: ubuntu:jammy provisioner: name: ansible env: diff --git a/roles/bitbucket_config/molecule/default/Dockerfile.j2 b/roles/bitbucket_config/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/bitbucket_config/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index c0c901c..77356bc 100644 --- a/roles/bitbucket_config/molecule/default/molecule.yml +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/bitbucket_config/molecule/iam_elasticsearch/Dockerfile.j2 b/roles/bitbucket_config/molecule/iam_elasticsearch/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/bitbucket_config/molecule/iam_elasticsearch/Dockerfile.j2 +++ b/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; \ diff --git a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml index c0c901c..77356bc 100644 --- a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml +++ b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/confluence_config/molecule/aurora/Dockerfile.j2 b/roles/confluence_config/molecule/aurora/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/confluence_config/molecule/aurora/Dockerfile.j2 +++ b/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; \ diff --git a/roles/confluence_config/molecule/aurora/molecule.yml b/roles/confluence_config/molecule/aurora/molecule.yml index a279b60..f19f623 100644 --- a/roles/confluence_config/molecule/aurora/molecule.yml +++ b/roles/confluence_config/molecule/aurora/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/confluence_config/molecule/default/Dockerfile.j2 b/roles/confluence_config/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/confluence_config/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/confluence_config/molecule/default/molecule.yml b/roles/confluence_config/molecule/default/molecule.yml index a279b60..f19f623 100644 --- a/roles/confluence_config/molecule/default/molecule.yml +++ b/roles/confluence_config/molecule/default/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/confluence_config/molecule/password_char_escaping/Dockerfile.j2 b/roles/confluence_config/molecule/password_char_escaping/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/confluence_config/molecule/password_char_escaping/Dockerfile.j2 +++ b/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; \ diff --git a/roles/confluence_config/molecule/password_char_escaping/molecule.yml b/roles/confluence_config/molecule/password_char_escaping/molecule.yml index b403d66..ec1bc90 100644 --- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml +++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml @@ -8,7 +8,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/confluence_config/molecule/system_jdk/Dockerfile.j2 b/roles/confluence_config/molecule/system_jdk/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/confluence_config/molecule/system_jdk/Dockerfile.j2 +++ b/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; \ diff --git a/roles/confluence_config/molecule/system_jdk/molecule.yml b/roles/confluence_config/molecule/system_jdk/molecule.yml index a279b60..f19f623 100644 --- a/roles/confluence_config/molecule/system_jdk/molecule.yml +++ b/roles/confluence_config/molecule/system_jdk/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/diy_backup/molecule/default/Dockerfile.j2 b/roles/diy_backup/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/diy_backup/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/diy_backup/molecule/default/molecule.yml b/roles/diy_backup/molecule/default/molecule.yml index c0c901c..77356bc 100644 --- a/roles/diy_backup/molecule/default/molecule.yml +++ b/roles/diy_backup/molecule/default/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/jira_config/molecule/aurora/Dockerfile.j2 b/roles/jira_config/molecule/aurora/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/jira_config/molecule/aurora/Dockerfile.j2 +++ b/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; \ diff --git a/roles/jira_config/molecule/aurora/molecule.yml b/roles/jira_config/molecule/aurora/molecule.yml index c0c901c..77356bc 100644 --- a/roles/jira_config/molecule/aurora/molecule.yml +++ b/roles/jira_config/molecule/aurora/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/jira_config/molecule/default/Dockerfile.j2 b/roles/jira_config/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/jira_config/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/jira_config/molecule/default/molecule.yml b/roles/jira_config/molecule/default/molecule.yml index c0c901c..77356bc 100644 --- a/roles/jira_config/molecule/default/molecule.yml +++ b/roles/jira_config/molecule/default/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/jira_config/molecule/jira_config_props/Dockerfile.j2 b/roles/jira_config/molecule/jira_config_props/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/jira_config/molecule/jira_config_props/Dockerfile.j2 +++ b/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; \ diff --git a/roles/jira_config/molecule/jira_config_props/molecule.yml b/roles/jira_config/molecule/jira_config_props/molecule.yml index c0c901c..77356bc 100644 --- a/roles/jira_config/molecule/jira_config_props/molecule.yml +++ b/roles/jira_config/molecule/jira_config_props/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/jira_config/molecule/password_char_escaping/Dockerfile.j2 b/roles/jira_config/molecule/password_char_escaping/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/jira_config/molecule/password_char_escaping/Dockerfile.j2 +++ b/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; \ diff --git a/roles/jira_config/molecule/password_char_escaping/molecule.yml b/roles/jira_config/molecule/password_char_escaping/molecule.yml index c0c901c..77356bc 100644 --- a/roles/jira_config/molecule/password_char_escaping/molecule.yml +++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/linux_common/molecule/default/Dockerfile.j2 b/roles/linux_common/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/linux_common/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/linux_common/molecule/default/molecule.yml b/roles/linux_common/molecule/default/molecule.yml index b64c01c..2e61b76 100644 --- a/roles/linux_common/molecule/default/molecule.yml +++ b/roles/linux_common/molecule/default/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_common/molecule/default/Dockerfile.j2 b/roles/product_common/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_common/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_common/molecule/default/molecule.yml b/roles/product_common/molecule/default/molecule.yml index e639eeb..fd78aea 100644 --- a/roles/product_common/molecule/default/molecule.yml +++ b/roles/product_common/molecule/default/molecule.yml @@ -5,7 +5,7 @@ platforms: - name: amazon_linux2023 image: amazonlinux:2023 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy provisioner: name: ansible env: diff --git a/roles/product_common/molecule/system_jdk/Dockerfile.j2 b/roles/product_common/molecule/system_jdk/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_common/molecule/system_jdk/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_common/molecule/system_jdk/molecule.yml b/roles/product_common/molecule/system_jdk/molecule.yml index e639eeb..fd78aea 100644 --- a/roles/product_common/molecule/system_jdk/molecule.yml +++ b/roles/product_common/molecule/system_jdk/molecule.yml @@ -5,7 +5,7 @@ platforms: - name: amazon_linux2023 image: amazonlinux:2023 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy provisioner: name: ansible env: diff --git a/roles/product_install/molecule/bitbucket_latest/Dockerfile.j2 b/roles/product_install/molecule/bitbucket_latest/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/bitbucket_latest/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/bitbucket_latest/molecule.yml b/roles/product_install/molecule/bitbucket_latest/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/bitbucket_latest/molecule.yml +++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/confluence_latest/Dockerfile.j2 b/roles/product_install/molecule/confluence_latest/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/confluence_latest/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/confluence_latest/molecule.yml b/roles/product_install/molecule/confluence_latest/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/confluence_latest/molecule.yml +++ b/roles/product_install/molecule/confluence_latest/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/confluence_version_with_uppercase/Dockerfile.j2 b/roles/product_install/molecule/confluence_version_with_uppercase/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/confluence_version_with_uppercase/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml +++ b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/crowd_latest/Dockerfile.j2 b/roles/product_install/molecule/crowd_latest/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/crowd_latest/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/crowd_latest/molecule.yml b/roles/product_install/molecule/crowd_latest/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/crowd_latest/molecule.yml +++ b/roles/product_install/molecule/crowd_latest/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/default/Dockerfile.j2 b/roles/product_install/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/default/molecule.yml b/roles/product_install/molecule/default/molecule.yml index 443b286..9b27a5f 100644 --- a/roles/product_install/molecule/default/molecule.yml +++ b/roles/product_install/molecule/default/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_all/Dockerfile.j2 b/roles/product_install/molecule/jira_all/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_all/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_all/molecule.yml b/roles/product_install/molecule/jira_all/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/jira_all/molecule.yml +++ b/roles/product_install/molecule/jira_all/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_cached_with_downgrade/Dockerfile.j2 b/roles/product_install/molecule/jira_cached_with_downgrade/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml index 50fe099..32dfe38 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_cached_with_upgrade/Dockerfile.j2 b/roles/product_install/molecule/jira_cached_with_upgrade/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml index 50fe099..32dfe38 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_software_latest/Dockerfile.j2 b/roles/product_install/molecule/jira_software_latest/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_software_latest/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_software_latest/molecule.yml b/roles/product_install/molecule/jira_software_latest/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/jira_software_latest/molecule.yml +++ b/roles/product_install/molecule/jira_software_latest/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_tarball/Dockerfile.j2 b/roles/product_install/molecule/jira_tarball/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_tarball/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_tarball/molecule.yml b/roles/product_install/molecule/jira_tarball/molecule.yml index 443b286..9b27a5f 100644 --- a/roles/product_install/molecule/jira_tarball/molecule.yml +++ b/roles/product_install/molecule/jira_tarball/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_tarball_download_url/Dockerfile.j2 b/roles/product_install/molecule/jira_tarball_download_url/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_tarball_download_url/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml index a279b60..f19f623 100644 --- a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml +++ b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_version_from_file/Dockerfile.j2 b/roles/product_install/molecule/jira_version_from_file/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_version_from_file/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_version_from_file/molecule.yml b/roles/product_install/molecule/jira_version_from_file/molecule.yml index 443b286..9b27a5f 100644 --- a/roles/product_install/molecule/jira_version_from_file/molecule.yml +++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_version_latest/Dockerfile.j2 b/roles/product_install/molecule/jira_version_latest/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_version_latest/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_version_latest/molecule.yml b/roles/product_install/molecule/jira_version_latest/molecule.yml index 443b286..9b27a5f 100644 --- a/roles/product_install/molecule/jira_version_latest/molecule.yml +++ b/roles/product_install/molecule/jira_version_latest/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/jira_version_override/Dockerfile.j2 b/roles/product_install/molecule/jira_version_override/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/jira_version_override/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/jira_version_override/molecule.yml b/roles/product_install/molecule/jira_version_override/molecule.yml index 443b286..9b27a5f 100644 --- a/roles/product_install/molecule/jira_version_override/molecule.yml +++ b/roles/product_install/molecule/jira_version_override/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/servicedesk3/Dockerfile.j2 b/roles/product_install/molecule/servicedesk3/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/servicedesk3/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/servicedesk3/molecule.yml b/roles/product_install/molecule/servicedesk3/molecule.yml index 82c3993..e073631 100644 --- a/roles/product_install/molecule/servicedesk3/molecule.yml +++ b/roles/product_install/molecule/servicedesk3/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/servicedesk4/Dockerfile.j2 b/roles/product_install/molecule/servicedesk4/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/servicedesk4/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/servicedesk4/molecule.yml b/roles/product_install/molecule/servicedesk4/molecule.yml index 82c3993..e073631 100644 --- a/roles/product_install/molecule/servicedesk4/molecule.yml +++ b/roles/product_install/molecule/servicedesk4/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_install/molecule/servicedesk_latest/Dockerfile.j2 b/roles/product_install/molecule/servicedesk_latest/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_install/molecule/servicedesk_latest/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_install/molecule/servicedesk_latest/molecule.yml b/roles/product_install/molecule/servicedesk_latest/molecule.yml index 82c3993..e073631 100644 --- a/roles/product_install/molecule/servicedesk_latest/molecule.yml +++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml @@ -7,7 +7,7 @@ platforms: groups: - aws_node_local - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local provisioner: diff --git a/roles/product_startup/molecule/bitbucket/Dockerfile.j2 b/roles/product_startup/molecule/bitbucket/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_startup/molecule/bitbucket/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_startup/molecule/bitbucket/molecule.yml b/roles/product_startup/molecule/bitbucket/molecule.yml index c0c901c..77356bc 100644 --- a/roles/product_startup/molecule/bitbucket/molecule.yml +++ b/roles/product_startup/molecule/bitbucket/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/product_startup/molecule/default/Dockerfile.j2 b/roles/product_startup/molecule/default/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_startup/molecule/default/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_startup/molecule/default/molecule.yml b/roles/product_startup/molecule/default/molecule.yml index c0c901c..77356bc 100644 --- a/roles/product_startup/molecule/default/molecule.yml +++ b/roles/product_startup/molecule/default/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/product_startup/molecule/startup_restart_false/Dockerfile.j2 b/roles/product_startup/molecule/startup_restart_false/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_startup/molecule/startup_restart_false/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_startup/molecule/startup_restart_false/molecule.yml b/roles/product_startup/molecule/startup_restart_false/molecule.yml index 2f51934..0e199fc 100644 --- a/roles/product_startup/molecule/startup_restart_false/molecule.yml +++ b/roles/product_startup/molecule/startup_restart_false/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: diff --git a/roles/product_startup/molecule/synchrony/Dockerfile.j2 b/roles/product_startup/molecule/synchrony/Dockerfile.j2 index e6aa95d..fbd7b34 100644 --- a/roles/product_startup/molecule/synchrony/Dockerfile.j2 +++ b/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; \ diff --git a/roles/product_startup/molecule/synchrony/molecule.yml b/roles/product_startup/molecule/synchrony/molecule.yml index c0c901c..77356bc 100644 --- a/roles/product_startup/molecule/synchrony/molecule.yml +++ b/roles/product_startup/molecule/synchrony/molecule.yml @@ -9,7 +9,7 @@ platforms: ulimits: - nofile:262144:262144 - name: ubuntu_lts - image: ubuntu:bionic + image: ubuntu:jammy groups: - aws_node_local ulimits: