ITPLT-3650 drop support for Amazon Linux 2

2025-12-14 00:43:06 -06:00 · 2024-04-26 13:42:17 -05:00
parent ecb262a15f
commit 677f2a85ca
46 changed files with 44 additions and 300 deletions
--- a/roles/aws_common/molecule/cw-disabled/molecule.yml
+++ b/roles/aws_common/molecule/cw-disabled/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/aws_common/molecule/default/molecule.yml
+++ b/roles/aws_common/molecule/default/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/aws_common/molecule/logs-disabled/molecule.yml
+++ b/roles/aws_common/molecule/logs-disabled/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/aws_common/tasks/amazon-2.yml
+++ b/roles/aws_common/tasks/amazon-2.yml
@@ -1,22 +1,5 @@
 ---

- name: Install AWS support packages
-  ansible.builtin.yum:
-    name:
-      - amazon-efs-utils
-      - amazon-ssm-agent
-      - awscli
-      - git
-      - ec2-utils
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
-
- name: Install CloudWatch Agent
-  ansible.builtin.yum:
-    name:
-      - "{{ aws_cloudwatch_agent_rpm }}"
-  when: atl_aws_enable_cloudwatch is defined and atl_aws_enable_cloudwatch | bool
-  notify:
-    - Enable CloudWatch Agent
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."
--- a/roles/bitbucket_config/molecule/default/molecule.yml
+++ b/roles/bitbucket_config/molecule/default/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml
+++ b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/confluence_config/molecule/aurora/molecule.yml
+++ b/roles/confluence_config/molecule/aurora/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/confluence_config/molecule/default/molecule.yml
+++ b/roles/confluence_config/molecule/default/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml
+++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml
@@ -3,10 +3,6 @@ driver:
  name: docker

 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/confluence_config/molecule/system_jdk/molecule.yml
+++ b/roles/confluence_config/molecule/system_jdk/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/confluence_config/tasks/amazon-2_fonts.yml
+++ b/roles/confluence_config/tasks/amazon-2_fonts.yml
@@ -1,17 +1,5 @@
 ---

- name: Install Google Noto fonts for language coverage
-  ansible.builtin.yum:
-    name:
-      - "google-noto-*"
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
-
- name: Link the language fonts into the JDK
-  # Not idiomatic, but cleaner than messing with nested lookups...
-  ansible.builtin.shell:
-    cmd: "ln -sf /usr/share/fonts/google-noto*/* {{ item }}/"
-    creates: "{{ item }}/NotoSansJavanese-Regular.ttf"
-    warn: false
-  with_items: "{{ atl_fonts_fallback_dirs }}"
-  changed_when: false  # For Molecule idempotence check
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."
--- a/roles/diy_backup/molecule/default/molecule.yml
+++ b/roles/diy_backup/molecule/default/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/jira_config/molecule/aurora/molecule.yml
+++ b/roles/jira_config/molecule/aurora/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/jira_config/molecule/default/molecule.yml
+++ b/roles/jira_config/molecule/default/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/jira_config/molecule/jira_config_props/molecule.yml
+++ b/roles/jira_config/molecule/jira_config_props/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/jira_config/molecule/password_char_escaping/molecule.yml
+++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/linux_common/molecule/default/molecule.yml
+++ b/roles/linux_common/molecule/default/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/linux_common/tasks/amazon-2.yml
+++ b/roles/linux_common/tasks/amazon-2.yml
@@ -1,22 +1,5 @@
 ---

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

- name: Install Amazon-Linux-2-specific NFS packages
-  ansible.builtin.yum:
-    name:
-      - nfs-utils
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."
--- a/roles/product_common/molecule/default/molecule.yml
+++ b/roles/product_common/molecule/default/molecule.yml
@@ -2,8 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
  - name: amazon_linux2023
    image: amazonlinux:2023
  - name: ubuntu_lts
--- a/roles/product_common/molecule/system_jdk/molecule.yml
+++ b/roles/product_common/molecule/system_jdk/molecule.yml
@@ -2,8 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
  - name: amazon_linux2023
    image: amazonlinux:2023
  - name: ubuntu_lts
--- a/roles/product_common/tasks/amazon-2.yml
+++ b/roles/product_common/tasks/amazon-2.yml
@@ -1,45 +1,5 @@
 ---

- name: Add Adoptium repo and install Eclipse Temurin JDK if necessary on Amazon Linux 2
-  block:
-
-    - name: Add Adoptium yum repository
-      ansible.builtin.yum_repository:
-        name: Adoptium
-        file: adoptium
-        description: Adoptium Repo
-        baseurl:
-          - "https://packages.adoptium.net/artifactory/rpm/amazonlinux/{{ ansible_distribution_version }}/{{ ansible_architecture }}"
-          - "{{ atl_adoptium_alternate_url is defined | ternary(atl_adoptium_alternate_url, '') }}"
-        gpgkey:
-          - https://packages.adoptium.net/artifactory/api/gpg/key/public
-          - "{{ atl_adoptium_gpgkey_alternate_url is defined | ternary(atl_adoptium_gpgkey_alternate_url, '') }}"
-        gpgcheck: yes
-        state: present
-      tags:
-        - molecule-idempotence-notest
-
-    - name: Install Eclipse Temurin JDK
-      ansible.builtin.yum:
-        name: "temurin-{{ java_major_version }}-jdk"
-        state: present
-      vars:
-        ansible_python_interpreter: /usr/bin/python2
-
-    - name: Ensure common JDK symlink exists
-      community.general.alternatives:
-        link: "/usr/lib/jvm/java"
-        name: "java_sdk"
-        path: "/usr/lib/jvm/temurin-{{ java_major_version }}-jdk"
-        priority: 99
-
-  when: atl_use_system_jdk | bool
-  tags:
-    - runtime_pkg
-
- name: Install other base packages on Amazon Linux 2
-  ansible.builtin.yum:
-    name:
-      - dejavu-fonts-common  # Required by the installer
-  vars:
-    ansible_python_interpreter: /usr/bin/python2
+- name: Amazon Linux 2 no longer supported
+  fail:
+    msg: "Amazon Linux 2 is no longer supported; see README.md for supported operating systems/environments."
--- a/roles/product_install/molecule/bitbucket_latest/molecule.yml
+++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/confluence_latest/molecule.yml
+++ b/roles/product_install/molecule/confluence_latest/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml
+++ b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/crowd_latest/molecule.yml
+++ b/roles/product_install/molecule/crowd_latest/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/default/molecule.yml
+++ b/roles/product_install/molecule/default/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_all/molecule.yml
+++ b/roles/product_install/molecule/jira_all/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml
+++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml
+++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_software_latest/molecule.yml
+++ b/roles/product_install/molecule/jira_software_latest/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_tarball/molecule.yml
+++ b/roles/product_install/molecule/jira_tarball/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml
+++ b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_version_from_file/molecule.yml
+++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_version_latest/molecule.yml
+++ b/roles/product_install/molecule/jira_version_latest/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/jira_version_override/molecule.yml
+++ b/roles/product_install/molecule/jira_version_override/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/servicedesk3/molecule.yml
+++ b/roles/product_install/molecule/servicedesk3/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/servicedesk4/molecule.yml
+++ b/roles/product_install/molecule/servicedesk4/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_install/molecule/servicedesk_latest/molecule.yml
+++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml
@@ -2,10 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_startup/molecule/bitbucket/molecule.yml
+++ b/roles/product_startup/molecule/bitbucket/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_startup/molecule/default/molecule.yml
+++ b/roles/product_startup/molecule/default/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_startup/molecule/startup_restart_false/molecule.yml
+++ b/roles/product_startup/molecule/startup_restart_false/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups:
--- a/roles/product_startup/molecule/synchrony/molecule.yml
+++ b/roles/product_startup/molecule/synchrony/molecule.yml
@@ -2,12 +2,6 @@
 driver:
  name: docker
 platforms:
-  - name: amazon_linux2
-    image: amazonlinux:2
-    groups:
-      - aws_node_local
-    ulimits:
-      - nofile:262144:262144
  - name: amazon_linux2023
    image: amazonlinux:2023
    groups: