PR#126: move enable copr to pkg roles - standard-test-roles

standard-test-roles

#126 move enable copr to pkg roles

Merged 6 years ago by astepano. Opened 6 years ago by bgoncalv.

bgoncalv/standard-test-roles issue99 into master

fixed issue99

Bruno Goncalves • 6 years ago

3dad9ff

roles/standard-test-beakerlib/tasks/main.yml

file modified

+4 -2

		`@@ -3,8 +3,10 @@`
		`- delegate_to: "{{ test_runner_inventory_name }}"`
		`block:`
		`- name: Add restraint repo for restraint-rhts using DNF`
		`- shell: dnf copr enable -y bpeck/restraint`
		`- ignore_errors: True`
		`+ block:`
		`+ - package: dnf-plugins-core state=present`
		`+ - shell: dnf copr enable -y bpeck/restraint`
		`+ ignore_errors: True`
		`when: "hostvars[test_runner_inventory_name]['is_dnf_os'] \| bool"`

		`- name: Add restraint repo for restraint-rhts using YUM`

roles/str-common/tasks/pkgs-dnf.yml

file modified

+11 -4

		`@@ -2,7 +2,7 @@`
		`# Note, this method cannot install -debuginfo packages.`
		`package: name={{item}} state=present`
		`with_items:`
		`- - "{{ pkgs_ordinary_req }}"`
		`+ - "{{ pkgs_ordinary_req\|d\|list }}"`

		`- name: Install the common requirements on target`
		`package: name={{item}} state=present`
		`@@ -20,6 +20,13 @@`
		`shell: \|`
		`debuginfo-install --assumeyes {{item}}`
		`with_items:`
		`- - "{{ pkgs_debuginfo_req }}"`
		`- when:`
		`- - pkgs_debuginfo_req`
		`+ - "{{ pkgs_debuginfo_req\|d\|list }}"`
		`+`
		`+ - block:`
		`+ - package: name=dnf-plugins-core state=present`
		`+ - shell: dnf copr enable -y {{item}}`
		`+ with_items:`
		`+ - "{{copr_repos}}"`
		`+ name: Enable copr repos using DNF`
		`+ ignore_errors: True`
		`+ when: copr_repos is defined`

roles/str-common/tasks/pkgs-yum.yml

file modified

+11 -4

		`@@ -2,7 +2,7 @@`
		`# Note, this method cannot install -debuginfo packages.`
		`package: name={{item}} state=present`
		`with_items:`
		`- - "{{ pkgs_ordinary_req }}"`
		`+ - "{{ pkgs_ordinary_req\|d\|list }}"`

		`- name: Install the common requirements on target`
		`package: name={{item}} state=present`
		`@@ -18,6 +18,13 @@`
		`shell: \|`
		`debuginfo-install --assumeyes {{item}}`
		`with_items:`
		`- - "{{ pkgs_debuginfo_req }}"`
		`- when:`
		`- - pkgs_debuginfo_req`
		`+ - "{{ pkgs_debuginfo_req\|d\|list }}"`
		`+`
		`+ - block:`
		`+ - package: name=yum-plugin-copr state=present`
		`+ - shell: yum copr -y {{item}}`
		`+ with_items:`
		`+ - "{{copr_repos}}"`
		`+ name: Enable copr repos using YUM`
		`+ ignore_errors: True`
		`+ when: copr_repos is defined`

bgoncalv commented 6 years ago

Also fix issue#99

1 new commit added

fix to deal with https://github.com/ansible/ansible/issues/19305

6 years ago

astepano commented on line 5 of roles/str-common/tasks/pkgs-dnf.yml 6 years ago

please use: - "{{ pkgs_ordinary_req|d|list }}" and remove 'when'

astepano commented on line 14 of roles/str-common/tasks/pkgs-dnf.yml 6 years ago

Same here:
"{{ pkgs_debuginfo_req|d|list }}"

astepano commented on line 18 of roles/str-common/tasks/pkgs-dnf.yml 6 years ago

please add state=present

rebased onto 1f2f29d968a0dd9366d46e55a526ce6e9b857f70

6 years ago

bgoncalv commented 6 years ago

Thanks for the tips, I've updated also pkgs-yum.yml.

astepano commented on line 4 of roles/str-common/tasks/trunner-pkgs.yml 6 years ago

Please reformat with:

pkg_mgr: "{{
             'rpm-ostree' if
                  hostvars[test_runner_inventory_name]['ansible_pkg_mgr'] == 'unknown'
                  and
                  is_atomic
              else hostvars[test_runner_inventory_name]['ansible_pkg_mgr']
        }}"

astepano commented on line 15 of roles/standard-test-beakerlib/tasks/main.yml 6 years ago

Let's keep this code as it is for now.
test - runner is a some vague area. Let's send this change as independent PR, after down changes are merged.

rebased onto 96edb5ca4f1d5ce36df67b02c39a33165a83e04b

6 years ago

rebased onto 3dad9ff

6 years ago

astepano commented 6 years ago

Commit 80f3935 fixes this pull-request