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

ITPLAT-387 exclude bitbucket from catalina.out fix

Browse Source
This commit is contained in:
Brett Meehan
2021-02-02 10:14:22 +11:00
parent d219dea4ba
commit d3e6ba137c
5 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
roles/product_install/tasks/main.yml
View File

@@ -265,13 +265,14 @@
state: link state: link
force: true force: true
- name: "Ensure catalina.out log dir exists after product is installed" - name: "Ensure catalina.out log dir exists after product is installed (except bitbucket)"
file: file:
path: "{{ atl_product_installation_current }}/logs" path: "{{ atl_product_installation_current }}/logs"
state: directory state: directory
mode: 0750 mode: 0750
owner: "{{ atl_product_user }}" owner: "{{ atl_product_user }}"
group: "{{ atl_product_user }}" group: "{{ atl_product_user }}"
when: atl_product_family != "stash"
changed_when: false # For Molecule idempotence check changed_when: false # For Molecule idempotence check
- name: Include if jsd is requested to be installed from OBR - name: Include if jsd is requested to be installed from OBR

2
roles/product_startup/molecule/bitbucket/tests/test_default.py
View File

@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_service_file(host): def test_service_file(host):
systemd_prefix = "/lib" if host.system_info.distribution == "ubuntu" else "/usr/lib" systemd_prefix = "/lib" if host.system_info.distribution == "ubuntu" else "/usr/lib"
f = host.file(systemd_prefix+'/systemd/system/bitbucket.service') f = host.file(systemd_prefix+'/systemd/system/bitbucket.service')
assert f.contains("^ExecStart=/opt/atlassian/bitbucket/current/bin/start-bitbucket.sh -fg --no-search >/opt/atlassian/bitbucket/current/logs/catalina.out 2>/opt/atlassian/bitbucket/current/logs/catalina.err$") assert f.contains("^ExecStart=/opt/atlassian/bitbucket/current/bin/start-bitbucket.sh -fg --no-search$")
assert f.contains("^UMask=0027$") assert f.contains("^UMask=0027$")
assert f.contains("^LimitNOFILE=4096$") assert f.contains("^LimitNOFILE=4096$")
assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$") assert f.contains("^Environment=BITBUCKET_HOME=/media/atl/bitbucket$")

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

@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_service_file(host): def test_service_file(host):
systemd_prefix = "/lib" if host.system_info.distribution == "ubuntu" else "/usr/lib" systemd_prefix = "/lib" if host.system_info.distribution == "ubuntu" else "/usr/lib"
f = host.file(systemd_prefix+'/systemd/system/jira-software.service') f = host.file(systemd_prefix+'/systemd/system/jira-software.service')
assert f.contains("^ExecStart=/opt/atlassian/jira-software/current/bin/start-jira.sh -fg >/opt/atlassian/jira-software/current/logs/catalina.out 2>/opt/atlassian/jira-software/current/logs/catalina.err$") assert f.contains("^ExecStart=/opt/atlassian/jira-software/current/bin/start-jira.sh -fg >/opt/atlassian/jira-software/current/logs/catalina.out 2>&1$")
assert f.user == 'root' assert f.user == 'root'
assert f.group == 'root' assert f.group == 'root'
assert f.mode == 0o0640 assert f.mode == 0o0640

2
roles/product_startup/molecule/synchrony/tests/test_default.py
View File

@@ -9,7 +9,7 @@ testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
def test_service_file(host): def test_service_file(host):
systemd_prefix = "/lib" if host.system_info.distribution == "ubuntu" else "/usr/lib" systemd_prefix = "/lib" if host.system_info.distribution == "ubuntu" else "/usr/lib"
f = host.file(systemd_prefix+'/systemd/system/synchrony.service') f = host.file(systemd_prefix+'/systemd/system/synchrony.service')
assert f.contains("^ExecStart=/opt/atlassian/bin/start-synchrony >/opt/atlassian/confluence/current/logs/catalina.out 2>/opt/atlassian/confluence/current/logs/catalina.err$") assert f.contains("^ExecStart=/opt/atlassian/bin/start-synchrony >/opt/atlassian/confluence/current/logs/catalina.out 2>&1$")
assert f.contains("^EnvironmentFile=/etc/atl$") assert f.contains("^EnvironmentFile=/etc/atl$")
assert f.contains("^EnvironmentFile=/etc/atl.synchrony$") assert f.contains("^EnvironmentFile=/etc/atl.synchrony$")
assert f.contains("^WorkingDirectory=/opt/atlassian/confluence/current/logs/$") assert f.contains("^WorkingDirectory=/opt/atlassian/confluence/current/logs/$")

2
roles/product_startup/templates/product.service.j2
View File

@@ -12,7 +12,7 @@ StandardError=journal+console
{{ p }} {{ p }}
{% endfor %} {% endfor %}
ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %} >{{ atl_product_installation_current }}/logs/catalina.out 2>{{ atl_product_installation_current }}/logs/catalina.err ExecStart={{ atl_startup_exec_path }}{% for c in atl_startup_exec_options %} {{ c }}{% endfor %}{% if (atl_product_family != "stash") %} >{{ atl_product_installation_current }}/logs/catalina.out 2>&1{% endif %}
Restart=on-failure Restart=on-failure