diff options
| author | Adam Williamson <awilliam@redhat.com> | 2016-09-01 10:49:55 -0700 |
|---|---|---|
| committer | Adam Williamson <awilliam@redhat.com> | 2016-09-01 10:49:55 -0700 |
| commit | 900e8bba48821a8ef26c9bf644e2f5afdff05a10 (patch) | |
| tree | bc173e911449a136ec93563c40846e132fe2eda7 /roles/openqa/server | |
| parent | 3d3f310ed5f38d9ce4e6d3f68ffde124af7e7b1b (diff) | |
| download | ansible-900e8bba48821a8ef26c9bf644e2f5afdff05a10.tar.gz ansible-900e8bba48821a8ef26c9bf644e2f5afdff05a10.tar.xz ansible-900e8bba48821a8ef26c9bf644e2f5afdff05a10.zip | |
openqa/server: drop templates patching
no longer needed since recent tweak to repository config in
tests.
Diffstat (limited to 'roles/openqa/server')
| -rw-r--r-- | roles/openqa/server/tasks/main.yml | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/roles/openqa/server/tasks/main.yml b/roles/openqa/server/tasks/main.yml index e519e7803..ef0839904 100644 --- a/roles/openqa/server/tasks/main.yml +++ b/roles/openqa/server/tasks/main.yml @@ -221,11 +221,6 @@ changed_when: "admin.rc == 0" failed_when: "(admin.rc > 0) and (admin.stderr is not defined or admin.stderr.find('already exists') == -1)" -- name: Patch repo URLs in templates - shell: "cp /var/lib/openqa/share/tests/fedora/templates /tmp && sed -i -e 's,dl.fedoraproject,dl.phx2.fedoraproject,g' /tmp/templates" - when: "gittests|changed and deployment_type is defined" - changed_when: "1 != 1" - - name: Dump existing config for checking changes shell: "/usr/share/openqa/script/dump_templates --json > /tmp/tmpl-old.json" when: "gittests|changed" @@ -235,14 +230,9 @@ # 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 patched tests - shell: "/tmp/templates --clean" - 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" + when: "gittests|changed" changed_when: "1 != 1" - name: Check if the tests changed in previous step |