diff --git a/doc/source/deprecated-jobs.rst b/doc/source/deprecated-jobs.rst index 4d6a60ed1..87a8e5dee 100644 --- a/doc/source/deprecated-jobs.rst +++ b/doc/source/deprecated-jobs.rst @@ -1,12 +1,5 @@ Deprecated Jobs =============== -.. zuul:autojob:: build-javascript-tarball -.. zuul:autojob:: build-javascript-content -.. zuul:autojob:: build-javascript-content-tarball -.. zuul:autojob:: nodejs-npm -.. zuul:autojob:: nodejs-npm-run-test -.. zuul:autojob:: nodejs-npm-run-lint -.. zuul:autojob:: nodejs-npm-run-docs .. zuul:autojob:: tox-py34 .. zuul:autojob:: tox-py35 diff --git a/playbooks/nodejs-npm/pre.yaml b/playbooks/nodejs-npm/pre.yaml deleted file mode 100644 index 79eb298d9..000000000 --- a/playbooks/nodejs-npm/pre.yaml +++ /dev/null @@ -1,9 +0,0 @@ -- hosts: all - pre_tasks: - - name: Set node version if not set - set_fact: - node_version: '6' - when: node_version is not defined - roles: - - ensure-yarn - - ensure-javascript-packages diff --git a/playbooks/nodejs-npm/run.yaml b/playbooks/nodejs-npm/run.yaml deleted file mode 100644 index c712dd0e5..000000000 --- a/playbooks/nodejs-npm/run.yaml +++ /dev/null @@ -1,4 +0,0 @@ -- hosts: all - roles: - - revoke-sudo - - npm diff --git a/zuul.d/js-jobs.yaml b/zuul.d/js-jobs.yaml index 66a1319be..b7cd55554 100644 --- a/zuul.d/js-jobs.yaml +++ b/zuul.d/js-jobs.yaml @@ -245,214 +245,3 @@ post-run: playbooks/tox/docs-post.yaml vars: js_build_command: docs - -- job: - name: nodejs-npm - parent: unittests - description: | - Base job for javascript operations using npm. - ** DEPRECATED: Switch to js-build ** - - Responds to these variables: - - .. zuul:jobvar:: npm_command - :default: build - - Command to pass to npm. - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - - .. zuul:jobvar:: javascript_content_dir - :default: dist - - Directory, relative to zuul_work_dir, holding build content. - pre-run: playbooks/nodejs-npm/pre.yaml - run: playbooks/nodejs-npm/run.yaml - post-run: playbooks/javascript/post.yaml - vars: - npm_command: build - -- job: - name: build-javascript-tarball - parent: nodejs-npm - description: | - Build a source tarball for a Javascript project - - ** DEPRECATED: Switch to build-javascript-source-tarball ** - - Responds to these variables: - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - - .. zuul:jobvar:: javascript_content_dir - :default: dist - - Directory, relative to zuul_work_dir, holding build content. - vars: - npm_command: pack - -- job: - name: build-javascript-content - parent: nodejs-npm - description: | - Build javascript web content as it should be deployed. - - ** DEPRECATED: Please switch to build-javascript-release ** - - Responds to these variables: - - .. zuul:jobvar:: npm_command - :default: build - - Command to pass to npm. - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - - .. zuul:jobvar:: javascript_content_dir - :default: dist - - Directory, relative to zuul_work_dir, holding build content. - -- job: - name: build-javascript-content-tarball - parent: nodejs-npm - description: | - Build an archive of javascript web content as it should be deployed. - - ** DEPRECATED: Please use build-javascript-deployment ** - - Responds to these variables: - - .. zuul:jobvar:: npm_command - :default: build - - Command to pass to npm. - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - - .. zuul:jobvar:: javascript_content_dir - :default: dist - - Directory, relative to zuul_work_dir, holding build content. - - .. zuul:jobvar:: create_tarball_directory - - Create a tarball with the contents of - create_tarball_directory (relative to zuul_work_dir). - post-run: playbooks/javascript/tarball.yaml - -- job: - name: nodejs-npm-run-test - parent: nodejs-npm - description: | - Run test using nodejs. This test also starts Xvfb for run time - tests. - - ** DEPRECATED: Please switch to nodejs-run-test ** - - Responds to these variables: - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - - .. zuul:jobvar:: javascript_content_dir - :default: dist - - Directory, relative to zuul_work_dir, holding build content. - pre-run: playbooks/javascript/browser.yaml - vars: - npm_command: test - -- job: - name: nodejs-npm-run-lint - parent: nodejs-npm - description: | - Run lint using nodejs. - - ** DEPRECATED: Please switch to nodejs-run-lint ** - - Responds to these variables: - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - - .. zuul:jobvar:: javascript_content_dir - :default: dist - - Directory, relative to zuul_work_dir, holding build content. - vars: - npm_command: lint - -- job: - name: nodejs-npm-run-docs - parent: nodejs-npm - description: | - Run docs using nodejs. - - ** DEPRECATED: Please switch to nodejs-run-docs ** - - Responds to these variables: - - .. zuul:jobvar:: npm_executable - :default: autodetected - - Command to use for running npm, such as npm or yarn. - - .. zuul:jobvar:: node_version - :default: 6 - - The version of Node to use. - - .. zuul:jobvar:: zuul_work_dir - :default: {{ zuul.project.src_dir }} - - Path to operate in. - post-run: playbooks/tox/docs-post.yaml - vars: - npm_command: docs