From bfc5217a0f4561dbd75463428b9801074950a4a4 Mon Sep 17 00:00:00 2001 From: Andreas Jaeger Date: Thu, 9 Nov 2017 21:40:43 +0100 Subject: [PATCH] Use npm docs jobs Use npm docs jobs in the nodejs docs templates, those used sphinx building by accident. Change-Id: Ied5b10d647e47d752ceb11a887e831c82be62888 Depends-On: I4517b9fb5d9b17b099e2a5ab138688caaa976be9 --- zuul.d/project-templates.yaml | 31 +++++++++++++++++++++++ zuul.d/zuul-legacy-project-templates.yaml | 20 --------------- 2 files changed, 31 insertions(+), 20 deletions(-) diff --git a/zuul.d/project-templates.yaml b/zuul.d/project-templates.yaml index 358bd514..a2a0f502 100644 --- a/zuul.d/project-templates.yaml +++ b/zuul.d/project-templates.yaml @@ -759,3 +759,34 @@ - nodejs-npm-run-test: vars: node_version: 6 + +- project-template: + name: nodejs4-docs + description: | + Run docs jobs using Node 4. + check: + jobs: + - nodejs-npm-run-lint: + vars: + node_version: 4 + - build-openstack-sphinx-docs + gate: + jobs: + - nodejs-npm-run-lint: + vars: + node_version: 4 + +- project-template: + name: nodejs6-docs + description: | + Run docs jobs using Node 6. + check: + jobs: + - nodejs-npm-run-lint: + vars: + node_version: 6 + gate: + jobs: + - nodejs-npm-run-lint: + vars: + node_version: 6 diff --git a/zuul.d/zuul-legacy-project-templates.yaml b/zuul.d/zuul-legacy-project-templates.yaml index e30f0d7a..699499c3 100644 --- a/zuul.d/zuul-legacy-project-templates.yaml +++ b/zuul.d/zuul-legacy-project-templates.yaml @@ -309,26 +309,6 @@ jobs: - legacy-tempest-dsvm-neutron-src-plugin -- project-template: - # TODO(jaegerandi): This is broken, should use npm docs - name: nodejs4-docs - check: - jobs: - - build-openstack-sphinx-docs - gate: - jobs: - - build-openstack-sphinx-docs - -- project-template: - name: nodejs6-docs - # TODO(jaegerandi): This is broken, should use npm docs - check: - jobs: - - build-openstack-sphinx-docs - gate: - jobs: - - build-openstack-sphinx-docs - - project-template: name: noop-jobs check: