mirror of
https://bitbucket.org/atlassian/dc-deployments-automation.git
synced 2025-12-14 08:53:07 -06:00
DCD-621: externalizes db type based in dbconfig.xml for Jira
This commit is contained in:
@@ -26,6 +26,7 @@ atl_db_poolminsize: '20'
|
|||||||
atl_db_poolmaxsize: '100'
|
atl_db_poolmaxsize: '100'
|
||||||
atl_db_minidle: '10'
|
atl_db_minidle: '10'
|
||||||
atl_db_maxidle: '20'
|
atl_db_maxidle: '20'
|
||||||
|
atl_db_type: 'postgres72'
|
||||||
|
|
||||||
atl_db_maxwaitmillis: '30000'
|
atl_db_maxwaitmillis: '30000'
|
||||||
atl_db_timebetweenevictionrunsmillis: '30000'
|
atl_db_timebetweenevictionrunsmillis: '30000'
|
||||||
|
|||||||
@@ -23,6 +23,7 @@
|
|||||||
atl_db_removeabandonedtimeout: 1111
|
atl_db_removeabandonedtimeout: 1111
|
||||||
atl_db_testwhileidle: 'false'
|
atl_db_testwhileidle: 'false'
|
||||||
atl_db_testonborrow: 'true'
|
atl_db_testonborrow: 'true'
|
||||||
|
atl_db_type: 'postgres96'
|
||||||
|
|
||||||
roles:
|
roles:
|
||||||
- role: linux_common
|
- role: linux_common
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ def test_dbconfig_file(host):
|
|||||||
f = host.file('/var/atlassian/application-data/jira/dbconfig.xml')
|
f = host.file('/var/atlassian/application-data/jira/dbconfig.xml')
|
||||||
assert f.exists
|
assert f.exists
|
||||||
assert f.user == 'jira'
|
assert f.user == 'jira'
|
||||||
|
assert f.contains("<database-type>postgres96</database-type>")
|
||||||
assert f.contains("<driver-class>org.postgresql.Driver</driver-class>")
|
assert f.contains("<driver-class>org.postgresql.Driver</driver-class>")
|
||||||
assert f.contains("<username>atljira</username>")
|
assert f.contains("<username>atljira</username>")
|
||||||
assert f.contains("<password>molecule_password</password>")
|
assert f.contains("<password>molecule_password</password>")
|
||||||
|
|||||||
@@ -3,7 +3,7 @@
|
|||||||
<jira-database-config>
|
<jira-database-config>
|
||||||
<name>defaultDS</name>
|
<name>defaultDS</name>
|
||||||
<delegator-name>default</delegator-name>
|
<delegator-name>default</delegator-name>
|
||||||
<database-type>postgres72</database-type>
|
<database-type>{{ atl_db_type }}</database-type>
|
||||||
<schema-name>public</schema-name>
|
<schema-name>public</schema-name>
|
||||||
<jdbc-datasource>
|
<jdbc-datasource>
|
||||||
<url>{{ atl_jdbc_url }}</url>
|
<url>{{ atl_jdbc_url }}</url>
|
||||||
|
|||||||
Reference in New Issue
Block a user