Skip to content

Commit b246063

Browse files
author
Tobias Richter
committed
Fix Galaxy lint issues
1 parent f74dd41 commit b246063

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

tasks/in_place_upgrade.yml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
# get the latest version of all the existing jar files
22
- name: "in_place_upgrade : detect version to upgrade from."
33
set_fact:
4-
aem_cms_in_place_upgrade_existing_version: "{{ aem_cms_in_place_upgrade_existing_quickstarts | map('regex_replace', '^.*cq-quickstart-(.+)-standalone-quickstart.jar$', '\\1') | list | sort | reverse | list | first }}"
4+
aem_cms_in_place_upgrade_existing_version:
5+
"{{ aem_cms_in_place_upgrade_existing_quickstarts
6+
| map('regex_replace', '^.*cq-quickstart-(.+)-standalone-quickstart.jar$', '\\1')
7+
| list | sort | reverse | list | first }}"
58

69
# safe gate which only allows upgrades when allowed
710
- name: "in_place_upgrade : fail when upgrade is not allowed."
@@ -22,7 +25,7 @@
2225
when: aem_cms_version is version_compare(aem_cms_in_place_upgrade_existing_version, '<')
2326

2427
# check if upgrading is allowed based on existing and new version
25-
- name: "in_place_upgrade : fail when upgrade path from '{{ aem_cms_in_place_upgrade_existing_version }}' to '{{ aem_cms_version }}' is not allowed."
28+
- name: "in_place_upgrade : fail when upgrade path to '{{ aem_cms_version }}' is not allowed."
2629
fail:
2730
msg: "Upgrade from {{ aem_cms_in_place_upgrade_existing_version }} to {{ aem_cms_version }} is not allowed."
2831
when: aem_cms_in_place_upgrade_paths[aem_cms_in_place_upgrade_existing_version] is not defined or

tasks/main.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,16 @@
4545

4646
- name: "Set fact with existing quickstart paths."
4747
set_fact:
48-
aem_cms_in_place_upgrade_existing_quickstarts: "{{ aem_cms_existing_quickstarts.files | map(attribute='path') | list }}"
48+
aem_cms_in_place_upgrade_existing_quickstarts:
49+
"{{ aem_cms_existing_quickstarts.files | map(attribute='path') | list }}"
4950

5051
- name: Include tasks for in-place-upgrade when necessary.
5152
include_tasks: in_place_upgrade.yml
5253
# only perform in place upgrade when no jar containing aem_cms_version is present
5354
when:
54-
- aem_cms_in_place_upgrade_existing_quickstarts | map('basename') | list | select('search', aem_cms_version) | list | length == 0
55-
- aem_cms_in_place_upgrade_existing_quickstarts | length > 0
55+
- aem_cms_in_place_upgrade_existing_quickstarts | map('basename') | list
56+
| select('search', aem_cms_version) | list | length == 0
57+
- aem_cms_in_place_upgrade_existing_quickstarts | length > 0
5658

5759
- name: Unpack AEM.
5860
shell: >-
@@ -86,4 +88,4 @@
8688

8789
- name: Setup i386 support for XMPFilesProcessor.
8890
include_tasks: xmp_i386.yml
89-
when: ansible_architecture == 'x86_64'
91+
when: ansible_architecture == 'x86_64'

0 commit comments

Comments
 (0)