From 342848424ffab929e74f027184edaaec8ec2d74b Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Thu, 15 Dec 2022 14:43:40 -0600 Subject: [PATCH] add amazonlinux:2022 to list of images for testing via molecule --- roles/aws_common/molecule/cw-disabled/molecule.yml | 4 ++++ roles/aws_common/molecule/default/molecule.yml | 4 ++++ roles/aws_common/molecule/logs-disabled/molecule.yml | 4 ++++ roles/bitbucket_config/molecule/default/molecule.yml | 6 ++++++ .../molecule/iam_elasticsearch/molecule.yml | 6 ++++++ roles/confluence_config/molecule/aurora/molecule.yml | 4 ++++ roles/confluence_config/molecule/default/molecule.yml | 4 ++++ .../molecule/password_char_escaping/molecule.yml | 4 ++++ roles/confluence_config/molecule/system_jdk/molecule.yml | 4 ++++ roles/diy_backup/molecule/default/molecule.yml | 6 ++++++ roles/jira_config/molecule/aurora/molecule.yml | 6 ++++++ roles/jira_config/molecule/default/molecule.yml | 6 ++++++ roles/jira_config/molecule/jira_config_props/molecule.yml | 6 ++++++ .../molecule/password_char_escaping/molecule.yml | 6 ++++++ roles/linux_common/molecule/default/molecule.yml | 4 ++++ roles/product_common/molecule/default/molecule.yml | 2 ++ roles/product_common/molecule/system_jdk/molecule.yml | 2 ++ .../product_install/molecule/bitbucket_latest/molecule.yml | 4 ++++ .../product_install/molecule/confluence_latest/molecule.yml | 4 ++++ .../molecule/confluence_version_with_uppercase/molecule.yml | 4 ++++ roles/product_install/molecule/crowd_latest/molecule.yml | 4 ++++ roles/product_install/molecule/default/molecule.yml | 4 ++++ roles/product_install/molecule/jira_all/molecule.yml | 4 ++++ .../molecule/jira_cached_with_downgrade/molecule.yml | 4 ++++ .../molecule/jira_cached_with_upgrade/molecule.yml | 4 ++++ .../molecule/jira_software_latest/molecule.yml | 4 ++++ roles/product_install/molecule/jira_tarball/molecule.yml | 4 ++++ .../molecule/jira_version_from_file/molecule.yml | 4 ++++ .../molecule/jira_version_latest/molecule.yml | 4 ++++ .../molecule/jira_version_override/molecule.yml | 4 ++++ roles/product_install/molecule/servicedesk3/molecule.yml | 4 ++++ roles/product_install/molecule/servicedesk4/molecule.yml | 4 ++++ .../molecule/servicedesk_latest/molecule.yml | 4 ++++ roles/product_startup/molecule/bitbucket/molecule.yml | 6 ++++++ roles/product_startup/molecule/default/molecule.yml | 6 ++++++ .../molecule/startup_restart_false/molecule.yml | 6 ++++++ roles/product_startup/molecule/synchrony/molecule.yml | 6 ++++++ 37 files changed, 166 insertions(+) diff --git a/roles/aws_common/molecule/cw-disabled/molecule.yml b/roles/aws_common/molecule/cw-disabled/molecule.yml index 792e5de..9f1685f 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_linux2022 + image: amazonlinux:2022 + 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..9f1685f 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_linux2022 + image: amazonlinux:2022 + 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..9f1685f 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_linux2022 + image: amazonlinux:2022 + groups: + - aws_node_local # - name: ubuntu_lts # image: ubuntu:bionic provisioner: diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index 52878c5..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..c6a3939 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/diy_backup/molecule/default/molecule.yml b/roles/diy_backup/molecule/default/molecule.yml index 52878c5..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..547ffb3 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_linux2022 + image: amazonlinux:2022 + groups: + - aws_node_local - name: ubuntu_lts image: ubuntu:bionic groups: diff --git a/roles/product_common/molecule/default/molecule.yml b/roles/product_common/molecule/default/molecule.yml index 8ad56a3..6f5a46c 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_linux2022 + image: amazonlinux:2022 - 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..6f5a46c 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_linux2022 + image: amazonlinux:2022 - name: ubuntu_lts image: ubuntu:bionic provisioner: diff --git a/roles/product_install/molecule/bitbucket_latest/molecule.yml b/roles/product_install/molecule/bitbucket_latest/molecule.yml index 60cba25..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..54f22be 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..e2b9388 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_linux2022 + image: amazonlinux:2022 + 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..e2b9388 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_linux2022 + image: amazonlinux:2022 + 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..3422f23 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_linux2022 + image: amazonlinux:2022 + 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..54f22be 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_linux2022 + image: amazonlinux:2022 + 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..54f22be 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_linux2022 + image: amazonlinux:2022 + 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..54f22be 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_linux2022 + image: amazonlinux:2022 + 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..54f22be 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_linux2022 + image: amazonlinux:2022 + 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..94d4337 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_linux2022 + image: amazonlinux:2022 + 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..94d4337 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_linux2022 + image: amazonlinux:2022 + 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..94d4337 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + 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..67aa17e 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_linux2022 + image: amazonlinux:2022 + 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..a1ced17 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_linux2022 + image: amazonlinux:2022 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:bionic groups: