diff --git a/group_vars/aws_node_local.yml b/group_vars/aws_node_local.yml index ab854c1..e618de4 100644 --- a/group_vars/aws_node_local.yml +++ b/group_vars/aws_node_local.yml @@ -65,6 +65,7 @@ atl_db_removeabandoned: "{{ lookup('env', 'ATL_DB_REMOVEABANDONED') or 'true' }} atl_db_removeabandonedtimeout: "{{ lookup('env', 'ATL_DB_REMOVEABANDONEDTIMEOUT') or '300' }}" atl_db_testwhileidle: "{{ lookup('env', 'ATL_DB_TESTWHILEIDLE') or 'true'}}" atl_db_testonborrow: "{{ lookup('env', 'ATL_DB_TESTONBORROW') or 'false' }}" +atl_db_type: "{{ 'postgresaurora96' if atl_db_engine == 'aurora_postgres' else 'postgres72'}}" atl_jdbc_db_name: "{{ lookup('env', 'ATL_JDBC_DB_NAME') }}" atl_jdbc_user: "{{ lookup('env', 'ATL_JDBC_USER') }}" diff --git a/roles/jira_config/defaults/main.yml b/roles/jira_config/defaults/main.yml index 776e44e..0a90817 100644 --- a/roles/jira_config/defaults/main.yml +++ b/roles/jira_config/defaults/main.yml @@ -26,7 +26,6 @@ atl_db_poolminsize: '20' atl_db_poolmaxsize: '100' atl_db_minidle: '10' atl_db_maxidle: '20' -atl_db_type: 'postgres72' atl_db_maxwaitmillis: '30000' atl_db_timebetweenevictionrunsmillis: '30000' diff --git a/roles/jira_config/molecule/aurora/Dockerfile.j2 b/roles/jira_config/molecule/aurora/Dockerfile.j2 new file mode 100644 index 0000000..e6aa95d --- /dev/null +++ b/roles/jira_config/molecule/aurora/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/jira_config/molecule/aurora/molecule.yml b/roles/jira_config/molecule/aurora/molecule.yml new file mode 100644 index 0000000..7f082f6 --- /dev/null +++ b/roles/jira_config/molecule/aurora/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/jira_config/molecule/aurora/playbook.yml b/roles/jira_config/molecule/aurora/playbook.yml new file mode 100644 index 0000000..d273f47 --- /dev/null +++ b/roles/jira_config/molecule/aurora/playbook.yml @@ -0,0 +1,32 @@ +--- +- name: Converge + hosts: all + vars: + atl_product_family: "jira" + atl_product_edition: "jira-software" + atl_product_user: "jira" + atl_product_version: "7.13.2" + + # dbconfig.xml variables + atl_jdbc_user: 'atljira' + atl_jdbc_password: 'molecule_password' + atl_jvm_heap: 'PLACEHOLDER' + atl_cluster_node_id: 'FAKEID' + atl_db_poolminsize: 1111 + atl_db_poolmaxsize: 1111 + atl_db_minidle: 1111 + atl_db_maxidle: 1111 + atl_db_maxwaitmillis: 1111 + atl_db_minevictableidletimemillis: 1111 + atl_db_timebetweenevictionrunsmillis: 1111 + atl_db_removeabandoned: 'false' + atl_db_removeabandonedtimeout: 1111 + atl_db_testwhileidle: 'false' + atl_db_testonborrow: 'true' + atl_db_engine: 'aurora_postgres' + + roles: + - role: linux_common + - role: product_common + - role: product_install + - role: jira_config diff --git a/roles/jira_config/molecule/aurora/tests/test_default.py b/roles/jira_config/molecule/aurora/tests/test_default.py new file mode 100644 index 0000000..e684eb2 --- /dev/null +++ b/roles/jira_config/molecule/aurora/tests/test_default.py @@ -0,0 +1,75 @@ +import os + +import testinfra.utils.ansible_runner + +testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner( + os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all') + + +def test_dbconfig_file(host): + f = host.file('/var/atlassian/application-data/jira/dbconfig.xml') + assert f.exists + assert f.user == 'jira' + assert f.contains("postgresaurora96") + assert f.contains("org.postgresql.Driver") + assert f.contains("atljira") + assert f.contains("molecule_password") + + assert f.contains("1111") + assert f.contains("1111") + assert f.contains("1111") + assert f.contains("1111") + + assert f.contains("1111") + assert f.contains("1111") + assert f.contains("false") + assert f.contains("1111") + assert f.contains("1111") + assert f.contains("false") + assert f.contains("1111") + assert f.contains("false") + assert f.contains("true") + + +def test_setenv_file(host): + f = host.file('/opt/atlassian/jira-software/current/bin/setenv.sh') + assert f.exists + assert f.contains('^JVM_MINIMUM_MEMORY="PLACEHOLDER"') + assert f.contains('^JVM_MAXIMUM_MEMORY="PLACEHOLDER"') + assert f.contains('^JIRA_HOME="/var/atlassian/application-data/jira"') + assert f.contains('^export CATALINA_OPTS="') + + +def test_cluster_file(host): + f = host.file('/var/atlassian/application-data/jira/cluster.properties') + assert f.exists + assert f.contains('jira.node.id = FAKEID') + assert f.contains('jira.shared.home = /media/atl/jira/shared') + + +def test_server_file(host): + f = host.file('/opt/atlassian/jira-software/current/conf/server.xml') + assert f.exists + assert f.contains('Connector port="8080"') + assert f.contains('Server port="8005"') + assert f.contains('postgres96") + assert f.contains("postgres72") assert f.contains("org.postgresql.Driver") assert f.contains("atljira") assert f.contains("molecule_password")