blsmith/dc-deployments-automation
1
0
Fork 0
mirror of https://bitbucket.org/atlassian/dc-deployments-automation.git synced 2025-12-14 00:43:06 -06:00
Code Issues Packages Projects Releases Wiki Activity

DCD-373: Propagate DB properties from Quickstart to dbconfig.xml

Browse Source
This commit is contained in:
Adam Brokes
2019-05-29 17:01:02 +10:00
parent 4b1d12f1bf
commit 89db18c9fe
7 changed files with 63 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
roles/jira_config/molecule/default/playbook.yml
View File

@@ -6,9 +6,23 @@
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'
roles:
- role: linux_common

28
roles/jira_config/molecule/default/tests/test_default.py
View File

@@ -12,22 +12,23 @@ def test_dbconfig_file(host):
assert f.user == 'jira'
assert f.contains("<driver-class>org.postgresql.Driver</driver-class>")
assert f.contains("<username>atljira</username>")
assert f.contains("<pool-min-size>20</pool-min-size>")
assert f.contains("<password>molecule_password</password>")
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="')
assert f.contains("<pool-min-size>1111</pool-min-size>")
assert f.contains("<pool-max-size>1111</pool-max-size>")
assert f.contains("<pool-min-idle>1111</pool-min-idle>")
assert f.contains("<pool-max-idle>1111</pool-max-idle>")
assert f.contains("<pool-max-wait>1111</pool-max-wait>")
assert f.contains("<min-evictable-idle-time-millis>1111</min-evictable-idle-time-millis>")
assert f.contains("<pool-remove-abandoned>false</pool-remove-abandoned>")
assert f.contains("<time-between-eviction-runs-millis>1111</time-between-eviction-runs-millis>")
assert f.contains("<min-evictable-idle-time-millis>1111</min-evictable-idle-time-millis>")
assert f.contains("<pool-remove-abandoned>false</pool-remove-abandoned>")
assert f.contains("<pool-remove-abandoned-timeout>1111</pool-remove-abandoned-timeout>")
assert f.contains("<pool-test-while-idle>false</pool-test-while-idle>")
assert f.contains("<pool-test-on-borrow>true</pool-test-on-borrow>")
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')
@@ -47,6 +48,7 @@ def test_server_file(host):
assert not f.contains('proxyName=')
assert not f.contains('proxyPort=')
def test_install_permissions(host):
assert host.file('/opt/atlassian/jira-software/current/conf/server.xml').user == 'root'
assert host.file('/opt/atlassian/jira-software/current/atlassian-jira/WEB-INF/web.xml').user == 'root'