From e67fa98d1ac7069041f3e27df09c7b40dded7dd9 Mon Sep 17 00:00:00 2001 From: Merlin Mathesius Date: Jul 19 2017 20:13:31 +0000 Subject: Set default artifacts directory from environment variable TEST_ARTIFACTS --- diff --git a/roles/standard-test-avocado/defaults/main.yml b/roles/standard-test-avocado/defaults/main.yml new file mode 100644 index 0000000..1650168 --- /dev/null +++ b/roles/standard-test-avocado/defaults/main.yml @@ -0,0 +1,2 @@ +--- +artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" diff --git a/roles/standard-test-avocado/vars/main.yml b/roles/standard-test-avocado/vars/main.yml index 6e9c8cb..c2acc48 100644 --- a/roles/standard-test-avocado/vars/main.yml +++ b/roles/standard-test-avocado/vars/main.yml @@ -1,3 +1,2 @@ --- -artifacts: ./artifacts tests: [] diff --git a/roles/standard-test-beakerlib/defaults/main.yml b/roles/standard-test-beakerlib/defaults/main.yml new file mode 100644 index 0000000..1650168 --- /dev/null +++ b/roles/standard-test-beakerlib/defaults/main.yml @@ -0,0 +1,2 @@ +--- +artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" diff --git a/roles/standard-test-beakerlib/vars/main.yml b/roles/standard-test-beakerlib/vars/main.yml index fc79c95..b9860b2 100644 --- a/roles/standard-test-beakerlib/vars/main.yml +++ b/roles/standard-test-beakerlib/vars/main.yml @@ -1,5 +1,4 @@ --- -artifacts: ./artifacts remote_artifacts: /tmp/artifacts tests: [] required_packages: [] diff --git a/roles/standard-test-docker/defaults/main.yml b/roles/standard-test-docker/defaults/main.yml index 89e3679..5b1e4ad 100644 --- a/roles/standard-test-docker/defaults/main.yml +++ b/roles/standard-test-docker/defaults/main.yml @@ -1,3 +1,4 @@ --- +artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" docker_python_version: 2 docker_extra_args: null diff --git a/roles/standard-test-docker/vars/main.yml b/roles/standard-test-docker/vars/main.yml index 243bb7e..00e3f14 100644 --- a/roles/standard-test-docker/vars/main.yml +++ b/roles/standard-test-docker/vars/main.yml @@ -1,5 +1,4 @@ --- -artifacts: ./artifacts log: "{{artifacts}}/docker.log" subjects: [] docker_ssh_port: 2222 diff --git a/roles/standard-test-repo/defaults/main.yml b/roles/standard-test-repo/defaults/main.yml new file mode 100644 index 0000000..1650168 --- /dev/null +++ b/roles/standard-test-repo/defaults/main.yml @@ -0,0 +1,2 @@ +--- +artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" diff --git a/roles/standard-test-repo/vars/main.yml b/roles/standard-test-repo/vars/main.yml index fd98cf6..b6e94dd 100644 --- a/roles/standard-test-repo/vars/main.yml +++ b/roles/standard-test-repo/vars/main.yml @@ -1,3 +1,2 @@ --- -artifacts: ./artifacts packages: [] diff --git a/roles/standard-test-rhts/defaults/main.yml b/roles/standard-test-rhts/defaults/main.yml index be42113..fe31a1a 100644 --- a/roles/standard-test-rhts/defaults/main.yml +++ b/roles/standard-test-rhts/defaults/main.yml @@ -1,2 +1,3 @@ --- +artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}" rpms: [] diff --git a/roles/standard-test-rhts/vars/main.yml b/roles/standard-test-rhts/vars/main.yml index 902f0cb..d0486b2 100644 --- a/roles/standard-test-rhts/vars/main.yml +++ b/roles/standard-test-rhts/vars/main.yml @@ -1,5 +1,4 @@ --- -artifacts: ./artifacts remote_artifacts: /tmp/artifacts tests: [] required_packages: []