From b80e33039cd70bbd371b474b676d7a0ec54cdd95 Mon Sep 17 00:00:00 2001 From: Mohammed Naser Date: Wed, 4 Oct 2017 21:34:17 -0400 Subject: [PATCH] Avoid moving release notes after complete execution Originally, we were moving the release notes to another folder to make it work with the fetch-sphinx-output role. However, this did not always work as expected due to the fact that some projects do not have a doc folder. This fixes that issue and avoids the move and simply grabs the data from the right folder. Change-Id: If6ee519c33320db91f8a9553ed4abc099c284eec --- playbooks/releasenotes/post.yaml | 2 +- roles/build-releasenotes/tasks/main.yaml | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/playbooks/releasenotes/post.yaml b/playbooks/releasenotes/post.yaml index 549a8f55..1486567a 100644 --- a/playbooks/releasenotes/post.yaml +++ b/playbooks/releasenotes/post.yaml @@ -2,5 +2,5 @@ roles: - role: fetch-tox-output - role: fetch-sphinx-output - sphinx_output_src: "{{ zuul.project.src_dir }}/doc/build/html/" + sphinx_output_src: "{{ zuul.project.src_dir }}/releasenotes/build/html/" zuul_executor_dest: "{{ zuul.executor.log_root }}" diff --git a/roles/build-releasenotes/tasks/main.yaml b/roles/build-releasenotes/tasks/main.yaml index c68a5d84..8505e09d 100644 --- a/roles/build-releasenotes/tasks/main.yaml +++ b/roles/build-releasenotes/tasks/main.yaml @@ -120,8 +120,3 @@ vars: tox_constraints_file: "{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt" tox_envlist: releasenotes - -- name: Move build output to correct path for publishers - command: mv releasenotes/build doc - args: - chdir: "{{ zuul_work_dir }}"