From 84e9377824d7a787ed4bdc63c3da900dc08c973b Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 8 Jul 2019 12:03:24 +1000 Subject: [PATCH 1/5] DCD-434: Add molecule test for bitbucket config. --- .../molecule/default/Dockerfile.j2 | 14 ++++++++ .../molecule/default/molecule.yml | 36 +++++++++++++++++++ .../molecule/default/playbook.yml | 19 ++++++++++ .../molecule/default/tests/test_default.py | 16 +++++++++ 4 files changed, 85 insertions(+) create mode 100644 roles/bitbucket_config/molecule/default/Dockerfile.j2 create mode 100644 roles/bitbucket_config/molecule/default/molecule.yml create mode 100644 roles/bitbucket_config/molecule/default/playbook.yml create mode 100644 roles/bitbucket_config/molecule/default/tests/test_default.py diff --git a/roles/bitbucket_config/molecule/default/Dockerfile.j2 b/roles/bitbucket_config/molecule/default/Dockerfile.j2 new file mode 100644 index 0000000..e6aa95d --- /dev/null +++ b/roles/bitbucket_config/molecule/default/Dockerfile.j2 @@ -0,0 +1,14 @@ +# Molecule managed + +{% if item.registry is defined %} +FROM {{ item.registry.url }}/{{ item.image }} +{% else %} +FROM {{ item.image }} +{% endif %} + +RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \ + elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash && dnf clean all; \ + elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl bash && 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 && 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 && xbps-remove -O; fi diff --git a/roles/bitbucket_config/molecule/default/molecule.yml b/roles/bitbucket_config/molecule/default/molecule.yml new file mode 100644 index 0000000..7f082f6 --- /dev/null +++ b/roles/bitbucket_config/molecule/default/molecule.yml @@ -0,0 +1,36 @@ +--- +dependency: + name: galaxy +driver: + name: docker +lint: + name: yamllint +platforms: + - name: amazon_linux2 + image: amazonlinux:2 + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 + - name: ubuntu_lts + image: ubuntu:bionic + groups: + - aws_node_local + ulimits: + - nofile:262144:262144 +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/bitbucket_config/molecule/default/playbook.yml b/roles/bitbucket_config/molecule/default/playbook.yml new file mode 100644 index 0000000..f9c424b --- /dev/null +++ b/roles/bitbucket_config/molecule/default/playbook.yml @@ -0,0 +1,19 @@ +--- +- name: Converge + hosts: all + vars: + atl_product_family: "stash" + atl_product_edition: "bitbucket" + atl_product_user: "bitbucket" + atl_product_version: "6.3.1" + + atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}" + + atl_jdbc_user: 'bb_db_user' + atl_jdbc_password: 'molecule_password' + + roles: + - role: linux_common + - role: product_common + - role: product_install + - role: bitbucket_config diff --git a/roles/bitbucket_config/molecule/default/tests/test_default.py b/roles/bitbucket_config/molecule/default/tests/test_default.py new file mode 100644 index 0000000..00593ec --- /dev/null +++ b/roles/bitbucket_config/molecule/default/tests/test_default.py @@ -0,0 +1,16 @@ +import os + +import testinfra.utils.ansible_runner + +testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( + os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') + + +def test_config_file(host): + f = host.file('/media/atl/bitbucket/shared/bitbucket.properties') + assert f.exists + assert f.user == 'bitbucket' + + assert f.contains("jdbc.driver=org.postgresql.Driver") + assert f.contains("jdbc.user=bb_db_user") + assert f.contains("jdbc.password=molecule_password") From 81dbd67c118e9415a4436ac436972a9c991dfcc6 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 8 Jul 2019 12:19:49 +1000 Subject: [PATCH 2/5] DCD-434: Add injection of heap and additional JVM opts into BB environment. --- group_vars/aws_node_local.yml | 1 + roles/product_startup/molecule/bitbucket/playbook.yml | 5 +++++ .../product_startup/molecule/bitbucket/tests/test_default.py | 3 +++ 3 files changed, 9 insertions(+) diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index 699745f..b4ed155 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -77,6 +77,7 @@ atl_jdbc_query_params_for_engine: atl_jdbc_url: "jdbc:postgresql://{{ atl_db_host }}:{{ atl_db_port }}/{{ atl_jdbc_db_name }}{{ atl_jdbc_query_params_for_engine[atl_db_engine]| default('') }}" atl_jvm_heap: "{{ lookup('env', 'ATL_JVM_HEAP') or '2048m' }}" +atl_jvm_opts: "{{ lookup('env', 'ATL_JVM_OPTS') or '' }}" atl_catalina_opts: "{{ lookup('env', 'ATL_CATALINA_OPTS') or '' }}" atl_proxy_name: "{{ lookup('env', 'ATL_PROXY_NAME') | lower }}" atl_proxy_port: "{{ lookup('env', 'ATL_TOMCAT_PROXYPORT') }}" diff --git a/roles/product_startup/molecule/bitbucket/playbook.yml b/roles/product_startup/molecule/bitbucket/playbook.yml index 08520cb..0542b3a 100644 --- a/roles/product_startup/molecule/bitbucket/playbook.yml +++ b/roles/product_startup/molecule/bitbucket/playbook.yml @@ -8,11 +8,16 @@ atl_product_home: "{{ atl_shared_mountpoint }}/{{ atl_product_edition }}" atl_product_home_shared: "{{ atl_product_home }}/shared" + atl_jvm_heap: "dummy_heap" + atl_jvm_opts: "dummy_opts" atl_startup_systemd_params: - "UMask=0027" - "LimitNOFILE=4096" - "Environment=BITBUCKET_HOME={{ atl_product_home }}" + - "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}" + - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}" + - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}" atl_startup_exec_options: - "-fg" diff --git a/roles/product_startup/molecule/bitbucket/tests/test_default.py b/roles/product_startup/molecule/bitbucket/tests/test_default.py index d12ab59..14feb7c 100644 --- a/roles/product_startup/molecule/bitbucket/tests/test_default.py +++ b/roles/product_startup/molecule/bitbucket/tests/test_default.py @@ -12,3 +12,6 @@ def test_service_file(host): assert f.contains("^UMask=0027$") assert f.contains("^LimitNOFILE=4096$") assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$") + assert f.contains("^Environment=JVM_MINIMUM_MEMORY=dummy_heap$") + assert f.contains("^Environment=JVM_MAXIMUM_MEMORY=dummy_heap$") + assert f.contains("^Environment=JVM_SUPPORT_RECOMMENDED_ARGS=dummy_opts$") From 6c3e2d7d8362af6067fc3f36c0aa67365f929ad1 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 8 Jul 2019 12:38:32 +1000 Subject: [PATCH 3/5] DCD-434: Add injection of heap and additional JVM opts into BB environment for node playbook. --- aws_bitbucket_dc_node.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/aws_bitbucket_dc_node.yml b/aws_bitbucket_dc_node.yml index d473ea5..7834e12 100644 --- a/aws_bitbucket_dc_node.yml +++ b/aws_bitbucket_dc_node.yml @@ -17,6 +17,9 @@ - "UMask=0027" - "LimitNOFILE=4096" - "Environment=BITBUCKET_HOME={{ atl_product_home }}" + - "Environment=JVM_MAXIMUM_MEMORY={{ atl_jvm_heap }}" + - "Environment=JVM_MINIMUM_MEMORY={{ atl_jvm_heap }}" + - "Environment=JVM_SUPPORT_RECOMMENDED_ARGS={{ atl_jvm_opts }}" atl_startup_exec_options: - "-fg" - "--no-search" From 59b8903294a8d5057eb9950dbbaac6c4b58e53b1 Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 8 Jul 2019 14:07:18 +1000 Subject: [PATCH 4/5] DCD-434: Ignore changes to installation permissions as we may override the defaults in product_install. --- roles/bitbucket_config/tasks/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/roles/bitbucket_config/tasks/main.yml b/roles/bitbucket_config/tasks/main.yml index cf6bcce..4857761 100644 --- a/roles/bitbucket_config/tasks/main.yml +++ b/roles/bitbucket_config/tasks/main.yml @@ -22,3 +22,4 @@ group: "root" mode: "u=rwX,g=rX,o=rX" recurse: true + changed_when: false # For Molecule idempotence check From df5f139086c8b68c29d93d5c10311831ee2488aa Mon Sep 17 00:00:00 2001 From: Steve Smith Date: Mon, 8 Jul 2019 14:41:43 +1000 Subject: [PATCH 5/5] DCD-434: Remove test for psql as we no longer install it by default. --- roles/product_common/molecule/default/tests/test_default.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/roles/product_common/molecule/default/tests/test_default.py b/roles/product_common/molecule/default/tests/test_default.py index 26bdc54..b29ef83 100644 --- a/roles/product_common/molecule/default/tests/test_default.py +++ b/roles/product_common/molecule/default/tests/test_default.py @@ -13,8 +13,7 @@ def test_user_created(host): @pytest.mark.parametrize('exe', [ - '/usr/bin/git', - '/usr/bin/psql' + '/usr/bin/git' ]) def test_package_exes(host, exe): assert host.file(exe).exists