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

Merged in DCD-1216-sd-as-obr-fix (pull request #131)

Browse Source 
DCD-1216: Change the url to fetch Jira buildNumber for OBR compatability

Approved-by: Ben Partridge
This commit is contained in:
Adam Brokes
2021-02-15 22:45:00 +00:00
parent a4c19fe426 4bacc33c5a
commit 79722e0afe
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/product_install/molecule/jira_all/converge.yml
View File

@@ -5,7 +5,9 @@
atl_product_family: "jira" atl_product_family: "jira"
atl_product_edition: "jira-software" atl_product_edition: "jira-software"
atl_product_user: "jira" atl_product_user: "jira"
atl_product_version: "7.13.1" # Version 8.14.0 is chosen deliberately as it is a version where jira and jira-software returns different buildNumber from MPAC
# See DCD-1216 for context
atl_product_version: "8.14.0"
atl_install_jsd_as_obr: true atl_install_jsd_as_obr: true
atl_systemd_service_name: "jira.service" atl_systemd_service_name: "jira.service"
atl_jdbc_encoding: 'UNICODE' atl_jdbc_encoding: 'UNICODE'
@@ -20,7 +22,7 @@
- name: Seed version - name: Seed version
copy: copy:
dest: '/media/atl/jira/shared/jira-core.version' dest: '/media/atl/jira/shared/jira-core.version'
content: "7.13.1" content: "8.14.0"
force: false # For idempotency check force: false # For idempotency check
roles: roles:
- role: linux_common - role: linux_common

14
roles/product_install/molecule/jira_all/tests/test_default.py
View File

@@ -12,37 +12,37 @@ def test_version_is_correct(host):
verfile = host.file('/media/atl/jira/shared/jira-software.version') verfile = host.file('/media/atl/jira/shared/jira-software.version')
assert verfile.exists assert verfile.exists
assert verfile.content.decode("UTF-8").strip() == "7.13.1" assert verfile.content.decode("UTF-8").strip() == "8.14.0"
def test_is_downloaded(host): def test_is_downloaded(host):
installer = host.file('/media/atl/downloads/jira-software.7.13.1-x64.bin') installer = host.file('/media/atl/downloads/jira-software.8.14.0-x64.bin')
assert installer.exists assert installer.exists
assert installer.user == 'root' assert installer.user == 'root'
def test_completed_lockfile(host): def test_completed_lockfile(host):
lockfile = host.file('/media/atl/downloads/jira-software.7.13.1-x64.bin_completed') lockfile = host.file('/media/atl/downloads/jira-software.8.14.0-x64.bin_completed')
assert lockfile.exists assert lockfile.exists
assert lockfile.user == 'root' assert lockfile.user == 'root'
def test_is_unpacked(host): def test_is_unpacked(host):
installer = host.file('/opt/atlassian/jira-software/7.13.1/atlassian-jira/') installer = host.file('/opt/atlassian/jira-software/8.14.0/atlassian-jira/')
assert installer.exists assert installer.exists
assert installer.is_directory assert installer.is_directory
assert installer.user == 'jira' assert installer.user == 'jira'
assert installer.mode == 0o0755 assert installer.mode == 0o0755
def test_obr_is_downloaded(host): def test_obr_is_downloaded(host):
installer = host.file('/media/atl/downloads/jira-servicedesk-application-3.16.1.obr') installer = host.file('/media/atl/downloads/jira-servicedesk-application-4.14.0.obr')
assert installer.exists assert installer.exists
assert installer.user == 'root' assert installer.user == 'root'
def test_obr_completed_lockfile(host): def test_obr_completed_lockfile(host):
lockfile = host.file('/media/atl/downloads/jira-servicedesk-application-3.16.1.obr_completed') lockfile = host.file('/media/atl/downloads/jira-servicedesk-application-4.14.0.obr_completed')
assert lockfile.exists assert lockfile.exists
assert lockfile.user == 'root' assert lockfile.user == 'root'
def test_obr_is_unpacked(host): def test_obr_is_unpacked(host):
jsdjar = host.file('/media/atl/jira/shared/plugins/installed-plugins/jira-servicedesk-application-3.16.1.jar') jsdjar = host.file('/media/atl/jira/shared/plugins/installed-plugins/jira-servicedesk-application-4.14.0.jar')
assert jsdjar.exists assert jsdjar.exists
assert jsdjar.user == 'jira' assert jsdjar.user == 'jira'
assert jsdjar.mode == 0o0750 assert jsdjar.mode == 0o0750

2
roles/product_install/tasks/jira-servicedesk_as_obr.yml
View File

@@ -2,7 +2,7 @@
- name: Get the installer product version info - name: Get the installer product version info
uri: uri:
url: "{{ atl_mpac_products }}/key/jira-software/versions/name/{{ atl_product_version }}" url: "{{ atl_mpac_products }}/key/jira/versions/name/{{ atl_product_version }}"
return_content: yes return_content: yes
register: atl_product_version_info register: atl_product_version_info