diff --git a/roles/fetch-sphinx-tarball/README.rst b/roles/fetch-sphinx-tarball/README.rst index 8fcff252a..a1af64c47 100644 --- a/roles/fetch-sphinx-tarball/README.rst +++ b/roles/fetch-sphinx-tarball/README.rst @@ -12,12 +12,6 @@ archive into the log root for viewing. Directory relative to zuul_work_dir where build output should be found. -.. zuul:rolevar:: sphinx_output_dir - :default: html - - Directory relative to sphinx_build_dir where sphinx output will be - put. - .. zuul:rolevar:: zuul_work_dir :default: {{ zuul.project.src_dir }} diff --git a/roles/fetch-sphinx-tarball/defaults/main.yaml b/roles/fetch-sphinx-tarball/defaults/main.yaml index a29e4482f..4c68b3833 100644 --- a/roles/fetch-sphinx-tarball/defaults/main.yaml +++ b/roles/fetch-sphinx-tarball/defaults/main.yaml @@ -1,4 +1,3 @@ --- zuul_work_dir: "{{ zuul.project.src_dir }}" sphinx_build_dir: doc/build -sphinx_output_dir: "html" diff --git a/roles/fetch-sphinx-tarball/tasks/html.yaml b/roles/fetch-sphinx-tarball/tasks/html.yaml index 1e143e9c8..73c2a2759 100644 --- a/roles/fetch-sphinx-tarball/tasks/html.yaml +++ b/roles/fetch-sphinx-tarball/tasks/html.yaml @@ -5,7 +5,7 @@ register: html_archive - name: Archive HTML - command: "tar -f {{ html_archive.path }} -C {{ zuul_work_dir }}/{{ sphinx_build_dir }}/{{ sphinx_output_dir }} -cj ." + command: "tar -f {{ html_archive.path }} -C {{ zuul_work_dir }}/{{ sphinx_build_dir }}/html -cj ." args: warn: false