diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2018-02-28 11:37:52 +0000 |
|---|---|---|
| committer | Fatih Degirmenci <fdegir@gmail.com> | 2018-02-28 18:50:48 +0000 |
| commit | f7e288dec1de77be635c5024729fb97de02641ba (patch) | |
| tree | 8ecd9716516090ee2982f2338f40d883828fa50a | |
| parent | faf5144aa6c87642d627b63a8464a8e96949e9fe (diff) | |
functest: Move run-functest.sh execution out of ansible
Ansible throws out the log at the end of task execution which
makes it hard to read. This change renames the role to prepare-functest
and then takes the script execution out which will be executed by
releng/jjb/xci/xci-run-functest.sh.
Change-Id: Icf399ce4f04357814ed7109cd11113a9decddc50
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>
| -rw-r--r-- | xci/playbooks/prepare-functest.yml (renamed from xci/playbooks/run-functest.yml) | 4 | ||||
| -rw-r--r-- | xci/playbooks/roles/.gitignore | 2 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/defaults/main.yml (renamed from xci/playbooks/roles/run-functest/defaults/main.yml) | 0 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/tasks/main.yml (renamed from xci/playbooks/roles/run-functest/tasks/main.yml) | 3 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/env.j2 (renamed from xci/playbooks/roles/run-functest/templates/env.j2) | 0 | ||||
| -rw-r--r-- | xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 (renamed from xci/playbooks/roles/run-functest/templates/run-functest.sh.j2) | 0 |
6 files changed, 3 insertions, 6 deletions
diff --git a/xci/playbooks/run-functest.yml b/xci/playbooks/prepare-functest.yml index 8b3b29a1..6d5b01c6 100644 --- a/xci/playbooks/run-functest.yml +++ b/xci/playbooks/prepare-functest.yml @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -- name: Prepare the environment for functest and run tests +- name: Prepare the environment for functest hosts: opnfv user: root roles: - - role: "run-functest" + - role: "prepare-functest" diff --git a/xci/playbooks/roles/.gitignore b/xci/playbooks/roles/.gitignore index 5e72578c..e0b47770 100644 --- a/xci/playbooks/roles/.gitignore +++ b/xci/playbooks/roles/.gitignore @@ -3,6 +3,6 @@ !clone-repository/ !configure-network/ !configure-nfs/ -!run-functest/ +!prepare-functest/ !remote-folders/ !synchronize-time/ diff --git a/xci/playbooks/roles/run-functest/defaults/main.yml b/xci/playbooks/roles/prepare-functest/defaults/main.yml index a3638302..a3638302 100644 --- a/xci/playbooks/roles/run-functest/defaults/main.yml +++ b/xci/playbooks/roles/prepare-functest/defaults/main.yml diff --git a/xci/playbooks/roles/run-functest/tasks/main.yml b/xci/playbooks/roles/prepare-functest/tasks/main.yml index 3dc8e0bb..243358fc 100644 --- a/xci/playbooks/roles/run-functest/tasks/main.yml +++ b/xci/playbooks/roles/prepare-functest/tasks/main.yml @@ -34,6 +34,3 @@ state: present with_items: - wget - -- name: execute the script - shell: "/root/run-functest.sh" diff --git a/xci/playbooks/roles/run-functest/templates/env.j2 b/xci/playbooks/roles/prepare-functest/templates/env.j2 index 43a581bd..43a581bd 100644 --- a/xci/playbooks/roles/run-functest/templates/env.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/env.j2 diff --git a/xci/playbooks/roles/run-functest/templates/run-functest.sh.j2 b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 index 016df8ef..016df8ef 100644 --- a/xci/playbooks/roles/run-functest/templates/run-functest.sh.j2 +++ b/xci/playbooks/roles/prepare-functest/templates/run-functest.sh.j2 |