diff --git a/bin/install-ansible b/bin/install-ansible index 2c8eaa4..2dc5aed 100755 --- a/bin/install-ansible +++ b/bin/install-ansible @@ -2,8 +2,10 @@ set -e +PIP_BIN="pip3" + source /etc/os-release -if [[ $ID = "amzn" ]]; then +if [[ $ID = "amzn" ]] && [[ $VERSION = "2" ]]; then amazon-linux-extras enable python3.8 yum clean metadata yum install -y \ @@ -11,6 +13,12 @@ if [[ $ID = "amzn" ]]; then python38 \ python38-pip \ python38-devel +elif [[ $ID = "amzn" ]] && [[ $VERSION = "2023" ]]; then + dnf install -y \ + python3.11 \ + python3.11-pip \ + python3.11-devel + PIP_BIN="pip3.11" else # FIXME: Currently assumes Debian-based apt-get update && \ @@ -22,7 +30,7 @@ export PATH=/usr/local/bin:$PATH export PIP_DEFAULT_TIMEOUT=60 echo "Installing pipenv..." -pip3 install pipenv +$PIP_BIN install pipenv echo "Installing ansible and dependencies..." PIPENV_NOSPIN=1 PIPENV_HIDE_EMOJIS=1 pipenv sync 2>&1 | iconv -c -f utf-8 -t ascii diff --git a/roles/aws_common/molecule/cw-disabled/molecule.yml b/roles/aws_common/molecule/cw-disabled/molecule.yml index 792e5de..f33440e 100644 --- a/roles/aws_common/molecule/cw-disabled/molecule.yml +++ b/roles/aws_common/molecule/cw-disabled/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local # - name: ubuntu_lts # image: ubuntu:bionic provisioner: diff --git a/roles/aws_common/molecule/default/molecule.yml b/roles/aws_common/molecule/default/molecule.yml index 792e5de..f33440e 100644 --- a/roles/aws_common/molecule/default/molecule.yml +++ b/roles/aws_common/molecule/default/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local # - name: ubuntu_lts # image: ubuntu:bionic provisioner: diff --git a/roles/aws_common/molecule/logs-disabled/molecule.yml b/roles/aws_common/molecule/logs-disabled/molecule.yml index 792e5de..f33440e 100644 --- a/roles/aws_common/molecule/logs-disabled/molecule.yml +++ b/roles/aws_common/molecule/logs-disabled/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local # - name: ubuntu_lts # image: ubuntu:bionic provisioner: diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon-2.yml similarity index 100% rename from roles/aws_common/tasks/amazon.yml rename to roles/aws_common/tasks/amazon-2.yml diff --git a/roles/aws_common/tasks/amazon-2023.yml b/roles/aws_common/tasks/amazon-2023.yml new file mode 100644 index 0000000..cad233f --- /dev/null +++ b/roles/aws_common/tasks/amazon-2023.yml @@ -0,0 +1,25 @@ +--- + +- name: Install AWS support packages + ansible.builtin.dnf: + name: + - amazon-efs-utils + - amazon-ssm-agent + - awscli + - git + - ec2-utils + +# https://github.com/amazonlinux/amazon-linux-2023/issues/164 +- name: Ensure group "aoc" exists + ansible.builtin.group: + name: aoc + state: present + when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool + +- name: Install CloudWatch Agent + ansible.builtin.dnf: + name: + - amazon-cloudwatch-agent + when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool + notify: + - Enable CloudWatch Agent diff --git a/roles/aws_common/tasks/main.yml b/roles/aws_common/tasks/main.yml index 74206e3..6afdf7c 100644 --- a/roles/aws_common/tasks/main.yml +++ b/roles/aws_common/tasks/main.yml @@ -5,8 +5,9 @@ tags: - notest -- name: Install distro-specific prerequisites - ansible.builtin.include_tasks: "{{ ansible_distribution|lower }}.yml" +- name: Install Amazon-Linux-specific prerequisites + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml" + when: ansible_distribution | lower == 'amazon' - name: Use EC2 instance ID for cluster node ID ansible.builtin.set_fact: diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/bitbucket_config/molecule/default/molecule.yml +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml +++ b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/confluence_config/molecule/aurora/molecule.yml b/roles/confluence_config/molecule/aurora/molecule.yml index 60cba25..060647b 100644 --- a/roles/confluence_config/molecule/aurora/molecule.yml +++ b/roles/confluence_config/molecule/aurora/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/confluence_config/molecule/default/molecule.yml b/roles/confluence_config/molecule/default/molecule.yml index 60cba25..060647b 100644 --- a/roles/confluence_config/molecule/default/molecule.yml +++ b/roles/confluence_config/molecule/default/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/confluence_config/molecule/password_char_escaping/molecule.yml b/roles/confluence_config/molecule/password_char_escaping/molecule.yml index f968627..be826c9 100644 --- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml +++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml @@ -7,6 +7,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/confluence_config/molecule/system_jdk/molecule.yml b/roles/confluence_config/molecule/system_jdk/molecule.yml index 60cba25..060647b 100644 --- a/roles/confluence_config/molecule/system_jdk/molecule.yml +++ b/roles/confluence_config/molecule/system_jdk/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/confluence_config/tasks/amazon-2023_fonts.yml b/roles/confluence_config/tasks/amazon-2023_fonts.yml new file mode 100644 index 0000000..d1e86a8 --- /dev/null +++ b/roles/confluence_config/tasks/amazon-2023_fonts.yml @@ -0,0 +1,15 @@ +--- + +- name: Install Google Noto fonts for language coverage + ansible.builtin.dnf: + name: + - "google-noto-*" + +- 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 diff --git a/roles/confluence_config/tasks/amazon_fonts.yml b/roles/confluence_config/tasks/amazon-2_fonts.yml similarity index 100% rename from roles/confluence_config/tasks/amazon_fonts.yml rename to roles/confluence_config/tasks/amazon-2_fonts.yml diff --git a/roles/confluence_config/tasks/main.yml b/roles/confluence_config/tasks/main.yml index be91bd3..7e7d543 100644 --- a/roles/confluence_config/tasks/main.yml +++ b/roles/confluence_config/tasks/main.yml @@ -129,5 +129,10 @@ mode: 0755 with_items: "{{ atl_fonts_fallback_dirs }}" -- name: Install & configure distro language fonts - ansible.builtin.include_tasks: "{{ ansible_distribution|lower }}_fonts.yml" +- name: Install & configure Amazon-Linux-specific language fonts + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}_fonts.yml" + when: ansible_distribution | lower == 'amazon' + +- name: Install & configure Ubuntu/Debian-specific language fonts + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}_fonts.yml" + when: ansible_distribution | lower != 'amazon' diff --git a/roles/diy_backup/molecule/default/molecule.yml b/roles/diy_backup/molecule/default/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/diy_backup/molecule/default/molecule.yml +++ b/roles/diy_backup/molecule/default/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/jira_config/molecule/aurora/molecule.yml b/roles/jira_config/molecule/aurora/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/jira_config/molecule/aurora/molecule.yml +++ b/roles/jira_config/molecule/aurora/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/jira_config/molecule/default/molecule.yml b/roles/jira_config/molecule/default/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/jira_config/molecule/default/molecule.yml +++ b/roles/jira_config/molecule/default/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/jira_config/molecule/jira_config_props/molecule.yml b/roles/jira_config/molecule/jira_config_props/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/jira_config/molecule/jira_config_props/molecule.yml +++ b/roles/jira_config/molecule/jira_config_props/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/jira_config/molecule/password_char_escaping/molecule.yml b/roles/jira_config/molecule/password_char_escaping/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/jira_config/molecule/password_char_escaping/molecule.yml +++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/linux_common/molecule/default/molecule.yml b/roles/linux_common/molecule/default/molecule.yml index ab5b097..a30e1aa 100644 --- a/roles/linux_common/molecule/default/molecule.yml +++ b/roles/linux_common/molecule/default/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/linux_common/tasks/amazon.yml b/roles/linux_common/tasks/amazon-2.yml similarity index 92% rename from roles/linux_common/tasks/amazon.yml rename to roles/linux_common/tasks/amazon-2.yml index 859057b..827b8b0 100644 --- a/roles/linux_common/tasks/amazon.yml +++ b/roles/linux_common/tasks/amazon-2.yml @@ -1,6 +1,6 @@ --- -- name: Install Amazon-Linux-specific support packages +- name: Install Amazon-Linux-2-specific support packages ansible.builtin.yum: name: - dejavu-sans-fonts diff --git a/roles/linux_common/tasks/amazon-2023.yml b/roles/linux_common/tasks/amazon-2023.yml new file mode 100644 index 0000000..5e06469 --- /dev/null +++ b/roles/linux_common/tasks/amazon-2023.yml @@ -0,0 +1,16 @@ +--- + +- name: Install Amazon-Linux-2023-specific support packages + ansible.builtin.dnf: + name: + - dejavu-sans-fonts + - file + - git + - libxml2 + - shadow-utils + +- name: Uninstall curl-minimal (conflicts with curl) + ansible.builtin.dnf: + name: curl-minimal + state: absent + autoremove: no diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml index c46003f..6155140 100644 --- a/roles/linux_common/tasks/main.yml +++ b/roles/linux_common/tasks/main.yml @@ -2,8 +2,13 @@ # Note: Try and limit these to packages that are distro-specific, and # place commonly-named ones below. -- name: Install distro-specific prerequisites - ansible.builtin.include_tasks: "{{ ansible_distribution|lower }}.yml" +- name: Install Amazon-Linux-specific prerequisites + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml" + when: ansible_distribution | lower == 'amazon' + +- name: Install Ubuntu/Debian-specific prerequisites + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml" + when: ansible_distribution | lower != 'amazon' - name: Install common support packages ansible.builtin.package: diff --git a/roles/nfs_server/tasks/amazon.yml b/roles/nfs_server/tasks/amazon-2.yml similarity index 68% rename from roles/nfs_server/tasks/amazon.yml rename to roles/nfs_server/tasks/amazon-2.yml index 17de77d..5727fcd 100644 --- a/roles/nfs_server/tasks/amazon.yml +++ b/roles/nfs_server/tasks/amazon-2.yml @@ -1,6 +1,6 @@ --- -- name: Install Amazon-Linux-specific NFS packages +- name: Install Amazon-Linux-2-specific NFS packages ansible.builtin.yum: name: - nfs-utils diff --git a/roles/nfs_server/tasks/amazon-2023.yml b/roles/nfs_server/tasks/amazon-2023.yml new file mode 100644 index 0000000..1134b60 --- /dev/null +++ b/roles/nfs_server/tasks/amazon-2023.yml @@ -0,0 +1,14 @@ +--- + +- name: Install Amazon-Linux-2023-specific NFS packages + ansible.builtin.dnf: + name: + - nfs-utils + +- name: Create nfs.service symlink to nfs-server.service + ansible.builtin.file: + src: /usr/lib/systemd/system/nfs-server.service + dest: /usr/lib/systemd/system/nfs.service + owner: root + group: root + state: link diff --git a/roles/nfs_server/tasks/main.yml b/roles/nfs_server/tasks/main.yml index 51953b3..c2f2dc5 100644 --- a/roles/nfs_server/tasks/main.yml +++ b/roles/nfs_server/tasks/main.yml @@ -1,8 +1,12 @@ --- -- name: Install distro-specific NFS packages - ansible.builtin.include_tasks: "{{ ansible_distribution|lower }}.yml" +- name: Install Amazon-Linux-specific NFS packages + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml" + when: ansible_distribution | lower == 'amazon' +- name: Install Ubuntu/Debian-specific NFS packages + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml" + when: ansible_distribution | lower != 'amazon' - name: Create mountpoint ansible.builtin.file: diff --git a/roles/product_common/molecule/default/molecule.yml b/roles/product_common/molecule/default/molecule.yml index 8ad56a3..93b0390 100644 --- a/roles/product_common/molecule/default/molecule.yml +++ b/roles/product_common/molecule/default/molecule.yml @@ -4,6 +4,8 @@ driver: platforms: - name: amazon_linux2 image: amazonlinux:2 + - name: amazon_linux2023 + image: amazonlinux:2023 - name: ubuntu_lts image: ubuntu:bionic provisioner: diff --git a/roles/product_common/molecule/system_jdk/molecule.yml b/roles/product_common/molecule/system_jdk/molecule.yml index 8ad56a3..93b0390 100644 --- a/roles/product_common/molecule/system_jdk/molecule.yml +++ b/roles/product_common/molecule/system_jdk/molecule.yml @@ -4,6 +4,8 @@ driver: platforms: - name: amazon_linux2 image: amazonlinux:2 + - name: amazon_linux2023 + image: amazonlinux:2023 - name: ubuntu_lts image: ubuntu:bionic provisioner: diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon-2.yml similarity index 93% rename from roles/product_common/tasks/amazon.yml rename to roles/product_common/tasks/amazon-2.yml index 950c522..7538d97 100644 --- a/roles/product_common/tasks/amazon.yml +++ b/roles/product_common/tasks/amazon-2.yml @@ -1,6 +1,6 @@ --- -- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux +- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux 2 block: - name: Add Adoptium yum repository @@ -31,7 +31,7 @@ tags: - runtime_pkg -- name: Install other base packages on Amazon Linux +- name: Install other base packages on Amazon Linux 2 ansible.builtin.yum: name: - dejavu-fonts-common # Required by the installer diff --git a/roles/product_common/tasks/amazon-2023.yml b/roles/product_common/tasks/amazon-2023.yml new file mode 100644 index 0000000..6452f10 --- /dev/null +++ b/roles/product_common/tasks/amazon-2023.yml @@ -0,0 +1,37 @@ +--- + +- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux 2023 + block: + + # There is no amazonlinux/2023 package available from the Adoptium repo; AL2023 docs point to upstream compatiblity + # with Fedora 34, 35, and 36, so we use the latest of those for the Temurin package for now + - name: Add Adoptium yum repository + ansible.builtin.yum_repository: + name: Adoptium + file: adoptium + description: Adoptium Repo + baseurl: "https://packages.adoptium.net/artifactory/rpm/fedora/36/{{ ansible_architecture }}" + gpgkey: https://packages.adoptium.net/artifactory/api/gpg/key/public + gpgcheck: yes + state: present + + - name: Install Eclipse Temurin JDK + ansible.builtin.yum: + name: "temurin-{{ java_major_version }}-jdk" + state: present + + - 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 2023 + ansible.builtin.dnf: + name: + - dejavu-fonts-all # Required by the installer diff --git a/roles/product_common/tasks/main.yml b/roles/product_common/tasks/main.yml index 2e8e4d7..f687ae5 100644 --- a/roles/product_common/tasks/main.yml +++ b/roles/product_common/tasks/main.yml @@ -1,4 +1,9 @@ --- -- name: Perform distro-specific tasks - ansible.builtin.include_tasks: "{{ ansible_distribution|lower }}.yml" +- name: Perform Amazon-Linux-specific tasks + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}.yml" + when: ansible_distribution | lower == 'amazon' + +- name: Perform Ubuntu/Debian-specific tasks + ansible.builtin.include_tasks: "{{ ansible_distribution | lower }}.yml" + when: ansible_distribution | lower != 'amazon' diff --git a/roles/product_install/molecule/bitbucket_latest/molecule.yml b/roles/product_install/molecule/bitbucket_latest/molecule.yml index 60cba25..060647b 100644 --- a/roles/product_install/molecule/bitbucket_latest/molecule.yml +++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/confluence_latest/molecule.yml b/roles/product_install/molecule/confluence_latest/molecule.yml index 60cba25..060647b 100644 --- a/roles/product_install/molecule/confluence_latest/molecule.yml +++ b/roles/product_install/molecule/confluence_latest/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: 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 60cba25..060647b 100644 --- a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml +++ b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/crowd_latest/molecule.yml b/roles/product_install/molecule/crowd_latest/molecule.yml index 60cba25..060647b 100644 --- a/roles/product_install/molecule/crowd_latest/molecule.yml +++ b/roles/product_install/molecule/crowd_latest/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/default/molecule.yml b/roles/product_install/molecule/default/molecule.yml index 47b4f23..9848efe 100644 --- a/roles/product_install/molecule/default/molecule.yml +++ b/roles/product_install/molecule/default/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/jira_all/molecule.yml b/roles/product_install/molecule/jira_all/molecule.yml index 60cba25..060647b 100644 --- a/roles/product_install/molecule/jira_all/molecule.yml +++ b/roles/product_install/molecule/jira_all/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: 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 08d47e7..0ca4dcf 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: 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 08d47e7..0ca4dcf 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/jira_software_latest/molecule.yml b/roles/product_install/molecule/jira_software_latest/molecule.yml index 60cba25..060647b 100644 --- a/roles/product_install/molecule/jira_software_latest/molecule.yml +++ b/roles/product_install/molecule/jira_software_latest/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/jira_tarball/molecule.yml b/roles/product_install/molecule/jira_tarball/molecule.yml index 47b4f23..9848efe 100644 --- a/roles/product_install/molecule/jira_tarball/molecule.yml +++ b/roles/product_install/molecule/jira_tarball/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: 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 60cba25..060647b 100644 --- a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml +++ b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: 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 47b4f23..9848efe 100644 --- a/roles/product_install/molecule/jira_version_from_file/molecule.yml +++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/jira_version_latest/molecule.yml b/roles/product_install/molecule/jira_version_latest/molecule.yml index 47b4f23..9848efe 100644 --- a/roles/product_install/molecule/jira_version_latest/molecule.yml +++ b/roles/product_install/molecule/jira_version_latest/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/jira_version_override/molecule.yml b/roles/product_install/molecule/jira_version_override/molecule.yml index 47b4f23..9848efe 100644 --- a/roles/product_install/molecule/jira_version_override/molecule.yml +++ b/roles/product_install/molecule/jira_version_override/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/servicedesk3/molecule.yml b/roles/product_install/molecule/servicedesk3/molecule.yml index 71b0515..5174051 100644 --- a/roles/product_install/molecule/servicedesk3/molecule.yml +++ b/roles/product_install/molecule/servicedesk3/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/servicedesk4/molecule.yml b/roles/product_install/molecule/servicedesk4/molecule.yml index 71b0515..5174051 100644 --- a/roles/product_install/molecule/servicedesk4/molecule.yml +++ b/roles/product_install/molecule/servicedesk4/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_install/molecule/servicedesk_latest/molecule.yml b/roles/product_install/molecule/servicedesk_latest/molecule.yml index 71b0515..5174051 100644 --- a/roles/product_install/molecule/servicedesk_latest/molecule.yml +++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml @@ -6,6 +6,10 @@ platforms: image: amazonlinux:2 groups: - aws_node_local + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_startup/molecule/bitbucket/molecule.yml b/roles/product_startup/molecule/bitbucket/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/product_startup/molecule/bitbucket/molecule.yml +++ b/roles/product_startup/molecule/bitbucket/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_startup/molecule/default/molecule.yml b/roles/product_startup/molecule/default/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/product_startup/molecule/default/molecule.yml +++ b/roles/product_startup/molecule/default/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_startup/molecule/startup_restart_false/molecule.yml b/roles/product_startup/molecule/startup_restart_false/molecule.yml index d2dfab7..275f331 100644 --- a/roles/product_startup/molecule/startup_restart_false/molecule.yml +++ b/roles/product_startup/molecule/startup_restart_false/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_startup/molecule/synchrony/molecule.yml b/roles/product_startup/molecule/synchrony/molecule.yml index 52878c5..2dc2718 100644 --- a/roles/product_startup/molecule/synchrony/molecule.yml +++ b/roles/product_startup/molecule/synchrony/molecule.yml @@ -8,6 +8,12 @@ platforms: - aws_node_local ulimits: - nofile:262144:262144 + - name: amazon_linux2023 + image: amazonlinux:2023 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: