From a4b8acc5d6ea97e057e2154bd267a5a479e5d6d8 Mon Sep 17 00:00:00 2001 From: Artem Goncharov Date: Mon, 9 May 2022 11:53:23 +0200 Subject: [PATCH] add pandoc version info (#8) add pandoc version info emit pandoc version stick to particular pandoc version (through ensure-pandoc role) Reviewed-by: OpenTelekomCloud Bot --- bindep.txt | 1 - playbooks/pre.yaml | 2 ++ playbooks/run.yaml | 2 +- roles/convert_doc/tasks/main.yaml | 3 +++ zuul.yaml | 5 ++++- 5 files changed, 10 insertions(+), 3 deletions(-) delete mode 100644 bindep.txt diff --git a/bindep.txt b/bindep.txt deleted file mode 100644 index 4a59b54c8..000000000 --- a/bindep.txt +++ /dev/null @@ -1 +0,0 @@ -pandoc diff --git a/playbooks/pre.yaml b/playbooks/pre.yaml index 1208fdcc8..c37798c4a 100644 --- a/playbooks/pre.yaml +++ b/playbooks/pre.yaml @@ -2,7 +2,9 @@ - hosts: all roles: - ensure-python + - ensure-pip - ensure-virtualenv + - ensure-pandoc - ensure-gh tasks: - name: Install convertor diff --git a/playbooks/run.yaml b/playbooks/run.yaml index 21d5021fb..b1ad7bc36 100644 --- a/playbooks/run.yaml +++ b/playbooks/run.yaml @@ -28,7 +28,7 @@ loop_control: loop_var: "doc" label: "{{ doc.label }}" - when: "git_log.stdout is search(doc.html_location) or git_log.stdout is search('otc_doc_convertor')" + when: "git_log.stdout is search(doc.html_location) or git_log.stdout is search('otc_doc_convertor') or git_log.stdout is search('playbooks')" - name: Restore to the previous git state command: "git checkout HEAD^1" diff --git a/roles/convert_doc/tasks/main.yaml b/roles/convert_doc/tasks/main.yaml index 18292551b..e3b0faf48 100644 --- a/roles/convert_doc/tasks/main.yaml +++ b/roles/convert_doc/tasks/main.yaml @@ -1,3 +1,6 @@ +- name: Emit pandoc version + command: "pandoc --version" + - name: Convert {{ doc_label | default('') }} HTML to RST args: executable: "/bin/bash" diff --git a/zuul.yaml b/zuul.yaml index 96c902b27..35c704a68 100644 --- a/zuul.yaml +++ b/zuul.yaml @@ -28,7 +28,7 @@ name: otc-doc-exports-convert-base parent: unittests abstract: true - nodeset: ubuntu-jammy + nodeset: vm description: | Convert doc exports from html to rst and generate corresponding rst diff files. @@ -45,6 +45,7 @@ files: - otc_doc_convertor - docs/ecs + - roles vars: docs_update_data_file: "docs_compute.yaml" @@ -57,6 +58,7 @@ files: - otc_doc_convertor - docs/modelarts + - roles vars: docs_update_data_file: "docs_big-data.yaml" @@ -97,6 +99,7 @@ docs_rst_location: "docs" docs_base_location: "base" docs_new_location: "new" + ensure_pandoc_version: "2.18" check: jobs: - otc-tox-pep8: