diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b050ee45..1e174d87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -15,11 +15,12 @@ on: jobs: ci: - uses: ansible-middleware/github-actions/.github/workflows/cish.yml@main + uses: ansible-middleware/github-actions/.github/workflows/ci.yml@rootperm secrets: inherit with: fqcn: 'middleware_automation/amq' debug_verbosity: "${{ github.event.inputs.debug_verbosity }}" + root_permission_varname: activemq_install_requires_become molecule_tests: >- [ "static_cluster", "replication", "live_only", "mirroring" ] podman_tests_current: >- diff --git a/molecule/amq_upgrade/converge.yml b/molecule/amq_upgrade/converge.yml index 72f2a804..a22bfbcf 100644 --- a/molecule/amq_upgrade/converge.yml +++ b/molecule/amq_upgrade/converge.yml @@ -7,7 +7,6 @@ - user: amq password: amqbrokerpass roles: [ amq ] - activemq_install_requires_become: false tasks: - name: Include role for broker upgrade ansible.builtin.include_role: diff --git a/molecule/custom_xml/converge.yml b/molecule/custom_xml/converge.yml index 6df35816..f5237ebc 100644 --- a/molecule/custom_xml/converge.yml +++ b/molecule/custom_xml/converge.yml @@ -7,6 +7,5 @@ activemq_jvm_package: java-11-openjdk-headless activemq_properties_file: test.properties activemq_version: 2.36.0 - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/federation/converge.yml b/molecule/federation/converge.yml index c58be263..adb2ed4e 100644 --- a/molecule/federation/converge.yml +++ b/molecule/federation/converge.yml @@ -54,6 +54,5 @@ parameters: max_consumers: 1 delay_before_dispatch: 3 - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/live_only/converge.yml b/molecule/live_only/converge.yml index f0927cb7..e6a162c3 100644 --- a/molecule/live_only/converge.yml +++ b/molecule/live_only/converge.yml @@ -61,6 +61,5 @@ parameters: max_consumers: 1 delay_before_dispatch: 3 - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/mask_passwords/converge.yml b/molecule/mask_passwords/converge.yml index 81cc3b82..afb7f2e3 100644 --- a/molecule/mask_passwords/converge.yml +++ b/molecule/mask_passwords/converge.yml @@ -411,6 +411,5 @@ tcpReceiveBufferSize: 1048576 protocols: CORE,MQTT useEpoll: true - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/mirroring/converge.yml b/molecule/mirroring/converge.yml index 68b2e5b5..b90d5fc7 100644 --- a/molecule/mirroring/converge.yml +++ b/molecule/mirroring/converge.yml @@ -43,6 +43,5 @@ - name: a.test anycast: - name: a.test - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/replication/converge.yml b/molecule/replication/converge.yml index c8625e34..a04c35aa 100644 --- a/molecule/replication/converge.yml +++ b/molecule/replication/converge.yml @@ -66,6 +66,5 @@ routing_type: ANYCAST filter: "msgType LIKE '%ff%'" exclusive: True - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/static_cluster/converge.yml b/molecule/static_cluster/converge.yml index 5efaf3af..d6bd8c0d 100644 --- a/molecule/static_cluster/converge.yml +++ b/molecule/static_cluster/converge.yml @@ -82,6 +82,5 @@ - name: b.test anycast: - name: b.test - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq diff --git a/molecule/static_cluster/prepare.yml b/molecule/static_cluster/prepare.yml index 2b96c555..0b7cc2d2 100644 --- a/molecule/static_cluster/prepare.yml +++ b/molecule/static_cluster/prepare.yml @@ -2,7 +2,6 @@ - name: Prepare hosts: all vars: - activemq_install_requires_become: false tasks: - name: "Run preparation common to all scenario" ansible.builtin.include_tasks: ../prepare.yml diff --git a/molecule/uninstall/converge.yml b/molecule/uninstall/converge.yml index c42b556c..e0bde0df 100644 --- a/molecule/uninstall/converge.yml +++ b/molecule/uninstall/converge.yml @@ -4,6 +4,5 @@ gather_facts: yes vars: activemq_service_user_home: /home/activemq - activemq_install_requires_become: false roles: - middleware_automation.amq.activemq_uninstall