From 91cc5c3d1a4384596a3f924a26ecc502902b52c8 Mon Sep 17 00:00:00 2001 From: Lee Goolsbee Date: Fri, 26 Apr 2024 20:27:09 -0500 Subject: [PATCH] ITPLT-3650 define platform as linux/amd64 for molecule; fixes ability to run on Apple Silicon and should continue to work fine in pipelines --- roles/bitbucket_config/molecule/default/molecule.yml | 2 ++ roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml | 2 ++ roles/confluence_config/molecule/aurora/molecule.yml | 2 ++ roles/confluence_config/molecule/default/molecule.yml | 2 ++ .../molecule/password_char_escaping/molecule.yml | 2 ++ roles/confluence_config/molecule/system_jdk/molecule.yml | 2 ++ roles/diy_backup/molecule/default/molecule.yml | 2 ++ roles/jira_config/molecule/aurora/molecule.yml | 2 ++ roles/jira_config/molecule/default/molecule.yml | 2 ++ roles/jira_config/molecule/jira_config_props/molecule.yml | 2 ++ roles/jira_config/molecule/password_char_escaping/molecule.yml | 2 ++ roles/linux_common/molecule/default/molecule.yml | 2 ++ roles/product_install/molecule/bitbucket_latest/molecule.yml | 2 ++ roles/product_install/molecule/confluence_latest/molecule.yml | 2 ++ .../molecule/confluence_version_with_uppercase/molecule.yml | 2 ++ roles/product_install/molecule/crowd_latest/molecule.yml | 2 ++ roles/product_install/molecule/default/molecule.yml | 2 ++ roles/product_install/molecule/jira_all/molecule.yml | 2 ++ .../molecule/jira_cached_with_downgrade/molecule.yml | 2 ++ .../molecule/jira_cached_with_upgrade/molecule.yml | 2 ++ .../product_install/molecule/jira_software_latest/molecule.yml | 2 ++ roles/product_install/molecule/jira_tarball/molecule.yml | 2 ++ .../molecule/jira_tarball_download_url/molecule.yml | 2 ++ .../molecule/jira_version_from_file/molecule.yml | 2 ++ roles/product_install/molecule/jira_version_latest/molecule.yml | 2 ++ .../product_install/molecule/jira_version_override/molecule.yml | 2 ++ roles/product_install/molecule/servicedesk3/molecule.yml | 2 ++ roles/product_install/molecule/servicedesk4/molecule.yml | 2 ++ roles/product_install/molecule/servicedesk_latest/molecule.yml | 2 ++ roles/product_startup/molecule/bitbucket/molecule.yml | 2 ++ roles/product_startup/molecule/default/molecule.yml | 2 ++ .../product_startup/molecule/startup_restart_false/molecule.yml | 2 ++ roles/product_startup/molecule/synchrony/molecule.yml | 2 ++ 33 files changed, 66 insertions(+) diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index 77356bc..07706c7 100644 --- a/roles/bitbucket_config/molecule/default/molecule.yml +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml index 77356bc..07706c7 100644 --- a/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml +++ b/roles/bitbucket_config/molecule/iam_elasticsearch/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/confluence_config/molecule/aurora/molecule.yml b/roles/confluence_config/molecule/aurora/molecule.yml index f19f623..1f8d749 100644 --- a/roles/confluence_config/molecule/aurora/molecule.yml +++ b/roles/confluence_config/molecule/aurora/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/confluence_config/molecule/default/molecule.yml b/roles/confluence_config/molecule/default/molecule.yml index f19f623..1f8d749 100644 --- a/roles/confluence_config/molecule/default/molecule.yml +++ b/roles/confluence_config/molecule/default/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/confluence_config/molecule/password_char_escaping/molecule.yml b/roles/confluence_config/molecule/password_char_escaping/molecule.yml index ec1bc90..5b3f590 100644 --- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml +++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml @@ -7,10 +7,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/confluence_config/molecule/system_jdk/molecule.yml b/roles/confluence_config/molecule/system_jdk/molecule.yml index f19f623..1f8d749 100644 --- a/roles/confluence_config/molecule/system_jdk/molecule.yml +++ b/roles/confluence_config/molecule/system_jdk/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/diy_backup/molecule/default/molecule.yml b/roles/diy_backup/molecule/default/molecule.yml index 77356bc..07706c7 100644 --- a/roles/diy_backup/molecule/default/molecule.yml +++ b/roles/diy_backup/molecule/default/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/jira_config/molecule/aurora/molecule.yml b/roles/jira_config/molecule/aurora/molecule.yml index 77356bc..07706c7 100644 --- a/roles/jira_config/molecule/aurora/molecule.yml +++ b/roles/jira_config/molecule/aurora/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/jira_config/molecule/default/molecule.yml b/roles/jira_config/molecule/default/molecule.yml index 77356bc..07706c7 100644 --- a/roles/jira_config/molecule/default/molecule.yml +++ b/roles/jira_config/molecule/default/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/jira_config/molecule/jira_config_props/molecule.yml b/roles/jira_config/molecule/jira_config_props/molecule.yml index 77356bc..07706c7 100644 --- a/roles/jira_config/molecule/jira_config_props/molecule.yml +++ b/roles/jira_config/molecule/jira_config_props/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/jira_config/molecule/password_char_escaping/molecule.yml b/roles/jira_config/molecule/password_char_escaping/molecule.yml index 77356bc..07706c7 100644 --- a/roles/jira_config/molecule/password_char_escaping/molecule.yml +++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/linux_common/molecule/default/molecule.yml b/roles/linux_common/molecule/default/molecule.yml index 2e61b76..e77fc96 100644 --- a/roles/linux_common/molecule/default/molecule.yml +++ b/roles/linux_common/molecule/default/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/bitbucket_latest/molecule.yml b/roles/product_install/molecule/bitbucket_latest/molecule.yml index f19f623..1f8d749 100644 --- a/roles/product_install/molecule/bitbucket_latest/molecule.yml +++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/confluence_latest/molecule.yml b/roles/product_install/molecule/confluence_latest/molecule.yml index f19f623..1f8d749 100644 --- a/roles/product_install/molecule/confluence_latest/molecule.yml +++ b/roles/product_install/molecule/confluence_latest/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: 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 f19f623..1f8d749 100644 --- a/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml +++ b/roles/product_install/molecule/confluence_version_with_uppercase/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/crowd_latest/molecule.yml b/roles/product_install/molecule/crowd_latest/molecule.yml index f19f623..1f8d749 100644 --- a/roles/product_install/molecule/crowd_latest/molecule.yml +++ b/roles/product_install/molecule/crowd_latest/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/default/molecule.yml b/roles/product_install/molecule/default/molecule.yml index 9b27a5f..68f5666 100644 --- a/roles/product_install/molecule/default/molecule.yml +++ b/roles/product_install/molecule/default/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/jira_all/molecule.yml b/roles/product_install/molecule/jira_all/molecule.yml index f19f623..1f8d749 100644 --- a/roles/product_install/molecule/jira_all/molecule.yml +++ b/roles/product_install/molecule/jira_all/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: 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 32dfe38..a8da747 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: 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 32dfe38..a8da747 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/jira_software_latest/molecule.yml b/roles/product_install/molecule/jira_software_latest/molecule.yml index f19f623..1f8d749 100644 --- a/roles/product_install/molecule/jira_software_latest/molecule.yml +++ b/roles/product_install/molecule/jira_software_latest/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/jira_tarball/molecule.yml b/roles/product_install/molecule/jira_tarball/molecule.yml index 9b27a5f..68f5666 100644 --- a/roles/product_install/molecule/jira_tarball/molecule.yml +++ b/roles/product_install/molecule/jira_tarball/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: 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 f19f623..1f8d749 100644 --- a/roles/product_install/molecule/jira_tarball_download_url/molecule.yml +++ b/roles/product_install/molecule/jira_tarball_download_url/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: 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 9b27a5f..68f5666 100644 --- a/roles/product_install/molecule/jira_version_from_file/molecule.yml +++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/jira_version_latest/molecule.yml b/roles/product_install/molecule/jira_version_latest/molecule.yml index 9b27a5f..68f5666 100644 --- a/roles/product_install/molecule/jira_version_latest/molecule.yml +++ b/roles/product_install/molecule/jira_version_latest/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/jira_version_override/molecule.yml b/roles/product_install/molecule/jira_version_override/molecule.yml index 9b27a5f..68f5666 100644 --- a/roles/product_install/molecule/jira_version_override/molecule.yml +++ b/roles/product_install/molecule/jira_version_override/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/servicedesk3/molecule.yml b/roles/product_install/molecule/servicedesk3/molecule.yml index e073631..2f99550 100644 --- a/roles/product_install/molecule/servicedesk3/molecule.yml +++ b/roles/product_install/molecule/servicedesk3/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/servicedesk4/molecule.yml b/roles/product_install/molecule/servicedesk4/molecule.yml index e073631..2f99550 100644 --- a/roles/product_install/molecule/servicedesk4/molecule.yml +++ b/roles/product_install/molecule/servicedesk4/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_install/molecule/servicedesk_latest/molecule.yml b/roles/product_install/molecule/servicedesk_latest/molecule.yml index e073631..2f99550 100644 --- a/roles/product_install/molecule/servicedesk_latest/molecule.yml +++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml @@ -6,10 +6,12 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 provisioner: name: ansible env: diff --git a/roles/product_startup/molecule/bitbucket/molecule.yml b/roles/product_startup/molecule/bitbucket/molecule.yml index 77356bc..07706c7 100644 --- a/roles/product_startup/molecule/bitbucket/molecule.yml +++ b/roles/product_startup/molecule/bitbucket/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/product_startup/molecule/default/molecule.yml b/roles/product_startup/molecule/default/molecule.yml index 77356bc..07706c7 100644 --- a/roles/product_startup/molecule/default/molecule.yml +++ b/roles/product_startup/molecule/default/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/product_startup/molecule/startup_restart_false/molecule.yml b/roles/product_startup/molecule/startup_restart_false/molecule.yml index 0e199fc..09cb7c2 100644 --- a/roles/product_startup/molecule/startup_restart_false/molecule.yml +++ b/roles/product_startup/molecule/startup_restart_false/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: diff --git a/roles/product_startup/molecule/synchrony/molecule.yml b/roles/product_startup/molecule/synchrony/molecule.yml index 77356bc..07706c7 100644 --- a/roles/product_startup/molecule/synchrony/molecule.yml +++ b/roles/product_startup/molecule/synchrony/molecule.yml @@ -6,12 +6,14 @@ platforms: image: amazonlinux:2023 groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 - name: ubuntu_lts image: ubuntu:jammy groups: - aws_node_local + platform: linux/amd64 ulimits: - nofile:262144:262144 provisioner: