From 825212db97900cb9bb217a4d9f842b6580b9547b Mon Sep 17 00:00:00 2001 From: Brett Meehan Date: Tue, 7 Apr 2020 15:10:08 +1000 Subject: [PATCH] ITOPSENG-395 for some reason chaining the jinja replace on the string append isnt working so doing those in 2 separate facts blocks --- roles/product_install/tasks/main.yml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/roles/product_install/tasks/main.yml b/roles/product_install/tasks/main.yml index eb87b86..e2773c1 100644 --- a/roles/product_install/tasks/main.yml +++ b/roles/product_install/tasks/main.yml @@ -76,23 +76,28 @@ - name: "Case: Version is not latest" block: + - name: "create atlassian z versioning for comparison" + set_fact: + atl_z_product_version: "{{ atl_product_version ~ '-z' }}" + atl_z_cached_version: "{{ atl_cached_version ~ '-z' }}" + - name: "create atlassian ordered versioning for comparison" set_fact: - atl_product_normalised_version: "{{atl_product_version ~ '-z'|replace('-m', '-am')}}" - + atl_product_normalised_version: "{{ atl_z_product_version | replace('-m', '-am') }}" + atl_cached_normalised_version: "{{ atl_z_cached_version | replace('-m', '-am') }}" - name: "Case: No cached version, or supplied is higher; use supplied" set_fact: atl_download_version: "{{ atl_product_version }}" when: force_version_update | bool or not cached.stat.exists or - atl_product_normalised_version is version(atl_cached_version, '>') + atl_product_normalised_version is version(atl_cached_normalised_version, '>') - name: "Case: Cached version is higher or forced, ignore supplied" set_fact: atl_download_version: "{{ atl_cached_version }}" when: cached.stat.exists and - atl_product_version is version(atl_cached_version, '<=') and + atl_product_normalised_version is version(atl_cached_normalised_version, '<=') and not force_version_update | bool when: not version_is_latest