From 078aad7061f7957b2d80128eb4fba6511687be50 Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Wed, 20 Dec 2017 08:32:16 -0600 Subject: [PATCH] Remove testr and stestr specific roles With the use in repos gone, we can remove these roles. Change-Id: Id2c8a7bc2d98611c19f1547fe3aede16e94c88bb Depends-On: I0cdfc66ee8b046affeb0b071fef38c21cb7a4948 Depends-On: Iae2892d9b4cd870a11579434edc9ee66bd16798c Depends-On: I00d448c4e6b98a1f504b048c74eff4e110c0b511 Depends-On: Ic1844896b1d79216c0cb04592fdbe700d6fc043f Depends-On: I6d1726aa562f05b6d3bee7d0390fc1cf7cef4cd7 Depends-On: Icfa2b510603e05db896110e3509bd83e0d343165 Depends-On: Ia86360456c5c301cee11c8d9dd515e364aad2c82 --- roles/fetch-stestr-output/defaults/main.yaml | 2 -- roles/fetch-stestr-output/tasks/main.yaml | 23 -------------- roles/fetch-stestr-output/tasks/process.yaml | 31 ------------------ roles/fetch-testr-output/defaults/main.yaml | 2 -- roles/fetch-testr-output/tasks/main.yaml | 23 -------------- roles/fetch-testr-output/tasks/process.yaml | 33 -------------------- 6 files changed, 114 deletions(-) delete mode 100644 roles/fetch-stestr-output/defaults/main.yaml delete mode 100644 roles/fetch-stestr-output/tasks/main.yaml delete mode 100644 roles/fetch-stestr-output/tasks/process.yaml delete mode 100644 roles/fetch-testr-output/defaults/main.yaml delete mode 100644 roles/fetch-testr-output/tasks/main.yaml delete mode 100644 roles/fetch-testr-output/tasks/process.yaml diff --git a/roles/fetch-stestr-output/defaults/main.yaml b/roles/fetch-stestr-output/defaults/main.yaml deleted file mode 100644 index a0afa22c5..000000000 --- a/roles/fetch-stestr-output/defaults/main.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -zuul_work_dir: "src/{{ zuul.project.canonical_name }}" diff --git a/roles/fetch-stestr-output/tasks/main.yaml b/roles/fetch-stestr-output/tasks/main.yaml deleted file mode 100644 index 3209c51c7..000000000 --- a/roles/fetch-stestr-output/tasks/main.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- name: Register stestr directory - stat: - path: "{{ zuul_work_dir }}/.stestr" - register: stestr_stat - -- name: Process testr artifacts - include: process.yaml - when: - - stestr_stat.stat.exists - -- name: Collect test-results - synchronize: - dest: "{{ zuul.executor.log_root }}" - mode: pull - src: "{{ zuul_work_dir }}/{{ item }}" - verify_host: true - with_items: - - "*testr_results.html.gz" - - "*testrepository.subunit.gz" - when: - - stestr_stat.stat.exists - # some tox runs may not create test-results - failed_when: false diff --git a/roles/fetch-stestr-output/tasks/process.yaml b/roles/fetch-stestr-output/tasks/process.yaml deleted file mode 100644 index 96eabe173..000000000 --- a/roles/fetch-stestr-output/tasks/process.yaml +++ /dev/null @@ -1,31 +0,0 @@ -- name: Generate testrepository.subunit file - shell: ".tox/{{ tox_envlist }}/bin/stestr last --subunit > ./testrepository.subunit" - args: - chdir: "{{ zuul_work_dir }}" - -- name: Generate testr_results.html file - command: "/usr/os-testr-env/bin/subunit2html ./testrepository.subunit testr_results.html" - args: - chdir: "{{ zuul_work_dir }}" - -- name: Register testrepository.subunit file - stat: - path: "{{ zuul_work_dir }}/testrepository.subunit" - register: p - -- name: Compress testrepository.subunit file - archive: - path: "{{ p.stat.path }}" - when: - - p.stat.exists - -- name: Register testr_results.html file - stat: - path: "{{ zuul_work_dir }}/testr_results.html" - register: html - -- name: Compress testr_results.html file - archive: - path: "{{ html.stat.path }}" - when: - - html.stat.exists diff --git a/roles/fetch-testr-output/defaults/main.yaml b/roles/fetch-testr-output/defaults/main.yaml deleted file mode 100644 index a0afa22c5..000000000 --- a/roles/fetch-testr-output/defaults/main.yaml +++ /dev/null @@ -1,2 +0,0 @@ ---- -zuul_work_dir: "src/{{ zuul.project.canonical_name }}" diff --git a/roles/fetch-testr-output/tasks/main.yaml b/roles/fetch-testr-output/tasks/main.yaml deleted file mode 100644 index 58b73f01d..000000000 --- a/roles/fetch-testr-output/tasks/main.yaml +++ /dev/null @@ -1,23 +0,0 @@ -- name: Register testrepository directory - stat: - path: "{{ zuul_work_dir }}/.testrepository" - register: testrepository_stat - -- name: Process testr artifacts - include: process.yaml - when: - - testrepository_stat.stat.exists - -- name: Collect test-results - synchronize: - dest: "{{ zuul.executor.log_root }}" - mode: pull - src: "{{ zuul_work_dir }}/{{ item }}" - verify_host: true - with_items: - - "*testr_results.html.gz" - - "*testrepository.subunit.gz" - when: - - testrepository_stat.stat.exists - # some tox runs may not create test-results - failed_when: false diff --git a/roles/fetch-testr-output/tasks/process.yaml b/roles/fetch-testr-output/tasks/process.yaml deleted file mode 100644 index 801b2ba69..000000000 --- a/roles/fetch-testr-output/tasks/process.yaml +++ /dev/null @@ -1,33 +0,0 @@ -- name: Generate testrepository.subunit file - # TODO(pabelanger): We cannot depend on tox_envlist here!!! - shell: ".tox/{{ tox_envlist }}/bin/testr last --subunit > ./testrepository.subunit" - args: - chdir: "{{ zuul_work_dir }}" - -- name: Generate testr_results.html file - # TODO(pabelanger): We cannot depend on /usr/os-testr-env here!!! - command: "/usr/os-testr-env/bin/subunit2html ./testrepository.subunit testr_results.html" - args: - chdir: "{{ zuul_work_dir }}" - -- name: Register testrepository.subunit file - stat: - path: "{{ zuul_work_dir }}/testrepository.subunit" - register: p - -- name: Compress testrepository.subunit file - archive: - path: "{{ p.stat.path }}" - when: - - p.stat.exists - -- name: Register testr_results.html file - stat: - path: "{{ zuul_work_dir }}/testr_results.html" - register: html - -- name: Compress testr_results.html file - archive: - path: "{{ html.stat.path }}" - when: - - html.stat.exists