diff --git a/molecule/amq_upgrade/converge.yml b/molecule/amq_upgrade/converge.yml index 831cc9f..0e558d7 100644 --- a/molecule/amq_upgrade/converge.yml +++ b/molecule/amq_upgrade/converge.yml @@ -19,4 +19,4 @@ ansible.builtin.include_role: name: middleware_automation.amq.activemq vars: - activemq_version: "{{ '7.12.0' if amq_broker_enable is defined and amq_broker_enable else '2.36.0' }}" + activemq_version: "{{ '7.13.0' if amq_broker_enable is defined and amq_broker_enable else '2.40.0' }}" diff --git a/molecule/amq_upgrade/prepare.yml b/molecule/amq_upgrade/prepare.yml index 8979db3..1cf2ca0 100644 --- a/molecule/amq_upgrade/prepare.yml +++ b/molecule/amq_upgrade/prepare.yml @@ -16,4 +16,4 @@ ansible.builtin.include_role: name: middleware_automation.amq.activemq vars: - activemq_version: "{{ '7.11.1' if amq_broker_enable is defined and amq_broker_enable else '2.34.0' }}" + activemq_version: "{{ '7.12.4' if amq_broker_enable is defined and amq_broker_enable else '2.36.0' }}" diff --git a/molecule/prepare.yml b/molecule/prepare.yml index 01a6865..a8b0dd5 100644 --- a/molecule/prepare.yml +++ b/molecule/prepare.yml @@ -3,14 +3,6 @@ ansible.builtin.debug: msg: "Ansible version is {{ ansible_version.full }}" -- name: Gather ip address - ansible.builtin.command: curl ifconfig.me - register: ip_public - -- name: Display IP - ansible.builtin.debug: - msg: "IP Address is {{ ip_public }}" - - name: "Set package name for sudo" ansible.builtin.set_fact: sudo_pkg_name: 'sudo' @@ -30,7 +22,3 @@ ansible.builtin.assert: that: - sudo_pkg_name in ansible_facts.packages - -- name: "Retrieve assets server from env" - ansible.builtin.set_fact: - assets_server: "{{ lookup('env','MIDDLEWARE_DOWNLOAD_RELEASE_SERVER_URL') }}" diff --git a/roles/activemq/tasks/upgrade.yml b/roles/activemq/tasks/upgrade.yml index 40022ad..ed94abc 100644 --- a/roles/activemq/tasks/upgrade.yml +++ b/roles/activemq/tasks/upgrade.yml @@ -11,9 +11,6 @@ become: "{{ activemq_install_requires_become | default(true) }}" become_user: "{{ activemq_service_user }}" changed_when: true - register: broker_updated - when: - - not instance_directory.stat.exists - name: "Update profile for instance {{ activemq.instance_name }} with new artemis version" ansible.builtin.lineinfile: