From 7ede9c8cc18287f266f932e2b00c014f309d39f4 Mon Sep 17 00:00:00 2001 From: Denise Unterwurzacher Date: Fri, 8 Jan 2021 13:24:01 -0600 Subject: [PATCH 01/25] ITPLAT-399 Systemd cleans up files in /tmp older than 10 days. This removes the /tmp/.java_pid* file which is the socket created by the JVM that facilitates thread dumps. This file is never recreated once it's deleted, and the only way to recreate it and restore thread dump functionality is to restart the JVM. If using OpenJDK there is no `-F` option to force thread dumps which bypasses the socket. Once the file is deleted there is no way to take a thread dump on OpenJDK until a restart is performed. This commit excludes required java hooks including the pid file from systemd's cleanup. For more info: https://bugzilla.redhat.com/show_bug.cgi?id=1704608 --- roles/linux_common/files/java.conf | 3 +++ roles/linux_common/tasks/main.yml | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 roles/linux_common/files/java.conf diff --git a/roles/linux_common/files/java.conf b/roles/linux_common/files/java.conf new file mode 100644 index 0000000..d9a599f --- /dev/null +++ b/roles/linux_common/files/java.conf @@ -0,0 +1,3 @@ +# Exclude java-hooks +x /tmp/hsperfdata_* +x /tmp/.java_pid* \ No newline at end of file diff --git a/roles/linux_common/tasks/main.yml b/roles/linux_common/tasks/main.yml index 825fbd7..2fadb06 100644 --- a/roles/linux_common/tasks/main.yml +++ b/roles/linux_common/tasks/main.yml @@ -26,3 +26,19 @@ uid: "{{ atl_product_user_uid }}" group: "{{ atl_product_user }}" comment: "Product runtime user" + +- name: Stop systemd-cleanup deleting the jvm socket file + copy: + src: java.conf + dest: "/usr/lib/tmpfiles.d/java.conf" + owner: root + group: root + mode: "644" + register: systemd_config_changed + +- name: Force systemd to reload daemon configuration + systemd: + daemon_reload: yes + when: + - systemd_config_changed is defined + - molecule_yml is not defined # molecule cannot run systemctl commands and notest doesn't work for handlers From 5c1b5f6877d936ff153539225a572332a01f3b13 Mon Sep 17 00:00:00 2001 From: Denise Unterwurzacher Date: Tue, 12 Jan 2021 18:32:20 -0600 Subject: [PATCH 02/25] ITPLAT-399 Updating Molecule (this was in an attempt to solve a testing issue that it did not solve, but it doesn't cause any problems) --- Pipfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index e78f929..55de93b 100644 --- a/Pipfile +++ b/Pipfile @@ -9,7 +9,7 @@ boto3 = "==1.9.242" botocore = "==1.12.242" [dev-packages] -molecule = "==2.20.2" +molecule = "==3.2.2" docker = "==4.1.0" six = "*" taskcat = "*" From f539d33c5b181689fa3f7b9c01a234a709fa4b75 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 13:36:05 +1100 Subject: [PATCH 03/25] DCD-1190: Move BB-specific variables out of the group vars to a common role. --- group_vars/aws_node_local.yml | 7 ------- roles/bitbucket_common/defaults/main.yml | 5 +++++ roles/bitbucket_config/default/main.yaml | 1 - roles/bitbucket_config/defaults/main.yaml | 3 +++ roles/bitbucket_config/meta/main.yml | 4 ++++ roles/bitbucket_dataset_restore/defaults/main.yml | 3 +++ roles/bitbucket_dataset_restore/meta/main.yml | 4 ++++ 7 files changed, 19 insertions(+), 8 deletions(-) create mode 100644 roles/bitbucket_common/defaults/main.yml delete mode 100644 roles/bitbucket_config/default/main.yaml create mode 100644 roles/bitbucket_config/defaults/main.yaml create mode 100644 roles/bitbucket_config/meta/main.yml create mode 100644 roles/bitbucket_dataset_restore/defaults/main.yml create mode 100644 roles/bitbucket_dataset_restore/meta/main.yml diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 9db7661..b331964 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -153,10 +153,3 @@ atl_rds_security_group: "{{ lookup('env', 'ATL_RDS_SECURITY_GROUP') }}" atl_backup_manifest_url: "{{ lookup('env', 'ATL_BACKUP_MANIFEST_URL') }}" atl_restore_required: "{{ atl_backup_manifest_url is defined and atl_backup_manifest_url != '' }}" - - -atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" - -atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" -atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" diff --git a/roles/bitbucket_common/defaults/main.yml b/roles/bitbucket_common/defaults/main.yml new file mode 100644 index 0000000..2dbd25b --- /dev/null +++ b/roles/bitbucket_common/defaults/main.yml @@ -0,0 +1,5 @@ +--- + +atl_bitbucket_baseurl: "{{ lookup('env', 'ATL_BB_BASEURL') }}" +atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" + diff --git a/roles/bitbucket_config/default/main.yaml b/roles/bitbucket_config/default/main.yaml deleted file mode 100644 index ed97d53..0000000 --- a/roles/bitbucket_config/default/main.yaml +++ /dev/null @@ -1 +0,0 @@ ---- diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml new file mode 100644 index 0000000..9790c09 --- /dev/null +++ b/roles/bitbucket_config/defaults/main.yaml @@ -0,0 +1,3 @@ +--- + +atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" diff --git a/roles/bitbucket_config/meta/main.yml b/roles/bitbucket_config/meta/main.yml new file mode 100644 index 0000000..ca5ee97 --- /dev/null +++ b/roles/bitbucket_config/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - bitbucket_common diff --git a/roles/bitbucket_dataset_restore/defaults/main.yml b/roles/bitbucket_dataset_restore/defaults/main.yml new file mode 100644 index 0000000..90d88ea --- /dev/null +++ b/roles/bitbucket_dataset_restore/defaults/main.yml @@ -0,0 +1,3 @@ +--- + +atl_bitbucket_dataset_url: "{{ lookup('env', 'ATL_DATASET_URL') }}" diff --git a/roles/bitbucket_dataset_restore/meta/main.yml b/roles/bitbucket_dataset_restore/meta/main.yml new file mode 100644 index 0000000..ca5ee97 --- /dev/null +++ b/roles/bitbucket_dataset_restore/meta/main.yml @@ -0,0 +1,4 @@ +--- + +dependencies: + - bitbucket_common From 08b38ec7fb0cd54751217d8aead10920450439c6 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 14:18:21 +1100 Subject: [PATCH 04/25] DCD-1190: Add supplied properties to the template. --- roles/bitbucket_config/defaults/main.yaml | 1 + roles/bitbucket_config/templates/bitbucket.properties.j2 | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml index 9790c09..9eccfb1 100644 --- a/roles/bitbucket_config/defaults/main.yaml +++ b/roles/bitbucket_config/defaults/main.yaml @@ -1,3 +1,4 @@ --- atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" +atl_bitbucket_properties: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 444855f..13306e2 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -1,4 +1,4 @@ -# Created by Ansible +# Created by Ansible role `bitbucket_config` jdbc.driver={{ atl_db_driver }} jdbc.url={{ atl_jdbc_url }} jdbc.user={{ atl_jdbc_user }} @@ -34,3 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} +{% if atl_bitbucket_properties is defined $} +{{ atl_bitbucket_properties }} +{% endif %} From b97ef5e08c619bd11b69fa2f609a938084d2512a Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 18 Jan 2021 15:20:49 +1100 Subject: [PATCH 05/25] DCD-1190: Fix typo. --- roles/bitbucket_config/templates/bitbucket.properties.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 13306e2..5b8beca 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -34,6 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} -{% if atl_bitbucket_properties is defined $} +{% if atl_bitbucket_properties is defined %} {{ atl_bitbucket_properties }} {% endif %} From c59d3525abcdba364530dbba8ab46c3cb81030d0 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 10:47:36 +1100 Subject: [PATCH 06/25] DCD-1190: Expect a space-delimited list of properties from the quickstart. --- roles/bitbucket_config/defaults/main.yaml | 3 ++- roles/bitbucket_config/molecule/default/playbook.yml | 2 ++ .../bitbucket_config/molecule/default/tests/test_default.py | 5 +++++ roles/bitbucket_config/templates/bitbucket.properties.j2 | 6 +++--- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/roles/bitbucket_config/defaults/main.yaml b/roles/bitbucket_config/defaults/main.yaml index 9eccfb1..1ae8340 100644 --- a/roles/bitbucket_config/defaults/main.yaml +++ b/roles/bitbucket_config/defaults/main.yaml @@ -1,4 +1,5 @@ --- atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_properties: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" +atl_bitbucket_properties_raw: "{{ lookup('env', 'ATL_BITBUCKET_PROPERTIES') }}" +atl_bitbucket_properties: "{{ atl_bitbucket_properties_raw.split(' ') | reject('equalto', '') | list }}" diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml index f9c424b..8a37408 100644 --- a/roles/bitbucket_config/molecule/default/playbook.yml +++ b/roles/bitbucket_config/molecule/default/playbook.yml @@ -12,6 +12,8 @@ atl_jdbc_user: 'bb_db_user' atl_jdbc_password: 'molecule_password' + atl_bitbucket_properties_raw: "key1=va1 key2=val2 key3=val3" + roles: - role: linux_common - role: product_common diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py index 00593ec..e1d0905 100644 --- a/roles/bitbucket_config/molecule/default/tests/test_default.py +++ b/roles/bitbucket_config/molecule/default/tests/test_default.py @@ -14,3 +14,8 @@ def test_config_file(host): assert f.contains("jdbc.driver=org.postgresql.Driver") assert f.contains("jdbc.user=bb_db_user") assert f.contains("jdbc.password=molecule_password") + + assert f.contains("key1=val1") + assert f.contains("key2=val2") + assert f.contains("key3=val3") + diff --git a/roles/bitbucket_config/templates/bitbucket.properties.j2 b/roles/bitbucket_config/templates/bitbucket.properties.j2 index 5b8beca..3551c5b 100644 --- a/roles/bitbucket_config/templates/bitbucket.properties.j2 +++ b/roles/bitbucket_config/templates/bitbucket.properties.j2 @@ -34,6 +34,6 @@ server.scheme=http server.proxy-port=80 {% endif %} -{% if atl_bitbucket_properties is defined %} -{{ atl_bitbucket_properties }} -{% endif %} +{% for prop in atl_bitbucket_properties %} +{{ prop }} +{% endfor %} From 11f0e4ea36991272af1c9bc2fe3da4fdb53085a8 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 11:17:21 +1100 Subject: [PATCH 07/25] DCD-1190: Remove spurious yaml file. --- roles/bitbucket_config/molecule/default/main.yml | 4 ---- 1 file changed, 4 deletions(-) delete mode 100644 roles/bitbucket_config/molecule/default/main.yml diff --git a/roles/bitbucket_config/molecule/default/main.yml b/roles/bitbucket_config/molecule/default/main.yml deleted file mode 100644 index 77afc1c..0000000 --- a/roles/bitbucket_config/molecule/default/main.yml +++ /dev/null @@ -1,4 +0,0 @@ ---- - -atl_bitbucket_license_key: "{{ lookup('env', 'ATL_BB_LICENSEKEY') }}" -atl_bitbucket_admin_password: "{{ lookup('env', 'ATL_BB_ADMIN_PASSWORD') }}" From d30ecd208029d0560fd249b97461e3dd7702aeea Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 11:18:20 +1100 Subject: [PATCH 08/25] DCD-1190: Disable line-length lint as it doesn't help clarity. --- roles/bitbucket_config/molecule/default/molecule.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index 7f082f6..8829d75 100644 --- a/roles/bitbucket_config/molecule/default/molecule.yml +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -5,6 +5,9 @@ driver: name: docker lint: name: yamllint + options: + config-data: + line-length: disable platforms: - name: amazon_linux2 image: amazonlinux:2 From 5de5149612bb66d0e48d6d27454416099c533753 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 12:51:27 +1100 Subject: [PATCH 09/25] DCD-1190: Typo in test. --- roles/bitbucket_config/molecule/default/playbook.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml index 8a37408..2a1addf 100644 --- a/roles/bitbucket_config/molecule/default/playbook.yml +++ b/roles/bitbucket_config/molecule/default/playbook.yml @@ -12,7 +12,7 @@ atl_jdbc_user: 'bb_db_user' atl_jdbc_password: 'molecule_password' - atl_bitbucket_properties_raw: "key1=va1 key2=val2 key3=val3" + atl_bitbucket_properties_raw: "key1=val1 key2=val2 key3=val3" roles: - role: linux_common From 6b7c164d718b7004458a067b1f8130361f374db5 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Tue, 19 Jan 2021 14:30:00 +1100 Subject: [PATCH 10/25] DCD-1190: Narrow checks to ensure properties are on separate lines. --- .../molecule/default/tests/test_default.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py index e1d0905..770c3bb 100644 --- a/roles/bitbucket_config/molecule/default/tests/test_default.py +++ b/roles/bitbucket_config/molecule/default/tests/test_default.py @@ -15,7 +15,6 @@ def test_config_file(host): assert f.contains("jdbc.user=bb_db_user") assert f.contains("jdbc.password=molecule_password") - assert f.contains("key1=val1") - assert f.contains("key2=val2") - assert f.contains("key3=val3") - + assert f.contains("^key1=val1$") + assert f.contains("^key2=val2$") + assert f.contains("^key3=val3$") From 51fe80cd698e0c572eb499dbc38485b6eedd815e Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Wed, 20 Jan 2021 09:59:38 +1100 Subject: [PATCH 11/25] DCD-1205: Bump all dependencies to fix VULN-257524, VULN-257513 --- Pipfile | 11 +- Pipfile.lock | 1016 +++++++++++++++++++++++++++----------------------- 2 files changed, 547 insertions(+), 480 deletions(-) diff --git a/Pipfile b/Pipfile index 55de93b..f46d0d1 100644 --- a/Pipfile +++ b/Pipfile @@ -4,16 +4,15 @@ verify_ssl = true name = "pypi" [packages] -ansible = "==2.8.5" -boto3 = "==1.9.242" -botocore = "==1.12.242" +ansible = "==2.10.5" +boto3 = "==1.16.56" +botocore = "==1.19.57" [dev-packages] molecule = "==3.2.2" -docker = "==4.1.0" -six = "*" +molecule-docker = "==0.2.4" +docker = "==4.4.1" taskcat = "*" -Jinja2 = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 725f9f6..755afa0 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "4cec168800858d0bce3beaae422011cb6458d548e9a8fc1807f39bd7c8eb24e6" + "sha256": "2e42055eea584ff6e802a84ad3a3bb5845d3a4f35b2d707223b0dadff955bd3b" }, "pipfile-spec": 6, "requires": { @@ -18,109 +18,110 @@ "default": { "ansible": { "hashes": [ - "sha256:8e9403e755ce8ef27b6066cdd7a4c567aa80ebe2fd90d0ff8efa0a725d246986" + "sha256:9775229aae31336a624ca5afe5533fea5e49ef4daa96a96791dd9871b2d8b8d1" ], "index": "pypi", - "version": "==2.8.5" + "version": "==2.10.5" }, - "asn1crypto": { + "ansible-base": { "hashes": [ - "sha256:d02bf8ea1b964a5ff04ac7891fe3a39150045d1e5e4fe99273ba677d11b92a04", - "sha256:f822954b90c4c44f002e2cd46d636ab630f1fe4df22c816a82b66505c404eb2a" + "sha256:33ae323923b841f3d822f355380ce7c92610440362efeed67b4b39db41e555af" ], - "version": "==1.0.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.10.5" }, "boto3": { "hashes": [ - "sha256:4189e1ffed768bd0efd754a0abedebce19495ba2aa6b2f5e20f29ba80f81f9cb", - "sha256:fa4e28166922feeb9b7b56134c1acc817a1bca36284a0035bc08a3dab1853a9f" + "sha256:3f26aad4c6b238055d17fd662620284ffb4ced542ed9a2f7f9df65d97a3f1190", + "sha256:47151ed571c316458f4931cd2422995ba0c9f6818c5df7d75f49fc845208e42e" ], "index": "pypi", - "version": "==1.9.242" + "version": "==1.16.56" }, "botocore": { "hashes": [ - "sha256:7af52e0aabaf4ba045e1a5832308e70e1ea4b499b71624857f09aed2ba5e667c", - "sha256:dd62d63bcd3176c92775c52d3e879288f89bf0ac0039df14ea31f25d693acd6d" + "sha256:c756d65ffa989c5c0e92178175e41abf7b18ad19b2fe2e82e192f085e264e03a", + "sha256:cf7d108a4d67a0fe670379111927b5d9e0ff1160146c81c326bb9e54c2b8cb19" ], "index": "pypi", - "version": "==1.12.242" + "version": "==1.19.57" }, "cffi": { "hashes": [ - "sha256:041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774", - "sha256:046ef9a22f5d3eed06334d01b1e836977eeef500d9b78e9ef693f9380ad0b83d", - "sha256:066bc4c7895c91812eff46f4b1c285220947d4aa46fa0a2651ff85f2afae9c90", - "sha256:066c7ff148ae33040c01058662d6752fd73fbc8e64787229ea8498c7d7f4041b", - "sha256:2444d0c61f03dcd26dbf7600cf64354376ee579acad77aef459e34efcb438c63", - "sha256:300832850b8f7967e278870c5d51e3819b9aad8f0a2c8dbe39ab11f119237f45", - "sha256:34c77afe85b6b9e967bd8154e3855e847b70ca42043db6ad17f26899a3df1b25", - "sha256:46de5fa00f7ac09f020729148ff632819649b3e05a007d286242c4882f7b1dc3", - "sha256:4aa8ee7ba27c472d429b980c51e714a24f47ca296d53f4d7868075b175866f4b", - "sha256:4d0004eb4351e35ed950c14c11e734182591465a33e960a4ab5e8d4f04d72647", - "sha256:4e3d3f31a1e202b0f5a35ba3bc4eb41e2fc2b11c1eff38b362de710bcffb5016", - "sha256:50bec6d35e6b1aaeb17f7c4e2b9374ebf95a8975d57863546fa83e8d31bdb8c4", - "sha256:55cad9a6df1e2a1d62063f79d0881a414a906a6962bc160ac968cc03ed3efcfb", - "sha256:5662ad4e4e84f1eaa8efce5da695c5d2e229c563f9d5ce5b0113f71321bcf753", - "sha256:59b4dc008f98fc6ee2bb4fd7fc786a8d70000d058c2bbe2698275bc53a8d3fa7", - "sha256:73e1ffefe05e4ccd7bcea61af76f36077b914f92b76f95ccf00b0c1b9186f3f9", - "sha256:a1f0fd46eba2d71ce1589f7e50a9e2ffaeb739fb2c11e8192aa2b45d5f6cc41f", - "sha256:a2e85dc204556657661051ff4bab75a84e968669765c8a2cd425918699c3d0e8", - "sha256:a5457d47dfff24882a21492e5815f891c0ca35fefae8aa742c6c263dac16ef1f", - "sha256:a8dccd61d52a8dae4a825cdbb7735da530179fea472903eb871a5513b5abbfdc", - "sha256:ae61af521ed676cf16ae94f30fe202781a38d7178b6b4ab622e4eec8cefaff42", - "sha256:b012a5edb48288f77a63dba0840c92d0504aa215612da4541b7b42d849bc83a3", - "sha256:d2c5cfa536227f57f97c92ac30c8109688ace8fa4ac086d19d0af47d134e2909", - "sha256:d42b5796e20aacc9d15e66befb7a345454eef794fdb0737d1af593447c6c8f45", - "sha256:dee54f5d30d775f525894d67b1495625dd9322945e7fee00731952e0368ff42d", - "sha256:e070535507bd6aa07124258171be2ee8dfc19119c28ca94c9dfb7efd23564512", - "sha256:e1ff2748c84d97b065cc95429814cdba39bcbd77c9c85c89344b317dc0d9cbff", - "sha256:ed851c75d1e0e043cbf5ca9a8e1b13c4c90f3fbd863dacb01c0808e2b5204201" + "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", + "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d", + "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a", + "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec", + "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362", + "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668", + "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c", + "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b", + "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06", + "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698", + "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2", + "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c", + "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7", + "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", + "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", + "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", + "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", + "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", + "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", + "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", + "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", + "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01", + "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", + "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", + "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", + "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", + "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", + "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", + "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e", + "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", + "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", + "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", + "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375", + "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b", + "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b", + "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f" ], - "version": "==1.12.3" + "version": "==1.14.4" }, "cryptography": { "hashes": [ - "sha256:24b61e5fcb506424d3ec4e18bca995833839bf13c59fc43e530e488f28d46b8c", - "sha256:25dd1581a183e9e7a806fe0543f485103232f940fcfc301db65e630512cce643", - "sha256:3452bba7c21c69f2df772762be0066c7ed5dc65df494a1d53a58b683a83e1216", - "sha256:41a0be220dd1ed9e998f5891948306eb8c812b512dc398e5a01846d855050799", - "sha256:5751d8a11b956fbfa314f6553d186b94aa70fdb03d8a4d4f1c82dcacf0cbe28a", - "sha256:5f61c7d749048fa6e3322258b4263463bfccefecb0dd731b6561cb617a1d9bb9", - "sha256:72e24c521fa2106f19623a3851e9f89ddfdeb9ac63871c7643790f872a305dfc", - "sha256:7b97ae6ef5cba2e3bb14256625423413d5ce8d1abb91d4f29b6d1a081da765f8", - "sha256:961e886d8a3590fd2c723cf07be14e2a91cf53c25f02435c04d39e90780e3b53", - "sha256:96d8473848e984184b6728e2c9d391482008646276c3ff084a1bd89e15ff53a1", - "sha256:ae536da50c7ad1e002c3eee101871d93abdc90d9c5f651818450a0d3af718609", - "sha256:b0db0cecf396033abb4a93c95d1602f268b3a68bb0a9cc06a7cff587bb9a7292", - "sha256:cfee9164954c186b191b91d4193989ca994703b2fff406f71cf454a2d3c7327e", - "sha256:e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6", - "sha256:f27d93f0139a3c056172ebb5d4f9056e770fdf0206c2f422ff2ebbad142e09ed", - "sha256:f57b76e46a58b63d1c6375017f4564a28f19a5ca912691fd2e4261b3414b618d" + "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d", + "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7", + "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901", + "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c", + "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244", + "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6", + "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5", + "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e", + "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c", + "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0", + "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812", + "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a", + "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030", + "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302" ], - "version": "==2.7" - }, - "docutils": { - "hashes": [ - "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", - "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", - "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" - ], - "version": "==0.15.2" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==3.3.1" }, "jinja2": { "hashes": [ - "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", - "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], - "version": "==2.10.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.11.2" }, "jmespath": { "hashes": [ - "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", - "sha256:bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c" + "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9", + "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f" ], - "version": "==0.9.4" + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.0" }, "markupsafe": { "hashes": [ @@ -128,13 +129,16 @@ "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", @@ -151,119 +155,140 @@ "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, + "packaging": { + "hashes": [ + "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858", + "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==20.8" + }, "pycparser": { "hashes": [ - "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", + "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705" ], - "version": "==2.19" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.20" + }, + "pyparsing": { + "hashes": [ + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.4.7" }, "python-dateutil": { "hashes": [ - "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", - "sha256:c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e" + "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", + "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "markers": "python_version >= '2.7'", - "version": "==2.8.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.8.1" }, "pyyaml": { "hashes": [ - "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", - "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", - "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", - "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", - "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", - "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", - "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", - "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", - "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", - "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", - "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", - "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", - "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8" + "sha256:02c78d77281d8f8d07a255e57abdbf43b02257f59f50cc6b636937d68efa5dd0", + "sha256:0dc9f2eb2e3c97640928dec63fd8dc1dd91e6b6ed236bd5ac00332b99b5c2ff9", + "sha256:124fd7c7bc1e95b1eafc60825f2daf67c73ce7b33f1194731240d24b0d1bf628", + "sha256:26fcb33776857f4072601502d93e1a619f166c9c00befb52826e7b774efaa9db", + "sha256:31ba07c54ef4a897758563e3a0fcc60077698df10180abe4b8165d9895c00ebf", + "sha256:3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a", + "sha256:52bf0930903818e600ae6c2901f748bc4869c0c406056f679ab9614e5d21a166", + "sha256:5a3f345acff76cad4aa9cb171ee76c590f37394186325d53d1aa25318b0d4a09", + "sha256:5e7ac4e0e79a53451dc2814f6876c2fa6f71452de1498bbe29c0b54b69a986f4", + "sha256:7242790ab6c20316b8e7bb545be48d7ed36e26bbe279fd56f2c4a12510e60b4b", + "sha256:737bd70e454a284d456aa1fa71a0b429dd527bcbf52c5c33f7c8eee81ac16b89", + "sha256:8635d53223b1f561b081ff4adecb828fd484b8efffe542edcfdff471997f7c39", + "sha256:8b818b6c5a920cbe4203b5a6b14256f0e5244338244560da89b7b0f1313ea4b6", + "sha256:8bf38641b4713d77da19e91f8b5296b832e4db87338d6aeffe422d42f1ca896d", + "sha256:a36a48a51e5471513a5aea920cdad84cbd56d70a5057cca3499a637496ea379c", + "sha256:b2243dd033fd02c01212ad5c601dafb44fbb293065f430b0d3dbf03f3254d615", + "sha256:cc547d3ead3754712223abb7b403f0a184e4c3eae18c9bb7fd15adef1597cc4b", + "sha256:cc552b6434b90d9dbed6a4f13339625dc466fd82597119897e9489c953acbc22", + "sha256:f3790156c606299ff499ec44db422f66f05a7363b39eb9d5b064f17bd7d7c47b", + "sha256:f7a21e3d99aa3095ef0553e7ceba36fb693998fbb1226f1392ce33681047465f", + "sha256:fdc6b2cb4b19e431994f25a9160695cc59a4e861710cc6fc97161c5e845fc579" ], - "version": "==5.1.2" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==5.4" }, "s3transfer": { "hashes": [ - "sha256:6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d", - "sha256:b780f2411b824cb541dbcd2c713d0cb61c7d1bcadae204cdddda2b35cef493ba" + "sha256:1e28620e5b444652ed752cf87c7e0cb15b0e578972568c6609f0f18212f259ed", + "sha256:7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2" ], - "version": "==0.2.1" + "version": "==0.3.4" }, "six": { "hashes": [ - "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", - "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.12.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.15.0" }, "urllib3": { "hashes": [ - "sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398", - "sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86" + "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08", + "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473" ], - "markers": "python_version >= '3.4'", - "version": "==1.25.6" + "markers": "python_version != '3.4'", + "version": "==1.26.2" } }, "develop": { - "ansible": { - "hashes": [ - "sha256:8e9403e755ce8ef27b6066cdd7a4c567aa80ebe2fd90d0ff8efa0a725d246986" - ], - "index": "pypi", - "version": "==2.8.5" - }, - "ansible-lint": { - "hashes": [ - "sha256:9430ea6e654ba4bf5b9c6921efc040f46cda9c4fd2896a99ff71d21037bcb123", - "sha256:c1b442b01091eca13ef11d98c3376e9489ba5b69a8467828ca86044f384bc0a1" - ], - "version": "==4.1.0" - }, - "anyconfig": { - "hashes": [ - "sha256:4d6016ae6eecc5e502bc7e99ae0639c5710c5c67bde5f21b06b9eaafd9ce0e7e" - ], - "version": "==0.9.7" - }, "arrow": { "hashes": [ - "sha256:10257c5daba1a88db34afa284823382f4963feca7733b9107956bed041aff24f", - "sha256:c2325911fcd79972cf493cfd957072f9644af8ad25456201ae1ede3316576eb4" + "sha256:e098abbd9af3665aea81bdd6c869e93af4feb078e98468dd351c383af187aac5", + "sha256:ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4" ], - "version": "==0.15.2" - }, - "asn1crypto": { - "hashes": [ - "sha256:d02bf8ea1b964a5ff04ac7891fe3a39150045d1e5e4fe99273ba677d11b92a04", - "sha256:f822954b90c4c44f002e2cd46d636ab630f1fe4df22c816a82b66505c404eb2a" - ], - "version": "==1.0.0" - }, - "atomicwrites": { - "hashes": [ - "sha256:03472c30eb2c5d1ba9227e4c2ca66ab8287fbfbbda3888aa93dc2e28fc6811b4", - "sha256:75a9445bac02d8d058d5e1fe689654ba5a6556a1dfd8ce6ec55a0ed79866cfa6" - ], - "version": "==1.3.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==0.17.0" }, "attrs": { "hashes": [ - "sha256:ec20e7a4825331c1b5ebf261d111e16fa9612c1f7a5e1f884f12bd53a664dfd2", - "sha256:f913492e1663d3c36f502e5e9ba6cd13cf19d7fab50aa13239e420fef95e1396" + "sha256:31b2eced602aa8423c2aea9c76a724617ed67cf9513173fd3a4f03e3a929c7e6", + "sha256:832aa3cde19744e49938b91fea06d69ecb9e649c93ba974535d08ad92164f700" ], - "version": "==19.2.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==20.3.0" }, "aws-sam-translator": { "hashes": [ - "sha256:6563aa3b534e7ad672d580ecd3dfa92021e81b4e5983604c0df7ee0a07b3ed99" + "sha256:505d18b0bad8702bfba80fc5bc78d9c4b003ab009a9e42648561bdf1fd67bf01", + "sha256:89c5c997164231b847634d8034d3534d3a048d88f4b66b2897f6251366e640f5", + "sha256:9f3767614746a38300ee988ef70d6f862e71e59ea536252bbf9a319daaac1fff" ], - "version": "==1.15.0" + "version": "==1.33.0" + }, + "backports.shutil-get-terminal-size": { + "hashes": [ + "sha256:0975ba55054c15e346944b38956a4c9cbee9009391e41b86c68990effb8c1f64", + "sha256:713e7a8228ae80341c70586d1cc0a8caa5207346927e23d09dcbcaf18eadec80" + ], + "version": "==1.0.0" + }, + "bcrypt": { + "hashes": [ + "sha256:5b93c1726e50a93a033c36e5ca7fdcd29a5c7395af50a6892f5d9e7c6cfbfb29", + "sha256:63d4e3ff96188e5898779b6057878fecf3f11cfe6ec3b313ea09955d587ec7a7", + "sha256:81fec756feff5b6818ea7ab031205e1d323d8943d237303baca2c5f9c7846f34", + "sha256:a67fb841b35c28a59cebed05fbd3e80eea26e6d75851f0574a9273c80f3e9b55", + "sha256:c95d4cbebffafcdd28bd28bb4e25b31c50f6da605c81ffd9ad8a3d1b2ab7b1b6", + "sha256:cd1ea2ff3038509ea95f687256c46b79f5fc382ad0aa3664d200047546d511d1", + "sha256:cdcdcb3972027f83fe24a48b1e90ea4b584d35f1cc279d76de6fc4b13376239d" + ], + "markers": "python_version >= '3.6'", + "version": "==3.2.0" }, "binaryornot": { "hashes": [ @@ -274,200 +299,237 @@ }, "boto3": { "hashes": [ - "sha256:4189e1ffed768bd0efd754a0abedebce19495ba2aa6b2f5e20f29ba80f81f9cb", - "sha256:fa4e28166922feeb9b7b56134c1acc817a1bca36284a0035bc08a3dab1853a9f" + "sha256:3f26aad4c6b238055d17fd662620284ffb4ced542ed9a2f7f9df65d97a3f1190", + "sha256:47151ed571c316458f4931cd2422995ba0c9f6818c5df7d75f49fc845208e42e" ], "index": "pypi", - "version": "==1.9.242" + "version": "==1.16.56" }, "botocore": { "hashes": [ - "sha256:7af52e0aabaf4ba045e1a5832308e70e1ea4b499b71624857f09aed2ba5e667c", - "sha256:dd62d63bcd3176c92775c52d3e879288f89bf0ac0039df14ea31f25d693acd6d" + "sha256:c756d65ffa989c5c0e92178175e41abf7b18ad19b2fe2e82e192f085e264e03a", + "sha256:cf7d108a4d67a0fe670379111927b5d9e0ff1160146c81c326bb9e54c2b8cb19" ], "index": "pypi", - "version": "==1.12.242" + "version": "==1.19.57" }, "cerberus": { "hashes": [ - "sha256:f5c2e048fb15ecb3c088d192164316093fcfa602a74b3386eefb2983aa7e800a" + "sha256:302e6694f206dd85cb63f13fd5025b31ab6d38c99c50c6d769f8fa0b0f299589" ], - "version": "==1.2" + "markers": "python_version >= '2.7'", + "version": "==1.3.2" }, "certifi": { "hashes": [ - "sha256:e4f3620cfea4f83eedc95b24abd9cd56f3c4b146dd0177e83a21b4eb49e21e50", - "sha256:fd7c7c74727ddcf00e9acd26bba8da604ffec95bf1c2144e67aff7a8b50e6cef" + "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c", + "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830" ], - "version": "==2019.9.11" + "version": "==2020.12.5" }, "cffi": { "hashes": [ - "sha256:041c81822e9f84b1d9c401182e174996f0bae9991f33725d059b771744290774", - "sha256:046ef9a22f5d3eed06334d01b1e836977eeef500d9b78e9ef693f9380ad0b83d", - "sha256:066bc4c7895c91812eff46f4b1c285220947d4aa46fa0a2651ff85f2afae9c90", - "sha256:066c7ff148ae33040c01058662d6752fd73fbc8e64787229ea8498c7d7f4041b", - "sha256:2444d0c61f03dcd26dbf7600cf64354376ee579acad77aef459e34efcb438c63", - "sha256:300832850b8f7967e278870c5d51e3819b9aad8f0a2c8dbe39ab11f119237f45", - "sha256:34c77afe85b6b9e967bd8154e3855e847b70ca42043db6ad17f26899a3df1b25", - "sha256:46de5fa00f7ac09f020729148ff632819649b3e05a007d286242c4882f7b1dc3", - "sha256:4aa8ee7ba27c472d429b980c51e714a24f47ca296d53f4d7868075b175866f4b", - "sha256:4d0004eb4351e35ed950c14c11e734182591465a33e960a4ab5e8d4f04d72647", - "sha256:4e3d3f31a1e202b0f5a35ba3bc4eb41e2fc2b11c1eff38b362de710bcffb5016", - "sha256:50bec6d35e6b1aaeb17f7c4e2b9374ebf95a8975d57863546fa83e8d31bdb8c4", - "sha256:55cad9a6df1e2a1d62063f79d0881a414a906a6962bc160ac968cc03ed3efcfb", - "sha256:5662ad4e4e84f1eaa8efce5da695c5d2e229c563f9d5ce5b0113f71321bcf753", - "sha256:59b4dc008f98fc6ee2bb4fd7fc786a8d70000d058c2bbe2698275bc53a8d3fa7", - "sha256:73e1ffefe05e4ccd7bcea61af76f36077b914f92b76f95ccf00b0c1b9186f3f9", - "sha256:a1f0fd46eba2d71ce1589f7e50a9e2ffaeb739fb2c11e8192aa2b45d5f6cc41f", - "sha256:a2e85dc204556657661051ff4bab75a84e968669765c8a2cd425918699c3d0e8", - "sha256:a5457d47dfff24882a21492e5815f891c0ca35fefae8aa742c6c263dac16ef1f", - "sha256:a8dccd61d52a8dae4a825cdbb7735da530179fea472903eb871a5513b5abbfdc", - "sha256:ae61af521ed676cf16ae94f30fe202781a38d7178b6b4ab622e4eec8cefaff42", - "sha256:b012a5edb48288f77a63dba0840c92d0504aa215612da4541b7b42d849bc83a3", - "sha256:d2c5cfa536227f57f97c92ac30c8109688ace8fa4ac086d19d0af47d134e2909", - "sha256:d42b5796e20aacc9d15e66befb7a345454eef794fdb0737d1af593447c6c8f45", - "sha256:dee54f5d30d775f525894d67b1495625dd9322945e7fee00731952e0368ff42d", - "sha256:e070535507bd6aa07124258171be2ee8dfc19119c28ca94c9dfb7efd23564512", - "sha256:e1ff2748c84d97b065cc95429814cdba39bcbd77c9c85c89344b317dc0d9cbff", - "sha256:ed851c75d1e0e043cbf5ca9a8e1b13c4c90f3fbd863dacb01c0808e2b5204201" + "sha256:00a1ba5e2e95684448de9b89888ccd02c98d512064b4cb987d48f4b40aa0421e", + "sha256:00e28066507bfc3fe865a31f325c8391a1ac2916219340f87dfad602c3e48e5d", + "sha256:045d792900a75e8b1e1b0ab6787dd733a8190ffcf80e8c8ceb2fb10a29ff238a", + "sha256:0638c3ae1a0edfb77c6765d487fee624d2b1ee1bdfeffc1f0b58c64d149e7eec", + "sha256:105abaf8a6075dc96c1fe5ae7aae073f4696f2905fde6aeada4c9d2926752362", + "sha256:155136b51fd733fa94e1c2ea5211dcd4c8879869008fc811648f16541bf99668", + "sha256:1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c", + "sha256:1d2c4994f515e5b485fd6d3a73d05526aa0fcf248eb135996b088d25dfa1865b", + "sha256:2c24d61263f511551f740d1a065eb0212db1dbbbbd241db758f5244281590c06", + "sha256:51a8b381b16ddd370178a65360ebe15fbc1c71cf6f584613a7ea08bfad946698", + "sha256:594234691ac0e9b770aee9fcdb8fa02c22e43e5c619456efd0d6c2bf276f3eb2", + "sha256:5cf4be6c304ad0b6602f5c4e90e2f59b47653ac1ed9c662ed379fe48a8f26b0c", + "sha256:64081b3f8f6f3c3de6191ec89d7dc6c86a8a43911f7ecb422c60e90c70be41c7", + "sha256:6bc25fc545a6b3d57b5f8618e59fc13d3a3a68431e8ca5fd4c13241cd70d0009", + "sha256:798caa2a2384b1cbe8a2a139d80734c9db54f9cc155c99d7cc92441a23871c03", + "sha256:7c6b1dece89874d9541fc974917b631406233ea0440d0bdfbb8e03bf39a49b3b", + "sha256:840793c68105fe031f34d6a086eaea153a0cd5c491cde82a74b420edd0a2b909", + "sha256:8d6603078baf4e11edc4168a514c5ce5b3ba6e3e9c374298cb88437957960a53", + "sha256:9cc46bc107224ff5b6d04369e7c595acb700c3613ad7bcf2e2012f62ece80c35", + "sha256:9f7a31251289b2ab6d4012f6e83e58bc3b96bd151f5b5262467f4bb6b34a7c26", + "sha256:9ffb888f19d54a4d4dfd4b3f29bc2c16aa4972f1c2ab9c4ab09b8ab8685b9c2b", + "sha256:a5ed8c05548b54b998b9498753fb9cadbfd92ee88e884641377d8a8b291bcc01", + "sha256:a7711edca4dcef1a75257b50a2fbfe92a65187c47dab5a0f1b9b332c5919a3fb", + "sha256:af5c59122a011049aad5dd87424b8e65a80e4a6477419c0c1015f73fb5ea0293", + "sha256:b18e0a9ef57d2b41f5c68beefa32317d286c3d6ac0484efd10d6e07491bb95dd", + "sha256:b4e248d1087abf9f4c10f3c398896c87ce82a9856494a7155823eb45a892395d", + "sha256:ba4e9e0ae13fc41c6b23299545e5ef73055213e466bd107953e4a013a5ddd7e3", + "sha256:c6332685306b6417a91b1ff9fae889b3ba65c2292d64bd9245c093b1b284809d", + "sha256:d5ff0621c88ce83a28a10d2ce719b2ee85635e85c515f12bac99a95306da4b2e", + "sha256:d9efd8b7a3ef378dd61a1e77367f1924375befc2eba06168b6ebfa903a5e59ca", + "sha256:df5169c4396adc04f9b0a05f13c074df878b6052430e03f50e68adf3a57aa28d", + "sha256:ebb253464a5d0482b191274f1c8bf00e33f7e0b9c66405fbffc61ed2c839c775", + "sha256:ec80dc47f54e6e9a78181ce05feb71a0353854cc26999db963695f950b5fb375", + "sha256:f032b34669220030f905152045dfa27741ce1a6db3324a5bc0b96b6c7420c87b", + "sha256:f60567825f791c6f8a592f3c6e3bd93dd2934e3f9dac189308426bd76b00ef3b", + "sha256:f803eaa94c2fcda012c047e62bc7a51b0bdabda1cad7a92a522694ea2d76e49f" ], - "version": "==1.12.3" + "version": "==1.14.4" }, "cfn-lint": { "hashes": [ - "sha256:32a3e1597c681c9411205bff48b421db60908c304c472f4644d5a32bc9ecdad3", - "sha256:623cf0f6ed4c7b3fb4563549e25ac68119478900d89ca976639f11c5d85063a6" + "sha256:8f7e249353d2335a5346994cc179ef2364c0ad2161cdf036ee6817ab3cea816b", + "sha256:fd822f4520246cb9a37e3b6b62530e772e195f19d1bcd08a9e48d0e4dff3ffb4" ], - "version": "==0.24.3" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.44.4" }, "chardet": { "hashes": [ - "sha256:84ab92ed1c4d4f16916e05906b6b75a6c0fb5db821cc65e70cbd64a3e2a5eaae", - "sha256:fc323ffcaeaed0e0a02bf4d117757b98aed530d9ed4531e3e15460124c106691" + "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", + "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" ], - "version": "==3.0.4" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==4.0.0" }, "click": { "hashes": [ - "sha256:29f99fc6125fbc931b758dc053b3114e55c77a6e4c6c3a2674a2dc986016381d", - "sha256:f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b" + "sha256:d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a", + "sha256:dacca89f4bfadd5de3d7489b7c8a566eee0d3676333fbb50030263894c38c0dc" ], - "version": "==6.7" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==7.1.2" }, "click-completion": { "hashes": [ - "sha256:7ca12978493a7450486cef155845af4fae48744c3f97b7250a254de65c9e5e5a" + "sha256:5bf816b81367e638a190b6e91b50779007d14301b3f9f3145d68e3cade7bce86" ], - "version": "==0.3.1" + "version": "==0.5.2" + }, + "click-help-colors": { + "hashes": [ + "sha256:eb037a2dd95a9e20b3897c2b3ca57e7f6797f76a8d93f7eeedda7fcdcbc9b635", + "sha256:f6c3d1fe86b07790e6ef0339f458196a8814de90946d876774ea4b4f30a5a539" + ], + "version": "==0.9" }, "colorama": { "hashes": [ - "sha256:463f8483208e921368c9f306094eb6f725c6ca42b0f97e313cb5d5512459feda", - "sha256:48eb22f4f8461b1df5734a074b57042430fb06e1d61bd1e11b078c0fe6d7a1f1" + "sha256:5941b2b48a20143d2267e95b1c2a7603ce057ee39fd88e7329b0c292aa16869b", + "sha256:9f47eda37229f68eee03b24b9748937c7dc3868f906e8ba69fbcbdd3bc5dc3e2" ], - "version": "==0.3.9" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==0.4.4" + }, + "commonmark": { + "hashes": [ + "sha256:452f9dc859be7f06631ddcb328b6919c67984aca654e5fefb3914d54691aed60", + "sha256:da2f38c92590f83de410ba1a3cbceafbc74fee9def35f9251ba9a971d6d66fd9" + ], + "version": "==0.9.1" }, "cookiecutter": { "hashes": [ - "sha256:1316a52e1c1f08db0c9efbf7d876dbc01463a74b155a0d83e722be88beda9a3e", - "sha256:ed8f54a8fc79b6864020d773ce11539b5f08e4617f353de1f22d23226f6a0d36" + "sha256:430eb882d028afb6102c084bab6cf41f6559a77ce9b18dc6802e3bc0cc5f4a30", + "sha256:efb6b2d4780feda8908a873e38f0e61778c23f6a2ea58215723bcceb5b515dac" ], - "version": "==1.6.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==1.7.2" }, "cryptography": { "hashes": [ - "sha256:24b61e5fcb506424d3ec4e18bca995833839bf13c59fc43e530e488f28d46b8c", - "sha256:25dd1581a183e9e7a806fe0543f485103232f940fcfc301db65e630512cce643", - "sha256:3452bba7c21c69f2df772762be0066c7ed5dc65df494a1d53a58b683a83e1216", - "sha256:41a0be220dd1ed9e998f5891948306eb8c812b512dc398e5a01846d855050799", - "sha256:5751d8a11b956fbfa314f6553d186b94aa70fdb03d8a4d4f1c82dcacf0cbe28a", - "sha256:5f61c7d749048fa6e3322258b4263463bfccefecb0dd731b6561cb617a1d9bb9", - "sha256:72e24c521fa2106f19623a3851e9f89ddfdeb9ac63871c7643790f872a305dfc", - "sha256:7b97ae6ef5cba2e3bb14256625423413d5ce8d1abb91d4f29b6d1a081da765f8", - "sha256:961e886d8a3590fd2c723cf07be14e2a91cf53c25f02435c04d39e90780e3b53", - "sha256:96d8473848e984184b6728e2c9d391482008646276c3ff084a1bd89e15ff53a1", - "sha256:ae536da50c7ad1e002c3eee101871d93abdc90d9c5f651818450a0d3af718609", - "sha256:b0db0cecf396033abb4a93c95d1602f268b3a68bb0a9cc06a7cff587bb9a7292", - "sha256:cfee9164954c186b191b91d4193989ca994703b2fff406f71cf454a2d3c7327e", - "sha256:e6347742ac8f35ded4a46ff835c60e68c22a536a8ae5c4422966d06946b6d4c6", - "sha256:f27d93f0139a3c056172ebb5d4f9056e770fdf0206c2f422ff2ebbad142e09ed", - "sha256:f57b76e46a58b63d1c6375017f4564a28f19a5ca912691fd2e4261b3414b618d" + "sha256:0003a52a123602e1acee177dc90dd201f9bb1e73f24a070db7d36c588e8f5c7d", + "sha256:0e85aaae861d0485eb5a79d33226dd6248d2a9f133b81532c8f5aae37de10ff7", + "sha256:594a1db4511bc4d960571536abe21b4e5c3003e8750ab8365fafce71c5d86901", + "sha256:69e836c9e5ff4373ce6d3ab311c1a2eed274793083858d3cd4c7d12ce20d5f9c", + "sha256:788a3c9942df5e4371c199d10383f44a105d67d401fb4304178020142f020244", + "sha256:7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6", + "sha256:83d9d2dfec70364a74f4e7c70ad04d3ca2e6a08b703606993407bf46b97868c5", + "sha256:84ef7a0c10c24a7773163f917f1cb6b4444597efd505a8aed0a22e8c4780f27e", + "sha256:9e21301f7a1e7c03dbea73e8602905a4ebba641547a462b26dd03451e5769e7c", + "sha256:9f6b0492d111b43de5f70052e24c1f0951cb9e6022188ebcb1cc3a3d301469b0", + "sha256:a69bd3c68b98298f490e84519b954335154917eaab52cf582fa2c5c7efc6e812", + "sha256:b4890d5fb9b7a23e3bf8abf5a8a7da8e228f1e97dc96b30b95685df840b6914a", + "sha256:c366df0401d1ec4e548bebe8f91d55ebcc0ec3137900d214dd7aac8427ef3030", + "sha256:dc42f645f8f3a489c3dd416730a514e7a91a59510ddaadc09d04224c098d3302" ], - "version": "==2.7" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==3.3.1" + }, + "dataclasses-jsonschema": { + "hashes": [ + "sha256:a5ba439d2ff5cdea7e42baf69c5fc5c7b576aefe325b4b32ebaa5b1418b4c06c" + ], + "version": "==2.13.0" + }, + "decorator": { + "hashes": [ + "sha256:41fa54c2a0cc4ba648be4fd43cff00aedf5b9465c9bf18d64325bc225f08f760", + "sha256:e3a62f0520172440ca0dcc823749319382e377f37f140a0b99ef45fecb84bfe7" + ], + "version": "==4.4.2" + }, + "distro": { + "hashes": [ + "sha256:0e58756ae38fbd8fc3020d54badb8eae17c5b9dcbed388b17bb55b8a5928df92", + "sha256:df74eed763e18d10d0da624258524ae80486432cd17392d9c3d96f5e83cd2799" + ], + "version": "==1.5.0" }, "docker": { "hashes": [ - "sha256:6e06c5e70ba4fad73e35f00c55a895a448398f3ada7faae072e2bb01348bafc1", - "sha256:8f93775b8bdae3a2df6bc9a5312cce564cade58d6555f2c2570165a1270cd8a7" + "sha256:0604a74719d5d2de438753934b755bfcda6f62f49b8e4b30969a4b0a2a8a1220", + "sha256:e455fa49aabd4f22da9f4e1c1f9d16308286adc60abaf64bf3e1feafaed81d06" ], "index": "pypi", - "version": "==4.1.0" + "version": "==4.4.1" }, - "docutils": { + "dulwich": { "hashes": [ - "sha256:6c4f696463b79f1fb8ba0c594b63840ebd41f059e92b31957c46b74a4599b6d0", - "sha256:9e4d7ecfc600058e07ba661411a2b7de2fd0fafa17d1a7f7361cd47b1175c827", - "sha256:a2aeea129088da402665e92e0b25b04b073c04b2dce4ab65caaa38b7ce2e1a99" + "sha256:0eb7818b633599ad30d148fe54fcdcaae3e21fefdc835ecefbf83a5e54b40e6c", + "sha256:17dd011ddd1cff8f0e80a9bb8a28442cc071dec0fbefc8202dbde8b1db3f4d4d", + "sha256:18c96c3fc544a5c8f8bc7c0bfe697d82f68693ffee00f0c0e7ecf4aefc75736b", + "sha256:22ef7832678af5c34ae2bb0cf26645f51becce104b85c960d26cc446fbd6f137", + "sha256:55613b1cecf0103835d05a04644ce0868630a6d5ba2ac83f847ce407798a7cb8", + "sha256:615e3fab089273ade8ef8377e2b469f45f1d09c948782e47f386cbf95d663e29", + "sha256:63874b54a56871ab69c34d7c3f8f5e2af3949cb47dd491fcc473a6fd25d31f72", + "sha256:6eaa7b6dd07df31759cee06ba30489c421cd0ff993099223a7c7b89f191d8d32", + "sha256:8f49475bdfcab263586f61ac485f1d9e83e0d56de4173bae8f06f3da32620c71", + "sha256:b0e852cd0f74209147cbcf6b58efc32c96297b4942bea3c669a7221133bc25d0", + "sha256:c9eeff547e09c90c4aadc12dc99bac7cfb962def728b9fc012cfd58a3129dad0", + "sha256:d8088a41d6fe6f8871abd1a8ad5fa7a7cadb9c1b7455d397c9a54cc10b04d825", + "sha256:e0c5c863eaed3825473646ae9ec7d5847dacbb06bb11abcfadb488ac93a15b4c", + "sha256:ec6e7ffc5ff387d4173397619308939504736767454e29b02847ea0f801890b6", + "sha256:fb1773373ec2af896031f8312af6962a1b8b0176a2de3fb3d84a84ec04498888", + "sha256:fea0dbd77e5123b81b76582713151bee3ca78f1706026895bfc4040ae1e88894", + "sha256:feb2a10771710d05eff0f0b89979a0b688d7dff8ab1f0dd3a2b7b1147691bb9f" ], - "version": "==0.15.2" + "markers": "python_version >= '3.5'", + "version": "==0.20.15" }, - "entrypoints": { + "enrich": { "hashes": [ - "sha256:589f874b313739ad35be6e0cd7efde2a4e9b6fea91edcc34e58ecbb8dbe56d19", - "sha256:c70dd71abe5a8c85e55e12c19bd91ccfeec11a6e99044204511f9ed547d48451" + "sha256:0e99ff57d87f7b5def0ca79917e88fb9351aa0d52e228ee38bff7cd858315fe4", + "sha256:ed0b3ac33495cc95f1ccafaf6c7ec0a0fcabb20f7f7a90121f37eb83a85bf82b" ], - "version": "==0.3" - }, - "fasteners": { - "hashes": [ - "sha256:007e4d2b2d4a10093f67e932e5166722d2eab83b77724156e92ad013c6226574", - "sha256:3a176da6b70df9bb88498e1a18a9e4a8579ed5b9141207762368a1017bf8f5ef" - ], - "version": "==0.15" - }, - "flake8": { - "hashes": [ - "sha256:19241c1cbc971b9962473e4438a2ca19749a7dd002dd1a946eaba171b4114548", - "sha256:8e9dfa3cecb2400b3738a42c54c3043e821682b9c840b0448c0503f781130696" - ], - "version": "==3.7.8" - }, - "future": { - "hashes": [ - "sha256:67045236dcfd6816dc439556d009594abf643e5eb48992e36beac09c2ca659b8" - ], - "version": "==0.17.1" - }, - "git-url-parse": { - "hashes": [ - "sha256:4655ee22f1d8bf7a1eb1066c1da16529b186966c6d8331f7f55686a76a9f7aef", - "sha256:7b5f4e3aeb1d693afeee67a3bd4ac063f7206c2e8e46e559f0da0da98445f117", - "sha256:9353ff40d69488ff2299b27f40e0350ad87bd5348ea6ea09a1895eda9e5733de" - ], - "version": "==1.2.2" + "markers": "python_version >= '3.6'", + "version": "==1.2.6" }, "idna": { "hashes": [ - "sha256:156a6814fb5ac1fc6850fb002e0852d56c0c8d2531923a51032d1b70760e186e", - "sha256:684a38a6f903c1d71d6d5fac066b58d7768af4de2b832e426ec79c30daa94a16" + "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", + "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" ], - "version": "==2.7" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.10" }, "importlib-metadata": { "hashes": [ - "sha256:aa18d7378b00b40847790e7c27e11673d7fed219354109d0e7b9e5b25dc3ad26", - "sha256:d5f18a79777f3aa179c145737780282e27b508fc8fd688cb17c7a813e8bd39af" + "sha256:ace61d5fc652dc280e7b6b4ff732a9c2d40db2c0f92bc6cb74e07b73d53a1771", + "sha256:fa5daa4477a7414ae34e95942e4dd07f62adf589143c875c133c1e53c4eff38d" ], "markers": "python_version < '3.8'", - "version": "==0.23" + "version": "==3.4.0" }, "jinja2": { "hashes": [ - "sha256:065c4f02ebe7f7cf559e49ee5a95fb800a9e4528727aec6f24402a5374c65013", - "sha256:14dd6caf1527abb21f08f86c784eac40853ba93edb79552aa1e4b8aef1b61c7b" + "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", + "sha256:f0a4641d3cf955324a89c04f3d94663aa4d638abe8f733ecd3582848e1c37035" ], - "version": "==2.10.1" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.11.2" }, "jinja2-time": { "hashes": [ @@ -478,31 +540,40 @@ }, "jmespath": { "hashes": [ - "sha256:3720a4b1bd659dd2eecad0666459b9788813e032b83e7ba58578e48254e0a0e6", - "sha256:bde2aef6f44302dfb30320115b17d030798de8c4110e28d5cf6cf91a7a31074c" + "sha256:b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9", + "sha256:cdf6525904cc597730141d61b36f2e4b8ecc257c420fa2f4549bac2c2d0cb72f" ], - "version": "==0.9.4" + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.0" }, "jsonpatch": { "hashes": [ - "sha256:83f29a2978c13da29bfdf89da9d65542d62576479caf215df19632d7dc04c6e6", - "sha256:cbb72f8bf35260628aea6b508a107245f757d1ec839a19c34349985e2c05645a" + "sha256:da3831be60919e8c98564acfc1fa918cb96e7c9750b0428388483f04d0d1c5a7", + "sha256:e930adc932e4d36087dbbf0f22e1ded32185dfb20662f2e3dd848677a5295a14" ], - "version": "==1.24" + "markers": "python_version != '3.4'", + "version": "==1.28" }, "jsonpointer": { "hashes": [ "sha256:c192ba86648e05fdae4f08a17ec25180a9aef5008d973407b581798a83975362", "sha256:ff379fa021d1b81ab539f5ec467c7745beb1a5671463f9dcc2b2d458bd361c1e" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.0" }, "jsonschema": { "hashes": [ - "sha256:5f9c0a719ca2ce14c5de2fd350a64fd2d13e8539db29836a86adc990bb1a068f", - "sha256:8d4a2b7b6c2237e0199c8ea1a6d3e05bf118e289ae2b9d7ba444182a2959560d" + "sha256:4e5b3cf8216f577bee9ce139cbe72eca3ea4f292ec60928ff24758ce626cd163", + "sha256:c8a85b28d377cc7737e46e2d9f2b4f44ee3c0e1deac6bf46ddefc7187d30797a" ], - "version": "==3.0.2" + "version": "==3.2.0" + }, + "junit-xml": { + "hashes": [ + "sha256:ec5ca1a55aefdd76d28fcc0b135251d156c7106fa979686a4b48d62b761b4732" + ], + "version": "==1.9" }, "markupsafe": { "hashes": [ @@ -510,13 +581,16 @@ "sha256:09027a7803a62ca78792ad89403b1b7a73a01c8cb65909cd876f7fcebd79b161", "sha256:09c4b7f37d6c648cb13f9230d847adf22f8171b1ccc4d5682398e77f40309235", "sha256:1027c282dad077d0bae18be6794e6b6b8c91d58ed8a8d89a89d59693b9131db5", + "sha256:13d3144e1e340870b25e7b10b98d779608c02016d5184cfb9927a9f10c689f42", "sha256:24982cc2533820871eba85ba648cd53d8623687ff11cbb805be4ff7b4c971aff", "sha256:29872e92839765e546828bb7754a68c418d927cd064fd4708fab9fe9c8bb116b", "sha256:43a55c2930bbc139570ac2452adf3d70cdbb3cfe5912c71cdce1c2c6bbd9c5d1", "sha256:46c99d2de99945ec5cb54f23c8cd5689f6d7177305ebff350a58ce5f8de1669e", "sha256:500d4957e52ddc3351cabf489e79c91c17f6e0899158447047588650b5e69183", "sha256:535f6fc4d397c1563d08b88e485c3496cf5784e927af890fb3c3aac7f933ec66", + "sha256:596510de112c685489095da617b5bcbbac7dd6384aeebeda4df6025d0256a81b", "sha256:62fe6c95e3ec8a7fad637b7f3d372c15ec1caa01ab47926cfdf7a75b40e0eac1", + "sha256:6788b695d50a51edb699cb55e35487e430fa21f1ed838122d722e0ff0ac5ba15", "sha256:6dd73240d2af64df90aa7c4e7481e23825ea70af4b4922f8ede5b9e35f78a3b1", "sha256:717ba8fe3ae9cc0006d7c451f0bb265ee07739daf76355d06366154ee68d221e", "sha256:79855e1c5b8da654cf486b830bd42c06e8780cea587384cf6545b7d9ac013a0b", @@ -533,17 +607,13 @@ "sha256:ba59edeaa2fc6114428f1637ffff42da1e311e29382d81b339c1817d37ec93c6", "sha256:c8716a48d94b06bb3b2524c2b77e055fb313aeb4ea620c8dd03a105574ba704f", "sha256:cd5df75523866410809ca100dc9681e301e3c27567cf498077e8551b6d20e42f", - "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7" + "sha256:cdb132fc825c38e1aeec2c8aa9338310d29d337bebbd7baa06889d09a60a1fa2", + "sha256:e249096428b3ae81b08327a63a485ad0878de3fb939049038579ac0ef61e17e7", + "sha256:e8313f01ba26fbbe36c7be1966a7b7424942f670f38e666995b88d012765b9be" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.1" }, - "mccabe": { - "hashes": [ - "sha256:ab8a6258860da4b6677da4bd2fe5dc2c659cff31b3ee4f7f5d64e79735b80d42", - "sha256:dd8d182285a0fe56bace7f45b5e7d1a6ebcbf524e8f3bd87eb0f125271b8831f" - ], - "version": "==0.6.1" - }, "mock": { "hashes": [ "sha256:5ce3c71c5545b472da17b72268978914d0252980348636840bd34a00b5cc96c1", @@ -553,305 +623,303 @@ }, "molecule": { "hashes": [ - "sha256:5fa56e52602364716dd5aa55e1dd70400f2094b8cc3c458869e5382e84149065", - "sha256:9dc29b9ef172b26532752784687faca2e868c84e2d90f0b4f018d81d76a8b30a" + "sha256:9e360073598d45ec86036d84084fc6493dfc4270fd7600ee9ebe0ce03a0af6e5", + "sha256:d96ef3f895250f16142ed51591558d54a67a1546e05ccff386be0320de44973c" ], "index": "pypi", - "version": "==2.20.2" + "version": "==3.2.2" }, - "monotonic": { + "molecule-docker": { "hashes": [ - "sha256:23953d55076df038541e648a53676fb24980f7a1be290cdda21300b3bc21dfb0", - "sha256:552a91f381532e33cbd07c6a2655a21908088962bb8fa7239ecbcc6ad1140cc7" + "sha256:251832979dcb590da4cd46df60f2240c1e88f66f4015223efe350b6afe68c342", + "sha256:715a16d6fb90c6a260f280c8e5c559b3bd4a3e75752eb208f6ab055df5afe04a" ], - "version": "==1.5" + "index": "pypi", + "version": "==0.2.4" }, - "more-itertools": { + "mypy-extensions": { "hashes": [ - "sha256:409cd48d4db7052af495b09dec721011634af3753ae1ef92d2b32f73a745f832", - "sha256:92b8c4b06dac4f0611c0729b2f2ede52b2e1bac1ab48f089c7ddc12e26bb60c4" + "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d", + "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8" ], - "version": "==7.2.0" + "version": "==0.4.3" + }, + "networkx": { + "hashes": [ + "sha256:7978955423fbc9639c10498878be59caf99b44dc304c2286162fd24b458c1602", + "sha256:8c5812e9f798d37c50570d15c4a69d5710a18d77bafc903ee9c5fba7454c616c" + ], + "markers": "python_version >= '3.5'", + "version": "==2.5" }, "packaging": { "hashes": [ - "sha256:28b924174df7a2fa32c1953825ff29c61e2f5e082343165438812f00d3a7fc47", - "sha256:d9551545c6d761f3def1677baf08ab2a3ca17c56879e70fecba2fc4dde4ed108" + "sha256:24e0da08660a87484d1602c30bb4902d74816b6985b93de36926f5bc95741858", + "sha256:78598185a7008a470d64526a8059de9aaa449238f280fc9eb6b13ba6c4109093" ], - "version": "==19.2" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==20.8" + }, + "paramiko": { + "hashes": [ + "sha256:4f3e316fef2ac628b05097a637af35685183111d4bc1b5979bd397c2ab7b5898", + "sha256:7f36f4ba2c0d81d219f4595e35f70d56cc94f9ac40a6acdf51d6ca210ce65035" + ], + "version": "==2.7.2" }, "pathspec": { "hashes": [ - "sha256:e285ccc8b0785beadd4c18e5708b12bb8fcf529a1e61215b3feff1d1e559ea5c" + "sha256:86379d6b86d75816baba717e64b1a3a3469deb93bb76d613c9ce79edc5cb68fd", + "sha256:aa0cb481c4041bf52ffa7b0d8fa6cd3e88a2ca4879c533c9153882ee2556790d" ], - "version": "==0.6.0" + "version": "==0.8.1" }, "pbr": { "hashes": [ - "sha256:f59d71442f9ece3dffc17bc36575768e1ee9967756e6b6535f0ee1f0054c3d68", - "sha256:f6d5b23f226a2ba58e14e49aa3b1bfaf814d0199144b95d78458212444de1387" + "sha256:5fad80b613c402d5b7df7bd84812548b2a61e9977387a80a5fc5c396492b13c9", + "sha256:b236cde0ac9a6aedd5e3c34517b423cd4fd97ef723849da6b0d2231142d89c00" ], - "version": "==5.1.1" - }, - "pexpect": { - "hashes": [ - "sha256:2a8e88259839571d1251d278476f3eec5db26deb73a70be5ed5dc5435e418aba", - "sha256:3fbd41d4caf27fa4a377bfd16fef87271099463e6fa73e92a52f92dfee5d425b" - ], - "version": "==4.6.0" + "markers": "python_version >= '2.6'", + "version": "==5.5.1" }, "pluggy": { "hashes": [ - "sha256:0db4b7601aae1d35b4a033282da476845aa19185c1e6964b25cf324b5e4ec3e6", - "sha256:fa5fa1622fa6dd5c030e9cad086fa19ef6a0cf6d7a2d12318e10cb49d6d68f34" + "sha256:15b2acde666561e1298d71b523007ed7364de07029219b604cf808bfa1c765b0", + "sha256:966c145cd83c96502c3c3868f50408687b38434af77734af1e9ca461a4081d2d" ], - "version": "==0.13.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.13.1" }, "poyo": { "hashes": [ "sha256:3e2ca8e33fdc3c411cd101ca395668395dd5dc7ac775b8e809e3def9f9fe041a", "sha256:e26956aa780c45f011ca9886f044590e2d8fd8b61db7b1c1cf4e0869f48ed4dd" ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.5.0" }, - "psutil": { - "hashes": [ - "sha256:0ff2b16e9045d01edb1dd10d7fbcc184012e37f6cd38029e959f2be9c6223f50", - "sha256:254adb6a27c888f141d2a6032ae231d8ed4fc5f7583b4c825e5f7d7c78d26d2e", - "sha256:319e12f6bae4d4d988fbff3bed792953fa3b44c791f085b0a1a230f755671ef7", - "sha256:529ae235896efb99a6f77653a7138273ab701ec9f0343a1f5030945108dee3c4", - "sha256:686e5a35fe4c0acc25f3466c32e716f2d498aaae7b7edc03e2305b682226bcf6", - "sha256:6d981b4d863b20c8ceed98b8ac3d1ca7f96d28707a80845d360fa69c8fc2c44b", - "sha256:7789885a72aa3075d28d028236eb3f2b84d908f81d38ad41769a6ddc2fd81b7c", - "sha256:7f4616bcb44a6afda930cfc40215e5e9fa7c6896e683b287c771c937712fbe2f", - "sha256:7fdb3d02bfd68f508e6745021311a4a4dbfec53fca03721474e985f310e249ba", - "sha256:a9b85b335b40a528a8e2a6b549592138de8429c6296e7361892958956e6a73cf", - "sha256:dc85fad15ef98103ecc047a0d81b55bbf5fe1b03313b96e883acc2e2fa87ed5c" - ], - "version": "==5.4.6" - }, - "ptyprocess": { - "hashes": [ - "sha256:923f299cc5ad920c68f2bc0bc98b75b9f838b93b599941a6b63ddbc2476394c0", - "sha256:d7cc528d76e76342423ca640335bd3633420dc1366f258cb31d05e865ef5ca1f" - ], - "version": "==0.6.0" - }, - "py": { - "hashes": [ - "sha256:64f65755aee5b381cea27766a3a147c3f15b9b6b9ac88676de66ba2ae36793fa", - "sha256:dc639b046a6e2cff5bbe40194ad65936d6ba360b52b3c3fe1d08a82dd50b5e53" - ], - "version": "==1.8.0" - }, - "pycodestyle": { - "hashes": [ - "sha256:95a2219d12372f05704562a14ec30bc76b05a5b297b21a5dfe3f6fac3491ae56", - "sha256:e40a936c9a450ad81df37f549d676d127b1b66000a6c500caa2b085bc0ca976c" - ], - "version": "==2.5.0" - }, "pycparser": { "hashes": [ - "sha256:a988718abfad80b6b157acce7bf130a30876d27603738ac39f140993246b25b3" + "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", + "sha256:7582ad22678f0fcd81102833f60ef8d0e57288b6b5fb00323d101be910e35705" ], - "version": "==2.19" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.20" }, - "pyflakes": { + "pygments": { "hashes": [ - "sha256:17dbeb2e3f4d772725c777fabc446d5634d1038f234e77343108ce445ea69ce0", - "sha256:d976835886f8c5b31d47970ed689944a0262b5f3afa00a5a7b4dc81e5449f8a2" + "sha256:bc9591213a8f0e0ca1a5e68a479b4887fdc3e75d0774e5c71c31920c427de435", + "sha256:df49d09b498e83c1a73128295860250b0b7edd4c723a32e9bc0d295c7c2ec337" ], - "version": "==2.1.1" + "markers": "python_version >= '3.5'", + "version": "==2.7.4" + }, + "pynacl": { + "hashes": [ + "sha256:06cbb4d9b2c4bd3c8dc0d267416aaed79906e7b33f114ddbf0911969794b1cc4", + "sha256:11335f09060af52c97137d4ac54285bcb7df0cef29014a1a4efe64ac065434c4", + "sha256:2fe0fc5a2480361dcaf4e6e7cea00e078fcda07ba45f811b167e3f99e8cff574", + "sha256:30f9b96db44e09b3304f9ea95079b1b7316b2b4f3744fe3aaecccd95d547063d", + "sha256:4e10569f8cbed81cb7526ae137049759d2a8d57726d52c1a000a3ce366779634", + "sha256:511d269ee845037b95c9781aa702f90ccc36036f95d0f31373a6a79bd8242e25", + "sha256:537a7ccbea22905a0ab36ea58577b39d1fa9b1884869d173b5cf111f006f689f", + "sha256:54e9a2c849c742006516ad56a88f5c74bf2ce92c9f67435187c3c5953b346505", + "sha256:757250ddb3bff1eecd7e41e65f7f833a8405fede0194319f87899690624f2122", + "sha256:7757ae33dae81c300487591c68790dfb5145c7d03324000433d9a2c141f82af7", + "sha256:7c6092102219f59ff29788860ccb021e80fffd953920c4a8653889c029b2d420", + "sha256:8122ba5f2a2169ca5da936b2e5a511740ffb73979381b4229d9188f6dcb22f1f", + "sha256:9c4a7ea4fb81536c1b1f5cc44d54a296f96ae78c1ebd2311bd0b60be45a48d96", + "sha256:c914f78da4953b33d4685e3cdc7ce63401247a21425c16a39760e282075ac4a6", + "sha256:cd401ccbc2a249a47a3a1724c2918fcd04be1f7b54eb2a5a71ff915db0ac51c6", + "sha256:d452a6746f0a7e11121e64625109bc4468fc3100452817001dbe018bb8b08514", + "sha256:ea6841bc3a76fa4942ce00f3bda7d436fda21e2d91602b9e21b7ca9ecab8f3ff", + "sha256:f8851ab9041756003119368c1e6cd0b9c631f46d686b3904b18c0139f4419f80" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.4.0" }, "pyparsing": { "hashes": [ - "sha256:6f98a7b9397e206d78cc01df10131398f1c8b8510a2f4d97d9abd82e1aacdd80", - "sha256:d9338df12903bbf5d65a0e4e87c2161968b10d2e489652bb47001d82a9b028b4" + "sha256:c203ec8783bf771a155b207279b9bccb8dea02d8f0c9e5f8ead507bc3246ecc1", + "sha256:ef9d7589ef3c200abe66653d3f1ab1033c3c419ae9b9bdb1240a85b024efc88b" ], - "version": "==2.4.2" + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.4.7" }, "pyrsistent": { "hashes": [ - "sha256:34b47fa169d6006b32e99d4b3c4031f155e6e68ebcc107d6454852e8e0ee6533" + "sha256:2e636185d9eb976a18a8a8e96efce62f2905fea90041958d8cc2a189756ebf3e" ], - "version": "==0.15.4" - }, - "pytest": { - "hashes": [ - "sha256:13c1c9b22127a77fc684eee24791efafcef343335d855e3573791c68588fe1a5", - "sha256:d8ba7be9466f55ef96ba203fc0f90d0cf212f2f927e69186e1353e30bc7f62e5" - ], - "version": "==5.2.0" + "markers": "python_version >= '3.5'", + "version": "==0.17.3" }, "python-dateutil": { "hashes": [ - "sha256:7e6584c74aeed623791615e26efd690f29817a27c73085b78e4bad02493df2fb", - "sha256:c89805f6f4d64db21ed966fda138f8a5ed7a4fdbc1a8ee329ce1b74e3c74da9e" + "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", + "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "markers": "python_version >= '2.7'", - "version": "==2.8.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.8.1" }, - "python-gilt": { + "python-slugify": { "hashes": [ - "sha256:4fd58c128635d1f4a8c93305e648f23379ce56e23624e4c5479427fcd2d5656e", - "sha256:c7321ef1a8efddbdef657b4fd21c3eaf1b4cb24a9656d97b73a444b1feb2067a", - "sha256:e23a45a6905e6bb7aec3ff7652b48309933a6991fad4546d9e793ac7e0513f8a" + "sha256:69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270" ], - "version": "==1.2.1" + "version": "==4.0.1" }, "pyyaml": { "hashes": [ - "sha256:0113bc0ec2ad727182326b61326afa3d1d8280ae1122493553fd6f4397f33df9", - "sha256:01adf0b6c6f61bd11af6e10ca52b7d4057dd0be0343eb9283c878cf3af56aee4", - "sha256:5124373960b0b3f4aa7df1707e63e9f109b5263eca5976c66e08b1c552d4eaf8", - "sha256:5ca4f10adbddae56d824b2c09668e91219bb178a1eee1faa56af6f99f11bf696", - "sha256:7907be34ffa3c5a32b60b95f4d95ea25361c951383a894fec31be7252b2b6f34", - "sha256:7ec9b2a4ed5cad025c2278a1e6a19c011c80a3caaac804fd2d329e9cc2c287c9", - "sha256:87ae4c829bb25b9fe99cf71fbb2140c448f534e24c998cc60f39ae4f94396a73", - "sha256:9de9919becc9cc2ff03637872a440195ac4241c80536632fffeb6a1e25a74299", - "sha256:a5a85b10e450c66b49f98846937e8cfca1db3127a9d5d1e31ca45c3d0bef4c5b", - "sha256:b0997827b4f6a7c286c01c5f60384d218dca4ed7d9efa945c3e1aa623d5709ae", - "sha256:b631ef96d3222e62861443cc89d6563ba3eeb816eeb96b2629345ab795e53681", - "sha256:bf47c0607522fdbca6c9e817a6e81b08491de50f3766a7a0e6a5be7905961b41", - "sha256:f81025eddd0327c7d4cfe9b62cf33190e1e736cc6e97502b3ec425f574b3e7a8" + "sha256:02c78d77281d8f8d07a255e57abdbf43b02257f59f50cc6b636937d68efa5dd0", + "sha256:0dc9f2eb2e3c97640928dec63fd8dc1dd91e6b6ed236bd5ac00332b99b5c2ff9", + "sha256:124fd7c7bc1e95b1eafc60825f2daf67c73ce7b33f1194731240d24b0d1bf628", + "sha256:26fcb33776857f4072601502d93e1a619f166c9c00befb52826e7b774efaa9db", + "sha256:31ba07c54ef4a897758563e3a0fcc60077698df10180abe4b8165d9895c00ebf", + "sha256:3c49e39ac034fd64fd576d63bb4db53cda89b362768a67f07749d55f128ac18a", + "sha256:52bf0930903818e600ae6c2901f748bc4869c0c406056f679ab9614e5d21a166", + "sha256:5a3f345acff76cad4aa9cb171ee76c590f37394186325d53d1aa25318b0d4a09", + "sha256:5e7ac4e0e79a53451dc2814f6876c2fa6f71452de1498bbe29c0b54b69a986f4", + "sha256:7242790ab6c20316b8e7bb545be48d7ed36e26bbe279fd56f2c4a12510e60b4b", + "sha256:737bd70e454a284d456aa1fa71a0b429dd527bcbf52c5c33f7c8eee81ac16b89", + "sha256:8635d53223b1f561b081ff4adecb828fd484b8efffe542edcfdff471997f7c39", + "sha256:8b818b6c5a920cbe4203b5a6b14256f0e5244338244560da89b7b0f1313ea4b6", + "sha256:8bf38641b4713d77da19e91f8b5296b832e4db87338d6aeffe422d42f1ca896d", + "sha256:a36a48a51e5471513a5aea920cdad84cbd56d70a5057cca3499a637496ea379c", + "sha256:b2243dd033fd02c01212ad5c601dafb44fbb293065f430b0d3dbf03f3254d615", + "sha256:cc547d3ead3754712223abb7b403f0a184e4c3eae18c9bb7fd15adef1597cc4b", + "sha256:cc552b6434b90d9dbed6a4f13339625dc466fd82597119897e9489c953acbc22", + "sha256:f3790156c606299ff499ec44db422f66f05a7363b39eb9d5b064f17bd7d7c47b", + "sha256:f7a21e3d99aa3095ef0553e7ceba36fb693998fbb1226f1392ce33681047465f", + "sha256:fdc6b2cb4b19e431994f25a9160695cc59a4e861710cc6fc97161c5e845fc579" ], - "version": "==5.1.2" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", + "version": "==5.4" + }, + "reprint": { + "hashes": [ + "sha256:3f869944c93113773771eb3d44bb934b1cf0486f4470ac33ad6230c633e1f440" + ], + "version": "==0.5.2" }, "requests": { "hashes": [ - "sha256:11e007a8a2aa0323f5a921e9e6a2d7e4e67d9877e85773fba9ba6419025cbeb4", - "sha256:9cf5292fcd0f598c671cfc1e0d7d1a7f13bb8085e9a590f48c010551dc6c4b31" + "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", + "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" ], - "version": "==2.22.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.25.1" }, - "ruamel.yaml": { + "rich": { "hashes": [ - "sha256:0db639b1b2742dae666c6fc009b8d1931ef15c9276ef31c0673cc6dcf766cf40", - "sha256:412a6f5cfdc0525dee6a27c08f5415c7fd832a7afcb7a0ed7319628aed23d408" + "sha256:c0d5903b463f015b254d6f52da82af3821d266fe516ae05fdc266e6abba5c3a8", + "sha256:d7732d12dfa91a2c06f89fa2b630a068ba12d39ad22a2078b477ef1948b38f3f" ], - "version": "==0.16.5" - }, - "ruamel.yaml.clib": { - "hashes": [ - "sha256:1e77424825caba5553bbade750cec2277ef130647d685c2b38f68bc03453bac6", - "sha256:392b7c371312abf27fb549ec2d5e0092f7ef6e6c9f767bfb13e83cb903aca0fd", - "sha256:4d55386129291b96483edcb93b381470f7cd69f97585829b048a3d758d31210a", - "sha256:550168c02d8de52ee58c3d8a8193d5a8a9491a5e7b2462d27ac5bf63717574c9", - "sha256:57933a6986a3036257ad7bf283529e7c19c2810ff24c86f4a0cfeb49d2099919", - "sha256:615b0396a7fad02d1f9a0dcf9f01202bf9caefee6265198f252c865f4227fcc6", - "sha256:77556a7aa190be9a2bd83b7ee075d3df5f3c5016d395613671487e79b082d784", - "sha256:7aee724e1ff424757b5bd8f6c5bbdb033a570b2b4683b17ace4dbe61a99a657b", - "sha256:8073c8b92b06b572e4057b583c3d01674ceaf32167801fe545a087d7a1e8bf52", - "sha256:9c6d040d0396c28d3eaaa6cb20152cb3b2f15adf35a0304f4f40a3cf9f1d2448", - "sha256:a0ff786d2a7dbe55f9544b3f6ebbcc495d7e730df92a08434604f6f470b899c5", - "sha256:b1b7fcee6aedcdc7e62c3a73f238b3d080c7ba6650cd808bce8d7761ec484070", - "sha256:b66832ea8077d9b3f6e311c4a53d06273db5dc2db6e8a908550f3c14d67e718c", - "sha256:d0d3ac228c9bbab08134b4004d748cf9f8743504875b3603b3afbb97e3472947", - "sha256:d10e9dd744cf85c219bf747c75194b624cc7a94f0c80ead624b06bfa9f61d3bc", - "sha256:ea4362548ee0cbc266949d8a441238d9ad3600ca9910c3fe4e82ee3a50706973", - "sha256:ed5b3698a2bb241b7f5cbbe277eaa7fe48b07a58784fba4f75224fd066d253ad", - "sha256:f9dcc1ae73f36e8059589b601e8e4776b9976effd76c21ad6a855a74318efd6e" - ], - "markers": "platform_python_implementation == 'CPython' and python_version < '3.8'", - "version": "==0.2.0" + "markers": "python_version >= '3.6' and python_version < '4.0'", + "version": "==9.8.2" }, "s3transfer": { "hashes": [ - "sha256:6efc926738a3cd576c2a79725fed9afde92378aa5c6a957e3af010cb019fac9d", - "sha256:b780f2411b824cb541dbcd2c713d0cb61c7d1bcadae204cdddda2b35cef493ba" + "sha256:1e28620e5b444652ed752cf87c7e0cb15b0e578972568c6609f0f18212f259ed", + "sha256:7fdddb4f22275cf1d32129e21f056337fd2a80b6ccef1664528145b72c49e6d2" ], + "version": "==0.3.4" + }, + "selinux": { + "hashes": [ + "sha256:820adcf1b4451c9cc7759848797703263ba0eb6a4cad76d73548a9e0d57b7926", + "sha256:d435f514e834e3fdc0941f6a29d086b80b2ea51b28112aee6254bd104ee42a74" + ], + "markers": "sys_platform == 'linux' and sys_platform == 'linux'", "version": "==0.2.1" }, - "sh": { + "shellingham": { "hashes": [ - "sha256:ae3258c5249493cebe73cb4e18253a41ed69262484bad36fdb3efcb8ad8870bb", - "sha256:b52bf5833ed01c7b5c5fb73a7f71b3d98d48e9b9b8764236237bdc7ecae850fc" + "sha256:576c1982bea0ba82fb46c36feb951319d7f42214a82634233f58b40d858a751e", + "sha256:7f6206ae169dc1a03af8a138681b3f962ae61cc93ade84d0585cca3aaf770044" ], - "version": "==1.12.14" + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.3.2" }, "six": { "hashes": [ - "sha256:3350809f0555b11f552448330d0b52d5f24c91a322ea4a15ef22629740f3761c", - "sha256:d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73" + "sha256:30639c035cdb23534cd4aa2dd52c3bf48f06e5f4a941509c8bafd8ce11080259", + "sha256:8b74bedcbbbaca38ff6d7491d76f2b06b3592611af620f8426e82dddb04a5ced" ], - "version": "==1.12.0" + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.15.0" + }, + "subprocess-tee": { + "hashes": [ + "sha256:8374dfdb1bd6e64278afa67be41f13772b677ae768b523550060fe41d8274faa", + "sha256:f748b5a998f70de1fe2ff5b4d3e28f8671149cb33a3ff90537db26b90122881d" + ], + "markers": "python_version >= '3.6'", + "version": "==0.2.0" }, "tabulate": { "hashes": [ - "sha256:e4ca13f26d0a6be2a2915428dc21e732f1e44dad7f76d7030b2ef1ec251cf7f2" + "sha256:ac64cb76d53b1231d364babcd72abbb16855adac7de6665122f97b593f1eb2ba", + "sha256:db2723a20d04bcda8522165c73eea7c300eda74e0ce852d9022e0159d7895007" ], - "version": "==0.8.2" + "version": "==0.8.7" }, "taskcat": { "hashes": [ - "sha256:e84eb198c74ca677b589889d4e6877568e25858235d51cdd99a8128d525b63b2" + "sha256:8e00b0e8c5921e9689ec502966ce429140aba3a82bbfa7d47a0f4fcfd953a915" ], "index": "pypi", - "version": "==0.8.47" + "version": "==0.9.21" }, - "testinfra": { + "text-unidecode": { "hashes": [ - "sha256:16201d64659ec0c2d25f65d6ce1f5367668b7b4eb102450efd4f8983a399d7d0", - "sha256:5cebf61fee13c2e83b5e177431e751e243fc779293377c5e0c3b43910bb7e870" + "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8", + "sha256:bad6603bb14d279193107714b288be206cac565dfa49aa5b105294dd5c4aab93" ], - "version": "==3.2.0" + "version": "==1.3" }, - "tree-format": { + "typing-extensions": { "hashes": [ - "sha256:a538523aa78ae7a4b10003b04f3e1b37708e0e089d99c9d3b9e1c71384c9a7f9", - "sha256:b5056228dbedde1fb81b79f71fb0c23c98e9d365230df9b29af76e8d8003de11" + "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", + "sha256:99d4073b617d30288f569d3f13d2bd7548c3a7e4c8de87db09a9d29bb3a4a60c", + "sha256:dafc7639cde7f1b6e1acc0f457842a83e722ccca8eef5270af2d74792619a89f" ], - "version": "==0.1.2" + "markers": "python_version < '3.8'", + "version": "==3.7.4.3" }, "urllib3": { "hashes": [ - "sha256:3de946ffbed6e6746608990594d08faac602528ac7015ac28d33cee6a45b7398", - "sha256:9a107b99a5393caf59c7aa3c1249c16e6879447533d0887f4336dde834c7be86" + "sha256:19188f96923873c92ccb987120ec4acaa12f0461fa9ce5d3d0772bc965a39e08", + "sha256:d8ff90d979214d7b4f8ce956e80f4028fc6860e4431f731ea4a8c08f23f99473" ], - "markers": "python_version >= '3.4'", - "version": "==1.25.6" - }, - "wcwidth": { - "hashes": [ - "sha256:3df37372226d6e63e1b1e1eda15c594bca98a22d33a23832a90998faa96bc65e", - "sha256:f4ebe71925af7b40a864553f761ed559b43544f8f71746c2d756c7fe788ade7c" - ], - "version": "==0.1.7" + "markers": "python_version != '3.4'", + "version": "==1.26.2" }, "websocket-client": { "hashes": [ - "sha256:1151d5fb3a62dc129164292e1227655e4bbc5dd5340a5165dfae61128ec50aa9", - "sha256:1fd5520878b68b84b5748bb30e592b10d0a91529d5383f74f4964e72b297fd3a" + "sha256:0fc45c961324d79c781bab301359d5a1b00b13ad1b10415a4780229ef71a5549", + "sha256:d735b91d6d1692a6a181f2a8c9e0238e5f6373356f561bb9dc4c7af36f452010" ], - "version": "==0.56.0" - }, - "whichcraft": { - "hashes": [ - "sha256:acdbb91b63d6a15efbd6430d1d7b2d36e44a71697e93e19b7ded477afd9fce87", - "sha256:deda9266fbb22b8c64fd3ee45c050d61139cd87419765f588e37c8d23e236dd9" - ], - "version": "==0.6.1" + "version": "==0.57.0" }, "yamllint": { "hashes": [ - "sha256:67173339f28868260ce5912abfefa10e115ceb1d2ac1c4d8c7acc8c4ef6c9a8a", - "sha256:70a6f8316851254e197a6231c35577be29fa2fbe2c77390a54c9a50217cdaa13" + "sha256:b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519", + "sha256:c7be4d0d2584a1b561498fa9acb77ad22eb434a109725c7781373ae496d823b3" ], - "version": "==1.17.0" + "version": "==1.25.0" }, "yattag": { "hashes": [ - "sha256:47d1c842e0da596bac081fcc047f2d6fd778b16d20745a28c00ce99d80831fbc" + "sha256:5731a31cb7452c0c6930dd1a284e0170b39eee959851a2aceb8d6af4134a5fa8" ], - "version": "==1.12.2" + "version": "==1.14.0" }, "zipp": { "hashes": [ - "sha256:3718b1cbcd963c7d4c5511a8240812904164b7f381b647143a89d3b98f9bcd8e", - "sha256:f06903e9f1f43b12d371004b4ac7b06ab39a44adc747266928ae6debfa7b3335" + "sha256:102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108", + "sha256:ed5eee1974372595f9e416cc7bbeeb12335201d8081ca8a0743c954d4446e5cb" ], - "version": "==0.6.0" + "markers": "python_version >= '3.6'", + "version": "==3.4.0" } } } From 253c5bd8e1ec0cb2df3ffa886ae17b3670a8f066 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 11:09:32 +1100 Subject: [PATCH 12/25] DCD-1205: Rename playbook.yml -> converge.yml for Molecule v3. --- .../molecule/cw-disabled/{playbook.yml => converge.yml} | 0 roles/aws_common/molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/logs-disabled/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/aurora/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 .../password_char_escaping/{playbook.yml => converge.yml} | 0 .../molecule/system_jdk/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 roles/diy_backup/molecule/default/{playbook.yml => converge.yml} | 0 roles/jira_config/molecule/aurora/{playbook.yml => converge.yml} | 0 roles/jira_config/molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/jira_config_props/{playbook.yml => converge.yml} | 0 .../password_char_escaping/{playbook.yml => converge.yml} | 0 .../linux_common/molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/system_jdk/{playbook.yml => converge.yml} | 0 .../molecule/bitbucket_latest/{playbook.yml => converge.yml} | 0 .../molecule/confluence_latest/{playbook.yml => converge.yml} | 0 .../molecule/crowd_latest/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/jira_all/{playbook.yml => converge.yml} | 0 .../jira_cached_with_downgrade/{playbook.yml => converge.yml} | 0 .../jira_cached_with_upgrade/{playbook.yml => converge.yml} | 0 .../molecule/jira_software_latest/{playbook.yml => converge.yml} | 0 .../molecule/jira_tarball/{playbook.yml => converge.yml} | 0 .../jira_version_from_file/{playbook.yml => converge.yml} | 0 .../molecule/jira_version_latest/{playbook.yml => converge.yml} | 0 .../molecule/jira_version_override/{playbook.yml => converge.yml} | 0 .../molecule/servicedesk3/{playbook.yml => converge.yml} | 0 .../molecule/servicedesk4/{playbook.yml => converge.yml} | 0 .../molecule/servicedesk_latest/{playbook.yml => converge.yml} | 0 .../molecule/bitbucket/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/synchrony/{playbook.yml => converge.yml} | 0 .../molecule/default/{playbook.yml => converge.yml} | 0 .../molecule/restore_conf_server/{playbook.yml => converge.yml} | 0 .../restore_jira_clustered/{playbook.yml => converge.yml} | 0 38 files changed, 0 insertions(+), 0 deletions(-) rename roles/aws_common/molecule/cw-disabled/{playbook.yml => converge.yml} (100%) rename roles/aws_common/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/aws_common/molecule/logs-disabled/{playbook.yml => converge.yml} (100%) rename roles/bitbucket_config/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/confluence_config/molecule/aurora/{playbook.yml => converge.yml} (100%) rename roles/confluence_config/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/confluence_config/molecule/password_char_escaping/{playbook.yml => converge.yml} (100%) rename roles/confluence_config/molecule/system_jdk/{playbook.yml => converge.yml} (100%) rename roles/create_backups/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/diy_backup/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/jira_config/molecule/aurora/{playbook.yml => converge.yml} (100%) rename roles/jira_config/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/jira_config/molecule/jira_config_props/{playbook.yml => converge.yml} (100%) rename roles/jira_config/molecule/password_char_escaping/{playbook.yml => converge.yml} (100%) rename roles/linux_common/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/product_common/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/product_common/molecule/system_jdk/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/bitbucket_latest/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/confluence_latest/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/crowd_latest/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_all/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_cached_with_downgrade/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_cached_with_upgrade/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_software_latest/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_tarball/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_version_from_file/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_version_latest/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/jira_version_override/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/servicedesk3/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/servicedesk4/{playbook.yml => converge.yml} (100%) rename roles/product_install/molecule/servicedesk_latest/{playbook.yml => converge.yml} (100%) rename roles/product_startup/molecule/bitbucket/{playbook.yml => converge.yml} (100%) rename roles/product_startup/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/product_startup/molecule/synchrony/{playbook.yml => converge.yml} (100%) rename roles/restore_backups/molecule/default/{playbook.yml => converge.yml} (100%) rename roles/restore_backups/molecule/restore_conf_server/{playbook.yml => converge.yml} (100%) rename roles/restore_backups/molecule/restore_jira_clustered/{playbook.yml => converge.yml} (100%) diff --git a/roles/aws_common/molecule/cw-disabled/playbook.yml b/roles/aws_common/molecule/cw-disabled/converge.yml similarity index 100% rename from roles/aws_common/molecule/cw-disabled/playbook.yml rename to roles/aws_common/molecule/cw-disabled/converge.yml diff --git a/roles/aws_common/molecule/default/playbook.yml b/roles/aws_common/molecule/default/converge.yml similarity index 100% rename from roles/aws_common/molecule/default/playbook.yml rename to roles/aws_common/molecule/default/converge.yml diff --git a/roles/aws_common/molecule/logs-disabled/playbook.yml b/roles/aws_common/molecule/logs-disabled/converge.yml similarity index 100% rename from roles/aws_common/molecule/logs-disabled/playbook.yml rename to roles/aws_common/molecule/logs-disabled/converge.yml diff --git a/roles/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/converge.yml similarity index 100% rename from roles/bitbucket_config/molecule/default/playbook.yml rename to roles/bitbucket_config/molecule/default/converge.yml diff --git a/roles/confluence_config/molecule/aurora/playbook.yml b/roles/confluence_config/molecule/aurora/converge.yml similarity index 100% rename from roles/confluence_config/molecule/aurora/playbook.yml rename to roles/confluence_config/molecule/aurora/converge.yml diff --git a/roles/confluence_config/molecule/default/playbook.yml b/roles/confluence_config/molecule/default/converge.yml similarity index 100% rename from roles/confluence_config/molecule/default/playbook.yml rename to roles/confluence_config/molecule/default/converge.yml diff --git a/roles/confluence_config/molecule/password_char_escaping/playbook.yml b/roles/confluence_config/molecule/password_char_escaping/converge.yml similarity index 100% rename from roles/confluence_config/molecule/password_char_escaping/playbook.yml rename to roles/confluence_config/molecule/password_char_escaping/converge.yml diff --git a/roles/confluence_config/molecule/system_jdk/playbook.yml b/roles/confluence_config/molecule/system_jdk/converge.yml similarity index 100% rename from roles/confluence_config/molecule/system_jdk/playbook.yml rename to roles/confluence_config/molecule/system_jdk/converge.yml diff --git a/roles/create_backups/molecule/default/playbook.yml b/roles/create_backups/molecule/default/converge.yml similarity index 100% rename from roles/create_backups/molecule/default/playbook.yml rename to roles/create_backups/molecule/default/converge.yml diff --git a/roles/diy_backup/molecule/default/playbook.yml b/roles/diy_backup/molecule/default/converge.yml similarity index 100% rename from roles/diy_backup/molecule/default/playbook.yml rename to roles/diy_backup/molecule/default/converge.yml diff --git a/roles/jira_config/molecule/aurora/playbook.yml b/roles/jira_config/molecule/aurora/converge.yml similarity index 100% rename from roles/jira_config/molecule/aurora/playbook.yml rename to roles/jira_config/molecule/aurora/converge.yml diff --git a/roles/jira_config/molecule/default/playbook.yml b/roles/jira_config/molecule/default/converge.yml similarity index 100% rename from roles/jira_config/molecule/default/playbook.yml rename to roles/jira_config/molecule/default/converge.yml diff --git a/roles/jira_config/molecule/jira_config_props/playbook.yml b/roles/jira_config/molecule/jira_config_props/converge.yml similarity index 100% rename from roles/jira_config/molecule/jira_config_props/playbook.yml rename to roles/jira_config/molecule/jira_config_props/converge.yml diff --git a/roles/jira_config/molecule/password_char_escaping/playbook.yml b/roles/jira_config/molecule/password_char_escaping/converge.yml similarity index 100% rename from roles/jira_config/molecule/password_char_escaping/playbook.yml rename to roles/jira_config/molecule/password_char_escaping/converge.yml diff --git a/roles/linux_common/molecule/default/playbook.yml b/roles/linux_common/molecule/default/converge.yml similarity index 100% rename from roles/linux_common/molecule/default/playbook.yml rename to roles/linux_common/molecule/default/converge.yml diff --git a/roles/product_common/molecule/default/playbook.yml b/roles/product_common/molecule/default/converge.yml similarity index 100% rename from roles/product_common/molecule/default/playbook.yml rename to roles/product_common/molecule/default/converge.yml diff --git a/roles/product_common/molecule/system_jdk/playbook.yml b/roles/product_common/molecule/system_jdk/converge.yml similarity index 100% rename from roles/product_common/molecule/system_jdk/playbook.yml rename to roles/product_common/molecule/system_jdk/converge.yml diff --git a/roles/product_install/molecule/bitbucket_latest/playbook.yml b/roles/product_install/molecule/bitbucket_latest/converge.yml similarity index 100% rename from roles/product_install/molecule/bitbucket_latest/playbook.yml rename to roles/product_install/molecule/bitbucket_latest/converge.yml diff --git a/roles/product_install/molecule/confluence_latest/playbook.yml b/roles/product_install/molecule/confluence_latest/converge.yml similarity index 100% rename from roles/product_install/molecule/confluence_latest/playbook.yml rename to roles/product_install/molecule/confluence_latest/converge.yml diff --git a/roles/product_install/molecule/crowd_latest/playbook.yml b/roles/product_install/molecule/crowd_latest/converge.yml similarity index 100% rename from roles/product_install/molecule/crowd_latest/playbook.yml rename to roles/product_install/molecule/crowd_latest/converge.yml diff --git a/roles/product_install/molecule/default/playbook.yml b/roles/product_install/molecule/default/converge.yml similarity index 100% rename from roles/product_install/molecule/default/playbook.yml rename to roles/product_install/molecule/default/converge.yml diff --git a/roles/product_install/molecule/jira_all/playbook.yml b/roles/product_install/molecule/jira_all/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_all/playbook.yml rename to roles/product_install/molecule/jira_all/converge.yml diff --git a/roles/product_install/molecule/jira_cached_with_downgrade/playbook.yml b/roles/product_install/molecule/jira_cached_with_downgrade/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_cached_with_downgrade/playbook.yml rename to roles/product_install/molecule/jira_cached_with_downgrade/converge.yml diff --git a/roles/product_install/molecule/jira_cached_with_upgrade/playbook.yml b/roles/product_install/molecule/jira_cached_with_upgrade/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_cached_with_upgrade/playbook.yml rename to roles/product_install/molecule/jira_cached_with_upgrade/converge.yml diff --git a/roles/product_install/molecule/jira_software_latest/playbook.yml b/roles/product_install/molecule/jira_software_latest/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_software_latest/playbook.yml rename to roles/product_install/molecule/jira_software_latest/converge.yml diff --git a/roles/product_install/molecule/jira_tarball/playbook.yml b/roles/product_install/molecule/jira_tarball/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_tarball/playbook.yml rename to roles/product_install/molecule/jira_tarball/converge.yml diff --git a/roles/product_install/molecule/jira_version_from_file/playbook.yml b/roles/product_install/molecule/jira_version_from_file/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_version_from_file/playbook.yml rename to roles/product_install/molecule/jira_version_from_file/converge.yml diff --git a/roles/product_install/molecule/jira_version_latest/playbook.yml b/roles/product_install/molecule/jira_version_latest/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_version_latest/playbook.yml rename to roles/product_install/molecule/jira_version_latest/converge.yml diff --git a/roles/product_install/molecule/jira_version_override/playbook.yml b/roles/product_install/molecule/jira_version_override/converge.yml similarity index 100% rename from roles/product_install/molecule/jira_version_override/playbook.yml rename to roles/product_install/molecule/jira_version_override/converge.yml diff --git a/roles/product_install/molecule/servicedesk3/playbook.yml b/roles/product_install/molecule/servicedesk3/converge.yml similarity index 100% rename from roles/product_install/molecule/servicedesk3/playbook.yml rename to roles/product_install/molecule/servicedesk3/converge.yml diff --git a/roles/product_install/molecule/servicedesk4/playbook.yml b/roles/product_install/molecule/servicedesk4/converge.yml similarity index 100% rename from roles/product_install/molecule/servicedesk4/playbook.yml rename to roles/product_install/molecule/servicedesk4/converge.yml diff --git a/roles/product_install/molecule/servicedesk_latest/playbook.yml b/roles/product_install/molecule/servicedesk_latest/converge.yml similarity index 100% rename from roles/product_install/molecule/servicedesk_latest/playbook.yml rename to roles/product_install/molecule/servicedesk_latest/converge.yml diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/converge.yml similarity index 100% rename from roles/product_startup/molecule/bitbucket/playbook.yml rename to roles/product_startup/molecule/bitbucket/converge.yml diff --git a/roles/product_startup/molecule/default/playbook.yml b/roles/product_startup/molecule/default/converge.yml similarity index 100% rename from roles/product_startup/molecule/default/playbook.yml rename to roles/product_startup/molecule/default/converge.yml diff --git a/roles/product_startup/molecule/synchrony/playbook.yml b/roles/product_startup/molecule/synchrony/converge.yml similarity index 100% rename from roles/product_startup/molecule/synchrony/playbook.yml rename to roles/product_startup/molecule/synchrony/converge.yml diff --git a/roles/restore_backups/molecule/default/playbook.yml b/roles/restore_backups/molecule/default/converge.yml similarity index 100% rename from roles/restore_backups/molecule/default/playbook.yml rename to roles/restore_backups/molecule/default/converge.yml diff --git a/roles/restore_backups/molecule/restore_conf_server/playbook.yml b/roles/restore_backups/molecule/restore_conf_server/converge.yml similarity index 100% rename from roles/restore_backups/molecule/restore_conf_server/playbook.yml rename to roles/restore_backups/molecule/restore_conf_server/converge.yml diff --git a/roles/restore_backups/molecule/restore_jira_clustered/playbook.yml b/roles/restore_backups/molecule/restore_jira_clustered/converge.yml similarity index 100% rename from roles/restore_backups/molecule/restore_jira_clustered/playbook.yml rename to roles/restore_backups/molecule/restore_jira_clustered/converge.yml From c7c355fe0a4c5f8dbf5f8a960c70873a71876caa Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 11:11:25 +1100 Subject: [PATCH 13/25] DCD-1205: Add additional dependencies no longer included in Molecule v3. --- Pipfile | 2 ++ Pipfile.lock | 49 ++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 1 deletion(-) diff --git a/Pipfile b/Pipfile index f46d0d1..8725677 100644 --- a/Pipfile +++ b/Pipfile @@ -13,6 +13,8 @@ molecule = "==3.2.2" molecule-docker = "==0.2.4" docker = "==4.4.1" taskcat = "*" +pytest = "*" +testinfra = "*" [requires] python_version = "3.7" diff --git a/Pipfile.lock b/Pipfile.lock index 755afa0..264329b 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "2e42055eea584ff6e802a84ad3a3bb5845d3a4f35b2d707223b0dadff955bd3b" + "sha256": "da42952f61acb670cc8542ac3a7cf870522cd2d38a8b5493b8872f0542969e52" }, "pipfile-spec": 6, "requires": { @@ -523,6 +523,13 @@ "markers": "python_version < '3.8'", "version": "==3.4.0" }, + "iniconfig": { + "hashes": [ + "sha256:011e24c64b7f47f6ebd835bb12a743f2fbe9a26d4cecaa7f53bc4f35ee9da8b3", + "sha256:bc3af051d7d14b2ee5ef9969666def0cd1a000e121eaea580d4a313df4b37f32" + ], + "version": "==1.1.1" + }, "jinja2": { "hashes": [ "sha256:89aab215427ef59c34ad58735269eb58b1a5808103067f7bb9d5836c651b3bb0", @@ -698,6 +705,14 @@ "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.5.0" }, + "py": { + "hashes": [ + "sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3", + "sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==1.10.0" + }, "pycparser": { "hashes": [ "sha256:2d475327684562c3a96cc71adf7dc8c4f0565175cf86b6d7a404ff4c771f15f0", @@ -753,6 +768,22 @@ "markers": "python_version >= '3.5'", "version": "==0.17.3" }, + "pytest": { + "hashes": [ + "sha256:1969f797a1a0dbd8ccf0fecc80262312729afea9c17f1d70ebf85c5e76c6f7c8", + "sha256:66e419b1899bc27346cb2c993e12c5e5e8daba9073c1fbce33b9807abc95c306" + ], + "index": "pypi", + "version": "==6.2.1" + }, + "pytest-testinfra": { + "hashes": [ + "sha256:82d9f20e5c334202a67adf74a0db8492629364e8a955f402eaf69afa9b91d0a8", + "sha256:c0ab1a9b7a9550c1cade72e905956ca44400757c347ca11ba9399d6ac8a8cf7f" + ], + "markers": "python_version >= '3.6'", + "version": "==6.1.0" + }, "python-dateutil": { "hashes": [ "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", @@ -869,6 +900,14 @@ "index": "pypi", "version": "==0.9.21" }, + "testinfra": { + "hashes": [ + "sha256:1a75b5025dbe82ffedec50afeaf9a7f96a8cd1e294f0d40de3a089a369ceae0e", + "sha256:4225d36e4bb02eb1618429325280c4b62a18cea8a90c91564ee0cc1d31ca331a" + ], + "index": "pypi", + "version": "==6.0.0" + }, "text-unidecode": { "hashes": [ "sha256:1311f10e8b895935241623731c2ba64f4c455287888b18189350b67134a822e8", @@ -876,6 +915,14 @@ ], "version": "==1.3" }, + "toml": { + "hashes": [ + "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", + "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" + ], + "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==0.10.2" + }, "typing-extensions": { "hashes": [ "sha256:7cb407020f00f7bfc3cb3e7881628838e69d8f3fcab2f64742a5e76b2f841918", From c187f992f006dcffe79c61d0560716cc98a53604 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 11:26:36 +1100 Subject: [PATCH 14/25] DCD-1205: Remove linting from molecule tests. It changed in v3, didnt't really help, and we ended up disabling it most of the time anyway. --- roles/aws_common/molecule/cw-disabled/molecule.yml | 9 --------- roles/aws_common/molecule/default/molecule.yml | 9 --------- roles/aws_common/molecule/logs-disabled/molecule.yml | 9 --------- roles/bitbucket_config/molecule/default/molecule.yml | 12 ------------ roles/confluence_config/molecule/aurora/molecule.yml | 9 --------- .../confluence_config/molecule/default/molecule.yml | 9 --------- .../molecule/password_char_escaping/molecule.yml | 10 +--------- .../molecule/system_jdk/molecule.yml | 9 --------- roles/create_backups/molecule/default/molecule.yml | 6 ------ roles/diy_backup/molecule/default/molecule.yml | 9 --------- roles/jira_config/molecule/aurora/molecule.yml | 9 --------- roles/jira_config/molecule/default/molecule.yml | 9 --------- .../molecule/jira_config_props/molecule.yml | 9 --------- .../molecule/password_char_escaping/molecule.yml | 9 --------- roles/linux_common/molecule/default/molecule.yml | 6 ------ roles/product_common/molecule/default/molecule.yml | 6 ------ .../product_common/molecule/system_jdk/molecule.yml | 6 ------ .../molecule/bitbucket_latest/molecule.yml | 7 ------- .../molecule/confluence_latest/molecule.yml | 7 ------- .../molecule/crowd_latest/molecule.yml | 7 ------- roles/product_install/molecule/default/molecule.yml | 7 ------- roles/product_install/molecule/jira_all/molecule.yml | 7 ------- .../molecule/jira_cached_with_downgrade/molecule.yml | 7 ------- .../molecule/jira_cached_with_upgrade/molecule.yml | 7 ------- .../molecule/jira_software_latest/molecule.yml | 7 ------- .../molecule/jira_tarball/molecule.yml | 7 ------- .../molecule/jira_version_from_file/molecule.yml | 7 ------- .../molecule/jira_version_latest/molecule.yml | 7 ------- .../molecule/jira_version_override/molecule.yml | 7 ------- .../molecule/servicedesk3/molecule.yml | 7 ------- .../molecule/servicedesk4/molecule.yml | 7 ------- .../molecule/servicedesk_latest/molecule.yml | 7 ------- .../product_startup/molecule/bitbucket/molecule.yml | 9 --------- roles/product_startup/molecule/default/molecule.yml | 9 --------- .../product_startup/molecule/synchrony/molecule.yml | 9 --------- roles/restore_backups/molecule/default/molecule.yml | 9 --------- .../molecule/restore_conf_server/molecule.yml | 9 --------- .../molecule/restore_jira_clustered/molecule.yml | 9 --------- 38 files changed, 1 insertion(+), 303 deletions(-) diff --git a/roles/aws_common/molecule/cw-disabled/molecule.yml b/roles/aws_common/molecule/cw-disabled/molecule.yml index 9abbc31..9a1ec33 100644 --- a/roles/aws_common/molecule/cw-disabled/molecule.yml +++ b/roles/aws_common/molecule/cw-disabled/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -14,15 +12,8 @@ platforms: # image: ubuntu:bionic provisioner: name: ansible - lint: - name: ansible-lint - options: - x: ["303", "602"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/aws_common/molecule/default/molecule.yml b/roles/aws_common/molecule/default/molecule.yml index 9abbc31..9a1ec33 100644 --- a/roles/aws_common/molecule/default/molecule.yml +++ b/roles/aws_common/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -14,15 +12,8 @@ platforms: # image: ubuntu:bionic provisioner: name: ansible - lint: - name: ansible-lint - options: - x: ["303", "602"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/aws_common/molecule/logs-disabled/molecule.yml b/roles/aws_common/molecule/logs-disabled/molecule.yml index 9abbc31..9a1ec33 100644 --- a/roles/aws_common/molecule/logs-disabled/molecule.yml +++ b/roles/aws_common/molecule/logs-disabled/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -14,15 +12,8 @@ platforms: # image: ubuntu:bionic provisioner: name: ansible - lint: - name: ansible-lint - options: - x: ["303", "602"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml index 8829d75..400e984 100644 --- a/roles/bitbucket_config/molecule/default/molecule.yml +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -3,11 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint - options: - config-data: - line-length: disable platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -25,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/confluence_config/molecule/aurora/molecule.yml b/roles/confluence_config/molecule/aurora/molecule.yml index 33c377c..3ea826a 100644 --- a/roles/confluence_config/molecule/aurora/molecule.yml +++ b/roles/confluence_config/molecule/aurora/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,15 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/confluence_config/molecule/default/molecule.yml b/roles/confluence_config/molecule/default/molecule.yml index 33c377c..3ea826a 100644 --- a/roles/confluence_config/molecule/default/molecule.yml +++ b/roles/confluence_config/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,15 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/confluence_config/molecule/password_char_escaping/molecule.yml b/roles/confluence_config/molecule/password_char_escaping/molecule.yml index 33c377c..cc50e25 100644 --- a/roles/confluence_config/molecule/password_char_escaping/molecule.yml +++ b/roles/confluence_config/molecule/password_char_escaping/molecule.yml @@ -3,8 +3,7 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint + platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,15 +17,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/confluence_config/molecule/system_jdk/molecule.yml b/roles/confluence_config/molecule/system_jdk/molecule.yml index 33c377c..3ea826a 100644 --- a/roles/confluence_config/molecule/system_jdk/molecule.yml +++ b/roles/confluence_config/molecule/system_jdk/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,15 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/create_backups/molecule/default/molecule.yml b/roles/create_backups/molecule/default/molecule.yml index 3261663..359433c 100644 --- a/roles/create_backups/molecule/default/molecule.yml +++ b/roles/create_backups/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -29,9 +27,5 @@ platforms: # image: ubuntu:bionic provisioner: name: ansible - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/diy_backup/molecule/default/molecule.yml b/roles/diy_backup/molecule/default/molecule.yml index 7f082f6..400e984 100644 --- a/roles/diy_backup/molecule/default/molecule.yml +++ b/roles/diy_backup/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/jira_config/molecule/aurora/molecule.yml b/roles/jira_config/molecule/aurora/molecule.yml index 7f082f6..400e984 100644 --- a/roles/jira_config/molecule/aurora/molecule.yml +++ b/roles/jira_config/molecule/aurora/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/jira_config/molecule/default/molecule.yml b/roles/jira_config/molecule/default/molecule.yml index 7f082f6..400e984 100644 --- a/roles/jira_config/molecule/default/molecule.yml +++ b/roles/jira_config/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/jira_config/molecule/jira_config_props/molecule.yml b/roles/jira_config/molecule/jira_config_props/molecule.yml index 7f082f6..400e984 100644 --- a/roles/jira_config/molecule/jira_config_props/molecule.yml +++ b/roles/jira_config/molecule/jira_config_props/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/jira_config/molecule/password_char_escaping/molecule.yml b/roles/jira_config/molecule/password_char_escaping/molecule.yml index 7f082f6..400e984 100644 --- a/roles/jira_config/molecule/password_char_escaping/molecule.yml +++ b/roles/jira_config/molecule/password_char_escaping/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/linux_common/molecule/default/molecule.yml b/roles/linux_common/molecule/default/molecule.yml index bf5d3fc..106d967 100644 --- a/roles/linux_common/molecule/default/molecule.yml +++ b/roles/linux_common/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -16,12 +14,8 @@ platforms: - aws_node_local provisioner: name: ansible - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/product_common/molecule/default/molecule.yml b/roles/product_common/molecule/default/molecule.yml index c6a6d26..b790cb4 100644 --- a/roles/product_common/molecule/default/molecule.yml +++ b/roles/product_common/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -12,9 +10,5 @@ platforms: image: ubuntu:bionic provisioner: name: ansible - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/product_common/molecule/system_jdk/molecule.yml b/roles/product_common/molecule/system_jdk/molecule.yml index c6a6d26..b790cb4 100644 --- a/roles/product_common/molecule/system_jdk/molecule.yml +++ b/roles/product_common/molecule/system_jdk/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -12,9 +10,5 @@ platforms: image: ubuntu:bionic provisioner: name: ansible - lint: - name: ansible-lint verifier: name: testinfra - lint: - name: flake8 diff --git a/roles/product_install/molecule/bitbucket_latest/molecule.yml b/roles/product_install/molecule/bitbucket_latest/molecule.yml index 7fd3163..3ea826a 100644 --- a/roles/product_install/molecule/bitbucket_latest/molecule.yml +++ b/roles/product_install/molecule/bitbucket_latest/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,13 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/confluence_latest/molecule.yml b/roles/product_install/molecule/confluence_latest/molecule.yml index 7fd3163..3ea826a 100644 --- a/roles/product_install/molecule/confluence_latest/molecule.yml +++ b/roles/product_install/molecule/confluence_latest/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,13 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/crowd_latest/molecule.yml b/roles/product_install/molecule/crowd_latest/molecule.yml index 7fd3163..3ea826a 100644 --- a/roles/product_install/molecule/crowd_latest/molecule.yml +++ b/roles/product_install/molecule/crowd_latest/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,13 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/default/molecule.yml b/roles/product_install/molecule/default/molecule.yml index 46049f8..644207c 100644 --- a/roles/product_install/molecule/default/molecule.yml +++ b/roles/product_install/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,8 +16,6 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -27,6 +23,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/jira_all/molecule.yml b/roles/product_install/molecule/jira_all/molecule.yml index 7fd3163..3ea826a 100644 --- a/roles/product_install/molecule/jira_all/molecule.yml +++ b/roles/product_install/molecule/jira_all/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,13 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false 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 2caa40b..34c0289 100644 --- a/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_downgrade/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -19,8 +17,6 @@ provisioner: options: vvv: true skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -28,6 +24,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false 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 2caa40b..34c0289 100644 --- a/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml +++ b/roles/product_install/molecule/jira_cached_with_upgrade/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -19,8 +17,6 @@ provisioner: options: vvv: true skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -28,6 +24,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/jira_software_latest/molecule.yml b/roles/product_install/molecule/jira_software_latest/molecule.yml index 7fd3163..3ea826a 100644 --- a/roles/product_install/molecule/jira_software_latest/molecule.yml +++ b/roles/product_install/molecule/jira_software_latest/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,13 +16,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/jira_tarball/molecule.yml b/roles/product_install/molecule/jira_tarball/molecule.yml index 46049f8..644207c 100644 --- a/roles/product_install/molecule/jira_tarball/molecule.yml +++ b/roles/product_install/molecule/jira_tarball/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,8 +16,6 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -27,6 +23,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false 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 46049f8..644207c 100644 --- a/roles/product_install/molecule/jira_version_from_file/molecule.yml +++ b/roles/product_install/molecule/jira_version_from_file/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,8 +16,6 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -27,6 +23,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/jira_version_latest/molecule.yml b/roles/product_install/molecule/jira_version_latest/molecule.yml index 46049f8..644207c 100644 --- a/roles/product_install/molecule/jira_version_latest/molecule.yml +++ b/roles/product_install/molecule/jira_version_latest/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,8 +16,6 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -27,6 +23,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/jira_version_override/molecule.yml b/roles/product_install/molecule/jira_version_override/molecule.yml index 46049f8..644207c 100644 --- a/roles/product_install/molecule/jira_version_override/molecule.yml +++ b/roles/product_install/molecule/jira_version_override/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -18,8 +16,6 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ @@ -27,6 +23,3 @@ verifier: name: testinfra additional_files_or_dirs: - ../../resources/tests/test_*.py - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/servicedesk3/molecule.yml b/roles/product_install/molecule/servicedesk3/molecule.yml index 52ea9de..f597cd9 100644 --- a/roles/product_install/molecule/servicedesk3/molecule.yml +++ b/roles/product_install/molecule/servicedesk3/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -19,13 +17,8 @@ provisioner: options: vv: true skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/servicedesk4/molecule.yml b/roles/product_install/molecule/servicedesk4/molecule.yml index 52ea9de..f597cd9 100644 --- a/roles/product_install/molecule/servicedesk4/molecule.yml +++ b/roles/product_install/molecule/servicedesk4/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -19,13 +17,8 @@ provisioner: options: vv: true skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_install/molecule/servicedesk_latest/molecule.yml b/roles/product_install/molecule/servicedesk_latest/molecule.yml index 52ea9de..f597cd9 100644 --- a/roles/product_install/molecule/servicedesk_latest/molecule.yml +++ b/roles/product_install/molecule/servicedesk_latest/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -19,13 +17,8 @@ provisioner: options: vv: true skip-tags: runtime_pkg - lint: - name: ansible-lint inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_startup/molecule/bitbucket/molecule.yml b/roles/product_startup/molecule/bitbucket/molecule.yml index 7f082f6..400e984 100644 --- a/roles/product_startup/molecule/bitbucket/molecule.yml +++ b/roles/product_startup/molecule/bitbucket/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_startup/molecule/default/molecule.yml b/roles/product_startup/molecule/default/molecule.yml index 7f082f6..400e984 100644 --- a/roles/product_startup/molecule/default/molecule.yml +++ b/roles/product_startup/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/product_startup/molecule/synchrony/molecule.yml b/roles/product_startup/molecule/synchrony/molecule.yml index 7f082f6..400e984 100644 --- a/roles/product_startup/molecule/synchrony/molecule.yml +++ b/roles/product_startup/molecule/synchrony/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/restore_backups/molecule/default/molecule.yml b/roles/restore_backups/molecule/default/molecule.yml index 7f082f6..400e984 100644 --- a/roles/restore_backups/molecule/default/molecule.yml +++ b/roles/restore_backups/molecule/default/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -22,15 +20,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/restore_backups/molecule/restore_conf_server/molecule.yml b/roles/restore_backups/molecule/restore_conf_server/molecule.yml index 04c0973..20bae52 100644 --- a/roles/restore_backups/molecule/restore_conf_server/molecule.yml +++ b/roles/restore_backups/molecule/restore_conf_server/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -16,15 +14,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false diff --git a/roles/restore_backups/molecule/restore_jira_clustered/molecule.yml b/roles/restore_backups/molecule/restore_jira_clustered/molecule.yml index 04c0973..20bae52 100644 --- a/roles/restore_backups/molecule/restore_jira_clustered/molecule.yml +++ b/roles/restore_backups/molecule/restore_jira_clustered/molecule.yml @@ -3,8 +3,6 @@ dependency: name: galaxy driver: name: docker -lint: - name: yamllint platforms: - name: amazon_linux2 image: amazonlinux:2 @@ -16,15 +14,8 @@ provisioner: name: ansible options: skip-tags: runtime_pkg - lint: - name: ansible-lint - options: - x: ["701"] inventory: links: group_vars: ../../../../group_vars/ verifier: name: testinfra - lint: - name: flake8 - enabled: false From 5b7d4382af0bdca26d85339eb7e49eb3c227a71b Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 12:06:17 +1100 Subject: [PATCH 15/25] DCD-1205: Make generate pipeline steps more descriptive. --- bitbucket-pipelines.yml | 76 +++++++++++++++++----------------- pipeline_generator/pipeline.py | 7 ++-- 2 files changed, 42 insertions(+), 41 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index c9cd2fb..3160c1f 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -32,7 +32,7 @@ pipelines: fi - parallel: - step: - name: Molecule Test Batch - 1 + name: Molecule Test Batch - aws_common/cw-disabled services: - docker script: @@ -40,7 +40,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 1 - step: - name: Molecule Test Batch - 2 + name: Molecule Test Batch - aws_common/default services: - docker script: @@ -48,7 +48,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 2 - step: - name: Molecule Test Batch - 3 + name: Molecule Test Batch - aws_common/logs-disabled services: - docker script: @@ -56,7 +56,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 3 - step: - name: Molecule Test Batch - 4 + name: Molecule Test Batch - bitbucket_config/default services: - docker script: @@ -64,7 +64,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 4 - step: - name: Molecule Test Batch - 5 + name: Molecule Test Batch - confluence_config/aurora services: - docker script: @@ -72,7 +72,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 5 - step: - name: Molecule Test Batch - 6 + name: Molecule Test Batch - confluence_config/default services: - docker script: @@ -80,7 +80,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 6 - step: - name: Molecule Test Batch - 7 + name: Molecule Test Batch - confluence_config/password_char_escaping services: - docker script: @@ -88,7 +88,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 7 - step: - name: Molecule Test Batch - 8 + name: Molecule Test Batch - confluence_config/system_jdk services: - docker script: @@ -96,7 +96,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 8 - step: - name: Molecule Test Batch - 9 + name: Molecule Test Batch - create_backups/default services: - docker script: @@ -104,7 +104,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 9 - step: - name: Molecule Test Batch - 10 + name: Molecule Test Batch - diy_backup/default services: - docker script: @@ -112,7 +112,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 10 - step: - name: Molecule Test Batch - 11 + name: Molecule Test Batch - jira_config/aurora services: - docker script: @@ -120,7 +120,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 11 - step: - name: Molecule Test Batch - 12 + name: Molecule Test Batch - jira_config/default services: - docker script: @@ -128,7 +128,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 12 - step: - name: Molecule Test Batch - 13 + name: Molecule Test Batch - jira_config/jira_config_props services: - docker script: @@ -136,7 +136,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 13 - step: - name: Molecule Test Batch - 14 + name: Molecule Test Batch - jira_config/password_char_escaping services: - docker script: @@ -144,7 +144,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 14 - step: - name: Molecule Test Batch - 15 + name: Molecule Test Batch - linux_common/default services: - docker script: @@ -152,7 +152,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 15 - step: - name: Molecule Test Batch - 16 + name: Molecule Test Batch - product_common/default services: - docker script: @@ -160,7 +160,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 16 - step: - name: Molecule Test Batch - 17 + name: Molecule Test Batch - product_common/system_jdk services: - docker script: @@ -168,7 +168,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 17 - step: - name: Molecule Test Batch - 18 + name: Molecule Test Batch - product_install/bitbucket_latest services: - docker script: @@ -176,7 +176,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 18 - step: - name: Molecule Test Batch - 19 + name: Molecule Test Batch - product_install/confluence_latest services: - docker script: @@ -184,7 +184,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 19 - step: - name: Molecule Test Batch - 20 + name: Molecule Test Batch - product_install/crowd_latest services: - docker script: @@ -192,7 +192,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 20 - step: - name: Molecule Test Batch - 21 + name: Molecule Test Batch - product_install/default services: - docker script: @@ -200,7 +200,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 21 - step: - name: Molecule Test Batch - 22 + name: Molecule Test Batch - product_install/jira_all services: - docker script: @@ -208,7 +208,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 22 - step: - name: Molecule Test Batch - 23 + name: Molecule Test Batch - product_install/jira_cached_with_downgrade services: - docker script: @@ -216,7 +216,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 23 - step: - name: Molecule Test Batch - 24 + name: Molecule Test Batch - product_install/jira_cached_with_upgrade services: - docker script: @@ -224,7 +224,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 24 - step: - name: Molecule Test Batch - 25 + name: Molecule Test Batch - product_install/jira_software_latest services: - docker script: @@ -232,7 +232,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 25 - step: - name: Molecule Test Batch - 26 + name: Molecule Test Batch - product_install/jira_tarball services: - docker script: @@ -240,7 +240,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 26 - step: - name: Molecule Test Batch - 27 + name: Molecule Test Batch - product_install/jira_version_from_file services: - docker script: @@ -248,7 +248,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 27 - step: - name: Molecule Test Batch - 28 + name: Molecule Test Batch - product_install/jira_version_latest services: - docker script: @@ -256,7 +256,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 28 - step: - name: Molecule Test Batch - 29 + name: Molecule Test Batch - product_install/jira_version_override services: - docker script: @@ -264,7 +264,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 29 - step: - name: Molecule Test Batch - 30 + name: Molecule Test Batch - product_install/servicedesk3 services: - docker script: @@ -272,7 +272,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 30 - step: - name: Molecule Test Batch - 31 + name: Molecule Test Batch - product_install/servicedesk4 services: - docker script: @@ -280,7 +280,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 31 - step: - name: Molecule Test Batch - 32 + name: Molecule Test Batch - product_install/servicedesk_latest services: - docker script: @@ -288,7 +288,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 32 - step: - name: Molecule Test Batch - 33 + name: Molecule Test Batch - product_startup/bitbucket services: - docker script: @@ -296,7 +296,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 33 - step: - name: Molecule Test Batch - 34 + name: Molecule Test Batch - product_startup/default services: - docker script: @@ -304,7 +304,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 34 - step: - name: Molecule Test Batch - 35 + name: Molecule Test Batch - product_startup/synchrony services: - docker script: @@ -312,7 +312,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 35 - step: - name: Molecule Test Batch - 36 + name: Molecule Test Batch - restore_backups/default services: - docker script: @@ -320,7 +320,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 36 - step: - name: Molecule Test Batch - 37 + name: Molecule Test Batch - restore_backups/restore_conf_server services: - docker script: @@ -328,7 +328,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 37 - step: - name: Molecule Test Batch - 38 + name: Molecule Test Batch - restore_backups/restore_jira_clustered services: - docker script: diff --git a/pipeline_generator/pipeline.py b/pipeline_generator/pipeline.py index fd9edbb..15dac2f 100644 --- a/pipeline_generator/pipeline.py +++ b/pipeline_generator/pipeline.py @@ -15,9 +15,9 @@ class Pipeline: print(generated_output) def _build_steps(self): - return [Step(f"Molecule Test Batch - {index}", + return [Step(f"Molecule Test Batch - {scenario_name}", self._build_script_commands(index)) - for index, scenario_rel_path in + for index, (scenario_rel_path, scenario_name) in enumerate(self._find_all_scenarios(), 1)] @staticmethod @@ -29,7 +29,8 @@ class Pipeline: scenario_dirs = [] for root, dirs, files in os.walk(Path(os.path.join(os.path.dirname(__file__), "..", ROLES_DIR))): [scenario_dirs.append(root) for f in files if f.endswith("molecule.yml")] - return scenario_dirs + scenarios = map(lambda d: (d, f"{Path(d).parts[2]}/{Path(d).parts[4]}"), scenario_dirs) + return scenarios @staticmethod def _load_template_as_string(): From ad661add8fccae90e0d4da0f3dc3ebfba39341ef Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 12:09:18 +1100 Subject: [PATCH 16/25] DCD-1205: Shorten the batch names. --- bitbucket-pipelines.yml | 76 +++++++++++++++++----------------- pipeline_generator/pipeline.py | 3 +- 2 files changed, 39 insertions(+), 40 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 3160c1f..401bfaf 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -32,7 +32,7 @@ pipelines: fi - parallel: - step: - name: Molecule Test Batch - aws_common/cw-disabled + name: aws_common/cw-disabled services: - docker script: @@ -40,7 +40,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 1 - step: - name: Molecule Test Batch - aws_common/default + name: aws_common/default services: - docker script: @@ -48,7 +48,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 2 - step: - name: Molecule Test Batch - aws_common/logs-disabled + name: aws_common/logs-disabled services: - docker script: @@ -56,7 +56,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 3 - step: - name: Molecule Test Batch - bitbucket_config/default + name: bitbucket_config/default services: - docker script: @@ -64,7 +64,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 4 - step: - name: Molecule Test Batch - confluence_config/aurora + name: confluence_config/aurora services: - docker script: @@ -72,7 +72,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 5 - step: - name: Molecule Test Batch - confluence_config/default + name: confluence_config/default services: - docker script: @@ -80,7 +80,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 6 - step: - name: Molecule Test Batch - confluence_config/password_char_escaping + name: confluence_config/password_char_escaping services: - docker script: @@ -88,7 +88,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 7 - step: - name: Molecule Test Batch - confluence_config/system_jdk + name: confluence_config/system_jdk services: - docker script: @@ -96,7 +96,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 8 - step: - name: Molecule Test Batch - create_backups/default + name: create_backups/default services: - docker script: @@ -104,7 +104,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 9 - step: - name: Molecule Test Batch - diy_backup/default + name: diy_backup/default services: - docker script: @@ -112,7 +112,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 10 - step: - name: Molecule Test Batch - jira_config/aurora + name: jira_config/aurora services: - docker script: @@ -120,7 +120,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 11 - step: - name: Molecule Test Batch - jira_config/default + name: jira_config/default services: - docker script: @@ -128,7 +128,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 12 - step: - name: Molecule Test Batch - jira_config/jira_config_props + name: jira_config/jira_config_props services: - docker script: @@ -136,7 +136,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 13 - step: - name: Molecule Test Batch - jira_config/password_char_escaping + name: jira_config/password_char_escaping services: - docker script: @@ -144,7 +144,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 14 - step: - name: Molecule Test Batch - linux_common/default + name: linux_common/default services: - docker script: @@ -152,7 +152,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 15 - step: - name: Molecule Test Batch - product_common/default + name: product_common/default services: - docker script: @@ -160,7 +160,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 16 - step: - name: Molecule Test Batch - product_common/system_jdk + name: product_common/system_jdk services: - docker script: @@ -168,7 +168,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 17 - step: - name: Molecule Test Batch - product_install/bitbucket_latest + name: product_install/bitbucket_latest services: - docker script: @@ -176,7 +176,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 18 - step: - name: Molecule Test Batch - product_install/confluence_latest + name: product_install/confluence_latest services: - docker script: @@ -184,7 +184,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 19 - step: - name: Molecule Test Batch - product_install/crowd_latest + name: product_install/crowd_latest services: - docker script: @@ -192,7 +192,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 20 - step: - name: Molecule Test Batch - product_install/default + name: product_install/default services: - docker script: @@ -200,7 +200,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 21 - step: - name: Molecule Test Batch - product_install/jira_all + name: product_install/jira_all services: - docker script: @@ -208,7 +208,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 22 - step: - name: Molecule Test Batch - product_install/jira_cached_with_downgrade + name: product_install/jira_cached_with_downgrade services: - docker script: @@ -216,7 +216,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 23 - step: - name: Molecule Test Batch - product_install/jira_cached_with_upgrade + name: product_install/jira_cached_with_upgrade services: - docker script: @@ -224,7 +224,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 24 - step: - name: Molecule Test Batch - product_install/jira_software_latest + name: product_install/jira_software_latest services: - docker script: @@ -232,7 +232,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 25 - step: - name: Molecule Test Batch - product_install/jira_tarball + name: product_install/jira_tarball services: - docker script: @@ -240,7 +240,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 26 - step: - name: Molecule Test Batch - product_install/jira_version_from_file + name: product_install/jira_version_from_file services: - docker script: @@ -248,7 +248,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 27 - step: - name: Molecule Test Batch - product_install/jira_version_latest + name: product_install/jira_version_latest services: - docker script: @@ -256,7 +256,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 28 - step: - name: Molecule Test Batch - product_install/jira_version_override + name: product_install/jira_version_override services: - docker script: @@ -264,7 +264,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 29 - step: - name: Molecule Test Batch - product_install/servicedesk3 + name: product_install/servicedesk3 services: - docker script: @@ -272,7 +272,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 30 - step: - name: Molecule Test Batch - product_install/servicedesk4 + name: product_install/servicedesk4 services: - docker script: @@ -280,7 +280,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 31 - step: - name: Molecule Test Batch - product_install/servicedesk_latest + name: product_install/servicedesk_latest services: - docker script: @@ -288,7 +288,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 32 - step: - name: Molecule Test Batch - product_startup/bitbucket + name: product_startup/bitbucket services: - docker script: @@ -296,7 +296,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 33 - step: - name: Molecule Test Batch - product_startup/default + name: product_startup/default services: - docker script: @@ -304,7 +304,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 34 - step: - name: Molecule Test Batch - product_startup/synchrony + name: product_startup/synchrony services: - docker script: @@ -312,7 +312,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 35 - step: - name: Molecule Test Batch - restore_backups/default + name: restore_backups/default services: - docker script: @@ -320,7 +320,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 36 - step: - name: Molecule Test Batch - restore_backups/restore_conf_server + name: restore_backups/restore_conf_server services: - docker script: @@ -328,7 +328,7 @@ pipelines: - ./bin/run-tests-in-batches --batch 37 - step: - name: Molecule Test Batch - restore_backups/restore_jira_clustered + name: restore_backups/restore_jira_clustered services: - docker script: diff --git a/pipeline_generator/pipeline.py b/pipeline_generator/pipeline.py index 15dac2f..f093685 100644 --- a/pipeline_generator/pipeline.py +++ b/pipeline_generator/pipeline.py @@ -15,8 +15,7 @@ class Pipeline: print(generated_output) def _build_steps(self): - return [Step(f"Molecule Test Batch - {scenario_name}", - self._build_script_commands(index)) + return [Step(scenario_name, self._build_script_commands(index)) for index, (scenario_rel_path, scenario_name) in enumerate(self._find_all_scenarios(), 1)] From c250da08ed32c8566f3453e7c4852670a3f60956 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 12:55:50 +1100 Subject: [PATCH 17/25] DCD-1205: Simplify the pipelines generator. --- bitbucket-pipelines.yml | 232 +++++++++--------- pipeline_generator/pipeline.py | 60 ++--- .../templates/bitbucket-pipelines.yml.j2 | 16 +- 3 files changed, 140 insertions(+), 168 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 401bfaf..613b706 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -19,8 +19,9 @@ pipelines: name: Pre Parallelization stage script: - echo "Running tests in 38 batches" + - step: - name: Check if number of batches match actual number of scenarios + name: Check if the template is up-to-date script: - | actual_scenario_count=$(find ./roles -type f -name "molecule.yml" -exec dirname {} ';' | wc -l | sed -e 's/^[[:space:]]*//') @@ -30,309 +31,310 @@ pipelines: echo "Mismatch between expected and actual number [${actual_scenario_count}] of scenarios. Please look at https://bitbucket.org/atlassian/dc-deployments-automation/src/master/DEVELOPMENT.md for instructions on how to fix this error." exit $GREP_RETURN_CODE fi + - parallel: - step: name: aws_common/cw-disabled services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 1 - + - ./bin/install-ansible --dev + - cd roles/aws_common + - molecule test -s cw-disabled - step: name: aws_common/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 2 - + - ./bin/install-ansible --dev + - cd roles/aws_common + - molecule test -s default - step: name: aws_common/logs-disabled services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 3 - + - ./bin/install-ansible --dev + - cd roles/aws_common + - molecule test -s logs-disabled - step: name: bitbucket_config/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 4 - + - ./bin/install-ansible --dev + - cd roles/bitbucket_config + - molecule test -s default - step: name: confluence_config/aurora services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 5 - + - ./bin/install-ansible --dev + - cd roles/confluence_config + - molecule test -s aurora - step: name: confluence_config/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 6 - + - ./bin/install-ansible --dev + - cd roles/confluence_config + - molecule test -s default - step: name: confluence_config/password_char_escaping services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 7 - + - ./bin/install-ansible --dev + - cd roles/confluence_config + - molecule test -s password_char_escaping - step: name: confluence_config/system_jdk services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 8 - + - ./bin/install-ansible --dev + - cd roles/confluence_config + - molecule test -s system_jdk - step: name: create_backups/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 9 - + - ./bin/install-ansible --dev + - cd roles/create_backups + - molecule test -s default - step: name: diy_backup/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 10 - + - ./bin/install-ansible --dev + - cd roles/diy_backup + - molecule test -s default - step: name: jira_config/aurora services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 11 - + - ./bin/install-ansible --dev + - cd roles/jira_config + - molecule test -s aurora - step: name: jira_config/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 12 - + - ./bin/install-ansible --dev + - cd roles/jira_config + - molecule test -s default - step: name: jira_config/jira_config_props services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 13 - + - ./bin/install-ansible --dev + - cd roles/jira_config + - molecule test -s jira_config_props - step: name: jira_config/password_char_escaping services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 14 - + - ./bin/install-ansible --dev + - cd roles/jira_config + - molecule test -s password_char_escaping - step: name: linux_common/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 15 - + - ./bin/install-ansible --dev + - cd roles/linux_common + - molecule test -s default - step: name: product_common/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 16 - + - ./bin/install-ansible --dev + - cd roles/product_common + - molecule test -s default - step: name: product_common/system_jdk services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 17 - + - ./bin/install-ansible --dev + - cd roles/product_common + - molecule test -s system_jdk - step: name: product_install/bitbucket_latest services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 18 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s bitbucket_latest - step: name: product_install/confluence_latest services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 19 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s confluence_latest - step: name: product_install/crowd_latest services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 20 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s crowd_latest - step: name: product_install/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 21 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s default - step: name: product_install/jira_all services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 22 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_all - step: name: product_install/jira_cached_with_downgrade services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 23 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_cached_with_downgrade - step: name: product_install/jira_cached_with_upgrade services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 24 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_cached_with_upgrade - step: name: product_install/jira_software_latest services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 25 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_software_latest - step: name: product_install/jira_tarball services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 26 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_tarball - step: name: product_install/jira_version_from_file services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 27 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_version_from_file - step: name: product_install/jira_version_latest services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 28 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_version_latest - step: name: product_install/jira_version_override services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 29 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s jira_version_override - step: name: product_install/servicedesk3 services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 30 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s servicedesk3 - step: name: product_install/servicedesk4 services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 31 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s servicedesk4 - step: name: product_install/servicedesk_latest services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 32 - + - ./bin/install-ansible --dev + - cd roles/product_install + - molecule test -s servicedesk_latest - step: name: product_startup/bitbucket services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 33 - + - ./bin/install-ansible --dev + - cd roles/product_startup + - molecule test -s bitbucket - step: name: product_startup/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 34 - + - ./bin/install-ansible --dev + - cd roles/product_startup + - molecule test -s default - step: name: product_startup/synchrony services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 35 - + - ./bin/install-ansible --dev + - cd roles/product_startup + - molecule test -s synchrony - step: name: restore_backups/default services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 36 - + - ./bin/install-ansible --dev + - cd roles/restore_backups + - molecule test -s default - step: name: restore_backups/restore_conf_server services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 37 - + - ./bin/install-ansible --dev + - cd roles/restore_backups + - molecule test -s restore_conf_server - step: name: restore_backups/restore_jira_clustered services: - docker script: - - apt-get update && ./bin/install-ansible --dev - - ./bin/run-tests-in-batches --batch 38 - + - ./bin/install-ansible --dev + - cd roles/restore_backups + - molecule test -s restore_jira_clustered diff --git a/pipeline_generator/pipeline.py b/pipeline_generator/pipeline.py index f093685..b46de5c 100644 --- a/pipeline_generator/pipeline.py +++ b/pipeline_generator/pipeline.py @@ -6,57 +6,25 @@ PIPELINE_TEMPLATE_J2_FILE = 'templates/bitbucket-pipelines.yml.j2' ROLES_DIR = 'roles/' -class Pipeline: - def generate_pipeline(self): - template_string = self._load_template_as_string() - template = Template(template_string) - steps = self._build_steps() - generated_output = template.render(parallel_steps=steps) - print(generated_output) - - def _build_steps(self): - return [Step(scenario_name, self._build_script_commands(index)) - for index, (scenario_rel_path, scenario_name) in - enumerate(self._find_all_scenarios(), 1)] - - @staticmethod - def _build_script_commands(index): - return ScriptCommand(f"./bin/run-tests-in-batches --batch {index}").all_commands() - - @staticmethod - def _find_all_scenarios(): - scenario_dirs = [] - for root, dirs, files in os.walk(Path(os.path.join(os.path.dirname(__file__), "..", ROLES_DIR))): - [scenario_dirs.append(root) for f in files if f.endswith("molecule.yml")] - scenarios = map(lambda d: (d, f"{Path(d).parts[2]}/{Path(d).parts[4]}"), scenario_dirs) - return scenarios - - @staticmethod - def _load_template_as_string(): - path = Path(os.path.join(os.path.dirname(__file__), PIPELINE_TEMPLATE_J2_FILE)) - return path.read_text() +def find_all_scenarios(): + scenario_dirs = [] + for root, dirs, files in os.walk(Path(os.path.join(os.path.dirname(__file__), "..", ROLES_DIR))): + [scenario_dirs.append(Path(root)) for f in files if f.endswith("molecule.yml")] + return scenario_dirs -class Step: - def __init__(self, name, script_commands=None): - if script_commands is None: - script_commands = [] - self.name = name - self.scriptCommands = script_commands - - -class ScriptCommand: - PACKAGE_INSTALL_COMMAND = "apt-get update && ./bin/install-ansible --dev" - - def __init__(self, test_command): - self.test_command = test_command - - def all_commands(self): - return [self.PACKAGE_INSTALL_COMMAND, self.test_command] +def load_template(): + path = Path(os.path.join(os.path.dirname(__file__), PIPELINE_TEMPLATE_J2_FILE)) + return Template(path.read_text()) def main(): - Pipeline().generate_pipeline() + template = load_template() + + scenario_paths = find_all_scenarios() + generated_output = template.render(scenario_paths=scenario_paths) + + print(generated_output) if __name__ == '__main__': diff --git a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 index 4f3a0b7..ad05c80 100644 --- a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 +++ b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 @@ -18,9 +18,10 @@ pipelines: - step: name: Pre Parallelization stage script: - - echo "Running tests in {{ parallel_steps|length }} batches" + - echo "Running tests in {{ scenario_paths|length }} batches" + - step: - name: Check if number of batches match actual number of scenarios + name: Check if the template is up-to-date script: - | actual_scenario_count=$(find ./roles -type f -name "molecule.yml" -exec dirname {} ';' | wc -l | sed -e 's/^[[:space:]]*//') @@ -30,14 +31,15 @@ pipelines: echo "Mismatch between expected and actual number [${actual_scenario_count}] of scenarios. Please look at https://bitbucket.org/atlassian/dc-deployments-automation/src/master/DEVELOPMENT.md for instructions on how to fix this error." exit $GREP_RETURN_CODE fi + - parallel: - {% for parallel_step in parallel_steps -%} + {% for spath in scenario_paths -%} - step: - name: {{ parallel_step.name }} + name: {{ spath.parts[2] }}/{{ spath.parts[4] }} services: - docker script: - {% for scriptCommand in parallel_step.scriptCommands -%} - - {{ scriptCommand }} - {% endfor %} + - ./bin/install-ansible --dev + - cd roles/{{ spath.parts[2] }} + - molecule test -s {{ spath.parts[4] }} {% endfor %} From 89977a263b05ba49fed3ec957c558a4f29856368 Mon Sep 17 00:00:00 2001 From: Steve Date: Wed, 20 Jan 2021 13:02:45 +1100 Subject: [PATCH 18/25] DCD-1205: Need to run molecule in the pipenv environment. --- bitbucket-pipelines.yml | 76 +++++++++---------- .../templates/bitbucket-pipelines.yml.j2 | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 613b706..98270df 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -40,7 +40,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/aws_common - - molecule test -s cw-disabled + - pipenv run molecule test -s cw-disabled - step: name: aws_common/default services: @@ -48,7 +48,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/aws_common - - molecule test -s default + - pipenv run molecule test -s default - step: name: aws_common/logs-disabled services: @@ -56,7 +56,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/aws_common - - molecule test -s logs-disabled + - pipenv run molecule test -s logs-disabled - step: name: bitbucket_config/default services: @@ -64,7 +64,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/bitbucket_config - - molecule test -s default + - pipenv run molecule test -s default - step: name: confluence_config/aurora services: @@ -72,7 +72,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/confluence_config - - molecule test -s aurora + - pipenv run molecule test -s aurora - step: name: confluence_config/default services: @@ -80,7 +80,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/confluence_config - - molecule test -s default + - pipenv run molecule test -s default - step: name: confluence_config/password_char_escaping services: @@ -88,7 +88,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/confluence_config - - molecule test -s password_char_escaping + - pipenv run molecule test -s password_char_escaping - step: name: confluence_config/system_jdk services: @@ -96,7 +96,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/confluence_config - - molecule test -s system_jdk + - pipenv run molecule test -s system_jdk - step: name: create_backups/default services: @@ -104,7 +104,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/create_backups - - molecule test -s default + - pipenv run molecule test -s default - step: name: diy_backup/default services: @@ -112,7 +112,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/diy_backup - - molecule test -s default + - pipenv run molecule test -s default - step: name: jira_config/aurora services: @@ -120,7 +120,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/jira_config - - molecule test -s aurora + - pipenv run molecule test -s aurora - step: name: jira_config/default services: @@ -128,7 +128,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/jira_config - - molecule test -s default + - pipenv run molecule test -s default - step: name: jira_config/jira_config_props services: @@ -136,7 +136,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/jira_config - - molecule test -s jira_config_props + - pipenv run molecule test -s jira_config_props - step: name: jira_config/password_char_escaping services: @@ -144,7 +144,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/jira_config - - molecule test -s password_char_escaping + - pipenv run molecule test -s password_char_escaping - step: name: linux_common/default services: @@ -152,7 +152,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/linux_common - - molecule test -s default + - pipenv run molecule test -s default - step: name: product_common/default services: @@ -160,7 +160,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_common - - molecule test -s default + - pipenv run molecule test -s default - step: name: product_common/system_jdk services: @@ -168,7 +168,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_common - - molecule test -s system_jdk + - pipenv run molecule test -s system_jdk - step: name: product_install/bitbucket_latest services: @@ -176,7 +176,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s bitbucket_latest + - pipenv run molecule test -s bitbucket_latest - step: name: product_install/confluence_latest services: @@ -184,7 +184,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s confluence_latest + - pipenv run molecule test -s confluence_latest - step: name: product_install/crowd_latest services: @@ -192,7 +192,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s crowd_latest + - pipenv run molecule test -s crowd_latest - step: name: product_install/default services: @@ -200,7 +200,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s default + - pipenv run molecule test -s default - step: name: product_install/jira_all services: @@ -208,7 +208,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_all + - pipenv run molecule test -s jira_all - step: name: product_install/jira_cached_with_downgrade services: @@ -216,7 +216,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_cached_with_downgrade + - pipenv run molecule test -s jira_cached_with_downgrade - step: name: product_install/jira_cached_with_upgrade services: @@ -224,7 +224,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_cached_with_upgrade + - pipenv run molecule test -s jira_cached_with_upgrade - step: name: product_install/jira_software_latest services: @@ -232,7 +232,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_software_latest + - pipenv run molecule test -s jira_software_latest - step: name: product_install/jira_tarball services: @@ -240,7 +240,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_tarball + - pipenv run molecule test -s jira_tarball - step: name: product_install/jira_version_from_file services: @@ -248,7 +248,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_version_from_file + - pipenv run molecule test -s jira_version_from_file - step: name: product_install/jira_version_latest services: @@ -256,7 +256,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_version_latest + - pipenv run molecule test -s jira_version_latest - step: name: product_install/jira_version_override services: @@ -264,7 +264,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s jira_version_override + - pipenv run molecule test -s jira_version_override - step: name: product_install/servicedesk3 services: @@ -272,7 +272,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s servicedesk3 + - pipenv run molecule test -s servicedesk3 - step: name: product_install/servicedesk4 services: @@ -280,7 +280,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s servicedesk4 + - pipenv run molecule test -s servicedesk4 - step: name: product_install/servicedesk_latest services: @@ -288,7 +288,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_install - - molecule test -s servicedesk_latest + - pipenv run molecule test -s servicedesk_latest - step: name: product_startup/bitbucket services: @@ -296,7 +296,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_startup - - molecule test -s bitbucket + - pipenv run molecule test -s bitbucket - step: name: product_startup/default services: @@ -304,7 +304,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_startup - - molecule test -s default + - pipenv run molecule test -s default - step: name: product_startup/synchrony services: @@ -312,7 +312,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/product_startup - - molecule test -s synchrony + - pipenv run molecule test -s synchrony - step: name: restore_backups/default services: @@ -320,7 +320,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/restore_backups - - molecule test -s default + - pipenv run molecule test -s default - step: name: restore_backups/restore_conf_server services: @@ -328,7 +328,7 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/restore_backups - - molecule test -s restore_conf_server + - pipenv run molecule test -s restore_conf_server - step: name: restore_backups/restore_jira_clustered services: @@ -336,5 +336,5 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/restore_backups - - molecule test -s restore_jira_clustered + - pipenv run molecule test -s restore_jira_clustered diff --git a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 index ad05c80..e42e10b 100644 --- a/pipeline_generator/templates/bitbucket-pipelines.yml.j2 +++ b/pipeline_generator/templates/bitbucket-pipelines.yml.j2 @@ -41,5 +41,5 @@ pipelines: script: - ./bin/install-ansible --dev - cd roles/{{ spath.parts[2] }} - - molecule test -s {{ spath.parts[4] }} + - pipenv run molecule test -s {{ spath.parts[4] }} {% endfor %} From edaf560a407f1d02094494c242989626209aa25d Mon Sep 17 00:00:00 2001 From: Denise Unterwurzacher Date: Thu, 21 Jan 2021 12:35:40 -0600 Subject: [PATCH 19/25] ITPLAT-428 Need to specify `| bool` to ensure the value is read as a boolean. This was warned about in previous versions: "[DEPRECATION WARNING]: evaluating false as a bare variable, this behaviour will go away and you might need to add |bool to the expression in the future. This feature will be removed in version 2.12." Perhaps it was removed earlier. Handled both deprecation warnings found in previous runs. --- roles/product_install/tasks/main.yml | 2 +- roles/product_startup/handlers/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index e2773c1..6d68992 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -269,4 +269,4 @@ include_tasks: "jira-servicedesk_as_obr.yml" when: - atl_install_jsd_as_obr is defined - - atl_install_jsd_as_obr + - atl_install_jsd_as_obr | bool diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml index 6e9e1d8..75a567a 100644 --- a/roles/product_startup/handlers/main.yml +++ b/roles/product_startup/handlers/main.yml @@ -4,7 +4,7 @@ service: name: "{{ atl_systemd_service_name }}" state: restarted - when: atl_startup_restart + when: atl_startup_restart | bool no_log: true - name: Enable Product From 2a67095acc230de1d55c9a9329d4c4f079c6246f Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 22 Jan 2021 12:26:08 +1100 Subject: [PATCH 20/25] Move bool coerce up to initialisation. --- aws_jira_dc_node.yml | 2 +- roles/product_install/defaults/main.yml | 1 + .../product_install/molecule/default/tests/test_default.py | 6 +++++- roles/product_install/tasks/main.yml | 4 +--- roles/product_startup/defaults/main.yml | 2 +- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/aws_jira_dc_node.yml b/aws_jira_dc_node.yml index a994279..1a40591 100644 --- a/aws_jira_dc_node.yml +++ b/aws_jira_dc_node.yml @@ -7,7 +7,7 @@ atl_product_family: "jira" atl_product_user: "jira" atl_product_edition: "jira-{{ lookup('env', 'ATL_PRODUCT_EDITION') | lower }}" - atl_install_jsd_as_obr: "{{ lookup('env', 'ATL_JSD_ASOBR') }}" + atl_install_jsd_as_obr: "{{ lookup('env', 'ATL_JSD_ASOBR') | bool }}" atl_systemd_service_name: "jira.service" atl_startup_systemd_params: diff --git a/roles/product_install/defaults/main.yml b/roles/product_install/defaults/main.yml index 72f5637..c987165 100644 --- a/roles/product_install/defaults/main.yml +++ b/roles/product_install/defaults/main.yml @@ -36,6 +36,7 @@ atl_servicedesk_url_map: default: "{{ atl_servicedesk_versioned_url }}" atl_servicedesk_metadata_url: "{{ atl_servicedesk_url_map[atl_product_version] | default(atl_servicedesk_url_map['default']) }}" +atl_install_jsd_as_obr: false atl_servicedesk_download_file: "{{ atl_installer_temp }}/jira-servicedesk.{{ atl_product_version }}.obr" force_version_update: false diff --git a/roles/product_install/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py index 8e20d76..4a0e068 100644 --- a/roles/product_install/molecule/default/tests/test_default.py +++ b/roles/product_install/molecule/default/tests/test_default.py @@ -34,4 +34,8 @@ def test_completed_lockfile(host): lockfile = host.file('/media/atl/downloads/jira-core.'+upstream+'-x64.bin_completed') assert lockfile.exists - assert lockfile.user == 'root' \ No newline at end of file + assert lockfile.user == 'root' + +def test_servicedesk_not_installed(host): + jars = host.file('/media/atl/jira/shared/plugins/installed-plugins') + assert len(list(filter(lambda p: 'servicedesk' in p, jars))) == 0 diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index 6d68992..712173c 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -267,6 +267,4 @@ - name: Include if jsd is requested to be installed from OBR include_tasks: "jira-servicedesk_as_obr.yml" - when: - - atl_install_jsd_as_obr is defined - - atl_install_jsd_as_obr | bool + when: atl_install_jsd_as_obr diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml index 70b7708..83e4608 100644 --- a/roles/product_startup/defaults/main.yml +++ b/roles/product_startup/defaults/main.yml @@ -2,7 +2,7 @@ # Mostly for molecule testing, as skip-tags doesn't work with handlers. atl_startup_enable: true -atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') or true }}" +atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') | default(true) | bool }}" atl_startup_script_map: jira: "bin/start-jira.sh" From 673b70e61e33b864762e9dd3e6cf11b2dc1d7768 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 22 Jan 2021 13:25:41 +1100 Subject: [PATCH 21/25] Fix test. --- roles/product_install/molecule/default/tests/test_default.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/product_install/molecule/default/tests/test_default.py b/roles/product_install/molecule/default/tests/test_default.py index 4a0e068..66eeb28 100644 --- a/roles/product_install/molecule/default/tests/test_default.py +++ b/roles/product_install/molecule/default/tests/test_default.py @@ -37,5 +37,5 @@ def test_completed_lockfile(host): assert lockfile.user == 'root' def test_servicedesk_not_installed(host): - jars = host.file('/media/atl/jira/shared/plugins/installed-plugins') - assert len(list(filter(lambda p: 'servicedesk' in p, jars))) == 0 + plugins = host.file('/media/atl/jira/shared/plugins/installed-plugins') + assert (not plugins.exists) or (len(list(filter(lambda p: 'servicedesk' in p, jars))) == 0) From d1ec1cafc0bc3d62c9bf335feefcb82bc503a7e3 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 22 Jan 2021 13:54:04 +1100 Subject: [PATCH 22/25] We don't need a bool filter as it's been moved up to import time. --- roles/product_startup/handlers/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/product_startup/handlers/main.yml b/roles/product_startup/handlers/main.yml index 75a567a..6e9e1d8 100644 --- a/roles/product_startup/handlers/main.yml +++ b/roles/product_startup/handlers/main.yml @@ -4,7 +4,7 @@ service: name: "{{ atl_systemd_service_name }}" state: restarted - when: atl_startup_restart | bool + when: atl_startup_restart no_log: true - name: Enable Product From f93f7289193459b5da5f6c97306461a63e967e30 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 25 Jan 2021 14:15:29 +1100 Subject: [PATCH 23/25] Remove old slingshot role and playbook. --- aws_slingshot_backup.yml | 13 ------- roles/create_backups/.yamllint | 33 ---------------- roles/create_backups/defaults/main.yml | 11 ------ .../molecule/default/Dockerfile.j2 | 22 ----------- .../molecule/default/INSTALL.rst | 22 ----------- .../molecule/default/converge.yml | 11 ------ .../molecule/default/molecule.yml | 31 --------------- .../molecule/default/tests/test_default.py | 11 ------ roles/create_backups/tasks/amazon.yml | 21 ---------- roles/create_backups/tasks/main.yml | 39 ------------------- roles/create_backups/tasks/ubuntu.yml | 27 ------------- 11 files changed, 241 deletions(-) delete mode 100644 aws_slingshot_backup.yml delete mode 100644 roles/create_backups/.yamllint delete mode 100644 roles/create_backups/defaults/main.yml delete mode 100644 roles/create_backups/molecule/default/Dockerfile.j2 delete mode 100644 roles/create_backups/molecule/default/INSTALL.rst delete mode 100644 roles/create_backups/molecule/default/converge.yml delete mode 100644 roles/create_backups/molecule/default/molecule.yml delete mode 100644 roles/create_backups/molecule/default/tests/test_default.py delete mode 100644 roles/create_backups/tasks/amazon.yml delete mode 100644 roles/create_backups/tasks/main.yml delete mode 100644 roles/create_backups/tasks/ubuntu.yml diff --git a/aws_slingshot_backup.yml b/aws_slingshot_backup.yml deleted file mode 100644 index f638680..0000000 --- a/aws_slingshot_backup.yml +++ /dev/null @@ -1,13 +0,0 @@ -# Runs atlassian-slingshot to backup your product instance. Should be run when there is only 1 app node (i.e server or single node cluster) -# Params -# Required -# atl_product_family - should be "jira", "confluence", or "stash" -# atl_slingshot_backup_dir - working directory for the backup, should be large enough to fit database and shared home dumps -# atl_s3_backup_bucket - s3 bucket to upload your backup to -# atl_s3_backup_region - AWS region where the s3 bucket is deployed -# -# There are other variables which can be overriden. See the tasks for details. The will be defaulted by the role defaults or the inventory group_vars - -- hosts: aws_node_local - roles: - - role: create_backups \ No newline at end of file diff --git a/roles/create_backups/.yamllint b/roles/create_backups/.yamllint deleted file mode 100644 index 8827676..0000000 --- a/roles/create_backups/.yamllint +++ /dev/null @@ -1,33 +0,0 @@ ---- -# Based on ansible-lint config -extends: default - -rules: - braces: - max-spaces-inside: 1 - level: error - brackets: - max-spaces-inside: 1 - level: error - colons: - max-spaces-after: -1 - level: error - commas: - max-spaces-after: -1 - level: error - comments: disable - comments-indentation: disable - document-start: disable - empty-lines: - max: 3 - level: error - hyphens: - level: error - indentation: disable - key-duplicates: enable - line-length: disable - new-line-at-end-of-file: disable - new-lines: - type: unix - trailing-spaces: disable - truthy: disable diff --git a/roles/create_backups/defaults/main.yml b/roles/create_backups/defaults/main.yml deleted file mode 100644 index f500922..0000000 --- a/roles/create_backups/defaults/main.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- - -atl_db_port: 5432 -atl_systemd_service_name: "{{ atl_product_family }}.service" - -atl_slingshot_yum_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-rpm' -atl_amazon_extras_postgresql_version: '9.6' - -atl_slingshot_deb_pubkey_url: 'https://packages.atlassian.com/api/gpg/key/public' -atl_slingshot_deb_repo_url: 'https://packages.atlassian.com/atlassian-slingshot-deb' -atl_slingshot_deb_repo_components: 'stable main' diff --git a/roles/create_backups/molecule/default/Dockerfile.j2 b/roles/create_backups/molecule/default/Dockerfile.j2 deleted file mode 100644 index 0de39e6..0000000 --- a/roles/create_backups/molecule/default/Dockerfile.j2 +++ /dev/null @@ -1,22 +0,0 @@ -# Molecule managed - -{% if item.registry is defined %} -FROM {{ item.registry.url }}/{{ item.image }} -{% else %} -FROM {{ item.image }} -{% endif %} - -{% if item.env is defined %} -{% for var, value in item.env.items() %} -{% if value %} -ENV {{ var }} {{ value }} -{% endif %} -{% endfor %} -{% endif %} - -RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates iproute2 && apt-get clean; \ - elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash iproute && dnf clean all; \ - elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash iproute && 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 iproute2 && zypper clean -a; \ - elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates; \ - elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates iproute2 && xbps-remove -O; fi diff --git a/roles/create_backups/molecule/default/INSTALL.rst b/roles/create_backups/molecule/default/INSTALL.rst deleted file mode 100644 index 6a44bde..0000000 --- a/roles/create_backups/molecule/default/INSTALL.rst +++ /dev/null @@ -1,22 +0,0 @@ -******* -Docker driver installation guide -******* - -Requirements -============ - -* Docker Engine - -Install -======= - -Please refer to the `Virtual environment`_ documentation for installation best -practices. If not using a virtual environment, please consider passing the -widely recommended `'--user' flag`_ when invoking ``pip``. - -.. _Virtual environment: https://virtualenv.pypa.io/en/latest/ -.. _'--user' flag: https://packaging.python.org/tutorials/installing-packages/#installing-to-the-user-site - -.. code-block:: bash - - $ pip install 'molecule[docker]' diff --git a/roles/create_backups/molecule/default/converge.yml b/roles/create_backups/molecule/default/converge.yml deleted file mode 100644 index 34a4c1b..0000000 --- a/roles/create_backups/molecule/default/converge.yml +++ /dev/null @@ -1,11 +0,0 @@ ---- -- name: Converge - hosts: all - tasks: - # Role default vars must be included because we aren't running the whole role, just a subset of tasks - - name: Include role vars - include_vars: - file: ../../defaults/main.yml - - - name: Install distro-specific backup support packages - include_tasks: "../../tasks/{{ ansible_distribution|lower }}.yml" diff --git a/roles/create_backups/molecule/default/molecule.yml b/roles/create_backups/molecule/default/molecule.yml deleted file mode 100644 index 359433c..0000000 --- a/roles/create_backups/molecule/default/molecule.yml +++ /dev/null @@ -1,31 +0,0 @@ ---- -dependency: - name: galaxy -driver: - name: docker -platforms: - - name: amazon_linux2 - image: amazonlinux:2 -# -# Temporarily (1st April 2020) removing ubuntu as a test platform. -# The atlassian-slingshot debian (Ubuntu) repository is at present -# malformed and is currently missing its 'Release' file. As a result -# when this test executes and tries to pull the `ubuntu_lts` archive -# (see ubuntu.yml task) it fails with the following error: -# -# "The repository 'https://packages.atlassian.com/atlassian-slingshot-deb -# stable Release' does not have a Release file." -# -# See: https://bulldog.internal.atlassian.com/browse/DCD-964 which has -# been raised to resolve this issue and fix the Ubuntu Slingshot -# distribution -# -# TODO: Activate the config below (un-comment) once the issue described above -# has been resolved. -# -# - name: ubuntu_lts -# image: ubuntu:bionic -provisioner: - name: ansible -verifier: - name: testinfra diff --git a/roles/create_backups/molecule/default/tests/test_default.py b/roles/create_backups/molecule/default/tests/test_default.py deleted file mode 100644 index 69b0d76..0000000 --- a/roles/create_backups/molecule/default/tests/test_default.py +++ /dev/null @@ -1,11 +0,0 @@ -import os - -import testinfra.utils.ansible_runner - -testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( - os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') - - -def test_slingshot_installed(host): - assert host.file('/usr/bin/atlassian-slingshot').exists - assert host.file('/usr/bin/psql').exists diff --git a/roles/create_backups/tasks/amazon.yml b/roles/create_backups/tasks/amazon.yml deleted file mode 100644 index 7292a8a..0000000 --- a/roles/create_backups/tasks/amazon.yml +++ /dev/null @@ -1,21 +0,0 @@ ---- - -- name: Add atlassian-slingshot yum repository - yum_repository: - name: AtlassianSlingshot - file: atlassian-slingshot - state: present - description: Atlassian Slingshot - baseurl: "{{ atl_slingshot_yum_repo_url }}" - gpgcheck: no - -- name: Install atlassian-slingshot - yum: - name: atlassian-slingshot - -- name: Enable Postgresql from 'extras' - command: amazon-linux-extras install -y "postgresql{{ atl_amazon_extras_postgresql_version }}" - args: - creates: /usr/bin/psql - environment: - PYTHON: /bin/python diff --git a/roles/create_backups/tasks/main.yml b/roles/create_backups/tasks/main.yml deleted file mode 100644 index b72e274..0000000 --- a/roles/create_backups/tasks/main.yml +++ /dev/null @@ -1,39 +0,0 @@ ---- - -- name: Install distro-specific backup support packages - include_tasks: "{{ ansible_distribution|lower }}.yml" - -- name: Stop the {{ atl_product_family }} service - service: - name: "{{ atl_systemd_service_name }}" - state: stopped - -- name: Run the slingshot backup - command: - argv: - - "atlassian-slingshot" - - "backup" - - "--backupDir" - - "{{ atl_slingshot_backup_dir }}" - - "--dbHost" - - "{{ atl_db_host }}" - - "--dbPort" - - "{{ atl_db_port }}" - - "--dbUser" - - "{{ atl_jdbc_user }}" - - "--dbName" - - "{{ atl_jdbc_db_name }}" - - "--s3BucketName" - - "{{ atl_s3_backup_bucket }}" - - "--awsRegion" - - "{{ atl_s3_backup_region }}" - - "--sharedHomeLocation" - - "{{ atl_product_home_shared }}" - - "--isAutomation" - environment: - ATL_DB_PASSWORD: "{{ atl_jdbc_password }}" - -- name: Restart the {{ atl_product_family }} service - service: - name: "{{ atl_systemd_service_name }}" - state: restarted diff --git a/roles/create_backups/tasks/ubuntu.yml b/roles/create_backups/tasks/ubuntu.yml deleted file mode 100644 index 94476a6..0000000 --- a/roles/create_backups/tasks/ubuntu.yml +++ /dev/null @@ -1,27 +0,0 @@ ---- -- name: Install gnupg - apt: - name: gnupg - state: present - -- name: Add atlassian-slingshot debian repo public key - apt_key: - url: "{{ atl_slingshot_deb_pubkey_url }}" - state: present - -- name: Add atlassian-slingshot debian repository - apt_repository: - repo: "deb {{ atl_slingshot_deb_repo_url }} {{ atl_slingshot_deb_repo_components }}" - state: present - filename: atlassian-slingshot - -- name: Install atlassian-slingshot - apt: - name: atlassian-slingshot - update_cache: yes - state: present - -- name: Install postgresql - apt: - name: postgresql - state: present \ No newline at end of file From c7fedd0a329e6afc292bcfcf5d6abc60b4553174 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 25 Jan 2021 14:16:21 +1100 Subject: [PATCH 24/25] Update pipelines config after role removed. --- bitbucket-pipelines.yml | 538 ++++++++++++++++++++-------------------- 1 file changed, 265 insertions(+), 273 deletions(-) diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml index 98270df..06a83de 100644 --- a/bitbucket-pipelines.yml +++ b/bitbucket-pipelines.yml @@ -18,7 +18,7 @@ pipelines: - step: name: Pre Parallelization stage script: - - echo "Running tests in 38 batches" + - echo "Running tests in 37 batches" - step: name: Check if the template is up-to-date @@ -33,30 +33,6 @@ pipelines: fi - parallel: - - step: - name: aws_common/cw-disabled - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/aws_common - - pipenv run molecule test -s cw-disabled - - step: - name: aws_common/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/aws_common - - pipenv run molecule test -s default - - step: - name: aws_common/logs-disabled - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/aws_common - - pipenv run molecule test -s logs-disabled - step: name: bitbucket_config/default services: @@ -65,254 +41,6 @@ pipelines: - ./bin/install-ansible --dev - cd roles/bitbucket_config - pipenv run molecule test -s default - - step: - name: confluence_config/aurora - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/confluence_config - - pipenv run molecule test -s aurora - - step: - name: confluence_config/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/confluence_config - - pipenv run molecule test -s default - - step: - name: confluence_config/password_char_escaping - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/confluence_config - - pipenv run molecule test -s password_char_escaping - - step: - name: confluence_config/system_jdk - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/confluence_config - - pipenv run molecule test -s system_jdk - - step: - name: create_backups/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/create_backups - - pipenv run molecule test -s default - - step: - name: diy_backup/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/diy_backup - - pipenv run molecule test -s default - - step: - name: jira_config/aurora - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/jira_config - - pipenv run molecule test -s aurora - - step: - name: jira_config/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/jira_config - - pipenv run molecule test -s default - - step: - name: jira_config/jira_config_props - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/jira_config - - pipenv run molecule test -s jira_config_props - - step: - name: jira_config/password_char_escaping - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/jira_config - - pipenv run molecule test -s password_char_escaping - - step: - name: linux_common/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/linux_common - - pipenv run molecule test -s default - - step: - name: product_common/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_common - - pipenv run molecule test -s default - - step: - name: product_common/system_jdk - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_common - - pipenv run molecule test -s system_jdk - - step: - name: product_install/bitbucket_latest - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s bitbucket_latest - - step: - name: product_install/confluence_latest - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s confluence_latest - - step: - name: product_install/crowd_latest - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s crowd_latest - - step: - name: product_install/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s default - - step: - name: product_install/jira_all - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_all - - step: - name: product_install/jira_cached_with_downgrade - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_cached_with_downgrade - - step: - name: product_install/jira_cached_with_upgrade - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_cached_with_upgrade - - step: - name: product_install/jira_software_latest - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_software_latest - - step: - name: product_install/jira_tarball - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_tarball - - step: - name: product_install/jira_version_from_file - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_version_from_file - - step: - name: product_install/jira_version_latest - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_version_latest - - step: - name: product_install/jira_version_override - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s jira_version_override - - step: - name: product_install/servicedesk3 - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s servicedesk3 - - step: - name: product_install/servicedesk4 - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s servicedesk4 - - step: - name: product_install/servicedesk_latest - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_install - - pipenv run molecule test -s servicedesk_latest - - step: - name: product_startup/bitbucket - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_startup - - pipenv run molecule test -s bitbucket - - step: - name: product_startup/default - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_startup - - pipenv run molecule test -s default - - step: - name: product_startup/synchrony - services: - - docker - script: - - ./bin/install-ansible --dev - - cd roles/product_startup - - pipenv run molecule test -s synchrony - step: name: restore_backups/default services: @@ -337,4 +65,268 @@ pipelines: - ./bin/install-ansible --dev - cd roles/restore_backups - pipenv run molecule test -s restore_jira_clustered + - step: + name: diy_backup/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/diy_backup + - pipenv run molecule test -s default + - step: + name: product_startup/synchrony + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_startup + - pipenv run molecule test -s synchrony + - step: + name: product_startup/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_startup + - pipenv run molecule test -s default + - step: + name: product_startup/bitbucket + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_startup + - pipenv run molecule test -s bitbucket + - step: + name: product_common/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_common + - pipenv run molecule test -s default + - step: + name: product_common/system_jdk + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_common + - pipenv run molecule test -s system_jdk + - step: + name: confluence_config/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/confluence_config + - pipenv run molecule test -s default + - step: + name: confluence_config/aurora + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/confluence_config + - pipenv run molecule test -s aurora + - step: + name: confluence_config/system_jdk + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/confluence_config + - pipenv run molecule test -s system_jdk + - step: + name: confluence_config/password_char_escaping + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/confluence_config + - pipenv run molecule test -s password_char_escaping + - step: + name: jira_config/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/jira_config + - pipenv run molecule test -s default + - step: + name: jira_config/aurora + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/jira_config + - pipenv run molecule test -s aurora + - step: + name: jira_config/jira_config_props + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/jira_config + - pipenv run molecule test -s jira_config_props + - step: + name: jira_config/password_char_escaping + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/jira_config + - pipenv run molecule test -s password_char_escaping + - step: + name: product_install/jira_version_from_file + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_version_from_file + - step: + name: product_install/jira_cached_with_upgrade + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_cached_with_upgrade + - step: + name: product_install/servicedesk4 + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s servicedesk4 + - step: + name: product_install/servicedesk3 + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s servicedesk3 + - step: + name: product_install/jira_software_latest + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_software_latest + - step: + name: product_install/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s default + - step: + name: product_install/bitbucket_latest + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s bitbucket_latest + - step: + name: product_install/jira_version_override + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_version_override + - step: + name: product_install/crowd_latest + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s crowd_latest + - step: + name: product_install/servicedesk_latest + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s servicedesk_latest + - step: + name: product_install/jira_version_latest + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_version_latest + - step: + name: product_install/confluence_latest + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s confluence_latest + - step: + name: product_install/jira_cached_with_downgrade + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_cached_with_downgrade + - step: + name: product_install/jira_tarball + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_tarball + - step: + name: product_install/jira_all + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/product_install + - pipenv run molecule test -s jira_all + - step: + name: aws_common/logs-disabled + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/aws_common + - pipenv run molecule test -s logs-disabled + - step: + name: aws_common/cw-disabled + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/aws_common + - pipenv run molecule test -s cw-disabled + - step: + name: aws_common/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/aws_common + - pipenv run molecule test -s default + - step: + name: linux_common/default + services: + - docker + script: + - ./bin/install-ansible --dev + - cd roles/linux_common + - pipenv run molecule test -s default From 121ae6ac5cf30afda51978d94fead0b01a5ead45 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Fri, 29 Jan 2021 10:29:23 +1100 Subject: [PATCH 25/25] Revert new logic for restart flag. --- roles/product_startup/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/product_startup/defaults/main.yml b/roles/product_startup/defaults/main.yml index 83e4608..70b7708 100644 --- a/roles/product_startup/defaults/main.yml +++ b/roles/product_startup/defaults/main.yml @@ -2,7 +2,7 @@ # Mostly for molecule testing, as skip-tags doesn't work with handlers. atl_startup_enable: true -atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') | default(true) | bool }}" +atl_startup_restart: "{{ lookup('env', 'ATL_STARTUP_RESTART') or true }}" atl_startup_script_map: jira: "bin/start-jira.sh"