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

ITOPSENG-277 added fixes for tests as per discussion with Ben

Browse Source
This commit is contained in:
Brett Meehan
2019-12-05 15:12:33 +11:00
parent fff55c5409
commit 8c02ea36bb
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/confluence_config/molecule/aurora/playbook.yml
View File

@@ -14,8 +14,6 @@
atl_cluster_node_id: 'FAKEID' atl_cluster_node_id: 'FAKEID'
atl_autologin_cookie_age: "COOKIEAGE" atl_autologin_cookie_age: "COOKIEAGE"
atl_local_ipv4: "1.1.1.1" atl_local_ipv4: "1.1.1.1"
atl_tomcat_scheme: "http"
atl_proxy_name: "localhost"
roles: roles:
- role: linux_common - role: linux_common

2
roles/confluence_config/molecule/default/tests/test_default.py
View File

@@ -38,8 +38,6 @@ def test_server_file(host):
assert f.contains('acceptCount="10"') assert f.contains('acceptCount="10"')
assert f.contains('secure="false"') assert f.contains('secure="false"')
assert f.contains('scheme="http"') assert f.contains('scheme="http"')
assert not f.contains('proxyName=')
assert not f.contains('proxyPort=')
def test_install_permissions(host): def test_install_permissions(host):
assert host.file('/opt/atlassian/confluence/current/conf/server.xml').user == 'root' assert host.file('/opt/atlassian/confluence/current/conf/server.xml').user == 'root'

4
roles/confluence_config/tasks/main.yml
View File

@@ -90,5 +90,7 @@
- bandanavalue - bandanavalue
- <baseUrl>.*</baseUrl> - <baseUrl>.*</baseUrl>
- "<baseUrl>{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}</baseUrl>" - "<baseUrl>{{ atl_tomcat_scheme }}://{{ atl_proxy_name }}</baseUrl>"
when: atl_proxy_name is defined when:
- atl_proxy_name is defined
- atl_tomcat_scheme is defined
ignore_errors: yes # For Molecule as it has no db test framework included ignore_errors: yes # For Molecule as it has no db test framework included