diff options
| author | Adam Williamson <awilliam@redhat.com> | 2016-04-08 08:02:02 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2016-04-08 08:02:02 -0700 |
| commit | 1e71112e094c14ff80674ac0b48d188a4a7c1c40 (patch) | |
| tree | 96a5674bb5bcae536d38874b091ea12d5778dfe9 /roles/openqa/server | |
| parent | be7400b9f33e4991006d0947e7f6bdc697028ae7 (diff) | |
| download | ansible-1e71112e094c14ff80674ac0b48d188a4a7c1c40.tar.gz ansible-1e71112e094c14ff80674ac0b48d188a4a7c1c40.tar.xz ansible-1e71112e094c14ff80674ac0b48d188a4a7c1c40.zip | |
openqa/server: fix template load for non-infra
I tweaked the playbook to not patch the templates for non-infra
deployments, but then forgot to make test loading work using
non-patched templates for non-infra...
Diffstat (limited to 'roles/openqa/server')
| -rw-r--r-- | roles/openqa/server/tasks/main.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index 720473630..9148dfb8e 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -224,11 +224,16 @@ # a correct 'changed' for this step is too difficult. Instead we have # the prior and following steps; when the templates actually changed, # the *following* step will register as changed. -- name: Load tests +- name: Load patched tests shell: "/tmp/templates --clean" - when: "gittests|changed" + when: "gittests|changed and deployment_type is defined" changed_when: "1 != 1" +- name: Load tests + shell: "/var/lib/openqa/share/tests/fedora/templates --clean" + when: "gittests|changed and deployment_type is not defined" + changed_when: "1 != 1 + - name: Check if the tests changed in previous step shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-new.json && json_diff /tmp/tmpl-old.json /tmp/tmpl-new.json" when: "gittests|changed" |