PR#166: Add distro_name/distro_name_ver. Add pkgs for beakerlib. - standard-test-roles

Andrei Stepanov • 6 years ago

162fb60

file added

file modified

+13 -6

		`@@ -23,14 +23,21 @@`
		`- restraint-rhts`
		`- rsync`

		`+ - debug:`
		`+ msg: >`
		`+ 1 req pkgs for: {{ distro_name }}: {{ beakerlib_pkgs_req[distro_name] \| default([]) }}`
		`+ 2 req pkgs for: {{ distro_name_ver }}: {{ beakerlib_pkgs_req[distro_name_ver] \| default([]) }}`
		`+ verbosity: 1`
		`+`
		`- name: Install the beakerlib requirements to test environment`
		`package: name={{item}} state=latest`
		`- with_items:`
		`- - rsync`
		`- - findutils`
		`- - make`
		`- - python2-lxml`
		`- - libselinux-python`
		`+ with_flattened:`
		`+ - - rsync`
		`+ - findutils`
		`+ - make`
		`+ - libselinux-python`
		`+ - "{{ beakerlib_pkgs_req[distro_name_ver] \| default([]) }}"`
		`+ - "{{ beakerlib_pkgs_req[distro_name] \| default([]) }}"`
		`when: not is_atomic`

		`- name: Put beakerlib binaries to test environment`

roles/str-common/defaults/main.yml

file modified

		`@@ -6,3 +6,7 @@`
		`remote_artifacts: /tmp/artifacts/`
		`test_runner_inventory_name: test-runner`
		`artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')\|default('./artifacts', true) }}"`
		`+ # distro_name: rhel, centos, fedora`
		`+ distro_name: "{{ansible_distribution\|lower}}"`
		`+ # distro_name_ver: rhel_7, centos_7, fedora_22`
		`+ distro_name_ver: "{{ansible_distribution\|lower}}_{{ansible_distribution_major_version}}"`