diff options
| -rw-r--r-- | .zuul.d/nodejs-jobs.yaml | 34 | ||||
| -rw-r--r-- | .zuul.d/project.yaml | 2 | ||||
| -rw-r--r-- | .zuul.d/xstatic-master.yaml | 6 |
3 files changed, 1 insertions, 41 deletions
diff --git a/.zuul.d/nodejs-jobs.yaml b/.zuul.d/nodejs-jobs.yaml index 9841454bc..a9d22f519 100644 --- a/.zuul.d/nodejs-jobs.yaml +++ b/.zuul.d/nodejs-jobs.yaml @@ -1,18 +1,4 @@ - job: - name: horizon-nodejs16-run-lint - parent: nodejs-run-lint - description: | - Run lint using Node 16 for horizon plugins. - vars: - node_version: 16 - tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" - nodeset: ubuntu-focal - pre-run: playbooks/horizon-nodejs/pre.yaml - required-projects: - - openstack/horizon - - openstack/requirements - -- job: name: horizon-nodejs18-run-lint parent: nodejs-run-lint description: | @@ -27,20 +13,6 @@ - openstack/requirements - job: - name: horizon-nodejs16-run-test - parent: nodejs-run-test-browser - description: | - Run test using Node 16 for horizon plugins. - vars: - node_version: 16 - tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" - pre-run: playbooks/horizon-nodejs/pre.yaml - nodeset: ubuntu-focal - required-projects: - - openstack/horizon - - openstack/requirements - -- job: name: horizon-nodejs18-run-test parent: nodejs-run-test-browser description: | @@ -58,20 +30,16 @@ name: horizon-nodejs-jobs description: | This project template is defined to run lint and test jobs using - Node LTS version (i.e. 16 now) for horizon plugins. horizon plugins + Node LTS version (i.e. 18 now) for horizon plugins. horizon plugins can use this template to run nodejs jobs. So if we want to update nodejs version in horizon plugins we can update this template to use the job with the latest node version and not many changes are required in the horizon plugins side. check: jobs: - - horizon-nodejs16-run-lint - - horizon-nodejs16-run-test - horizon-nodejs18-run-lint - horizon-nodejs18-run-test gate: jobs: - - horizon-nodejs16-run-lint - - horizon-nodejs16-run-test - horizon-nodejs18-run-lint - horizon-nodejs18-run-test diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml index d5bcedf22..9d3f00f18 100644 --- a/.zuul.d/project.yaml +++ b/.zuul.d/project.yaml @@ -26,10 +26,8 @@ jobs: - horizon-integration-tests-xstatic-master - horizon-tox-py36-xstatic-master - - horizon-nodejs16-run-test-xstatic-master - horizon-nodejs18-run-test-xstatic-master periodic: jobs: - - horizon-nodejs16-run-test - horizon-nodejs18-run-test - horizon-integration-tests diff --git a/.zuul.d/xstatic-master.yaml b/.zuul.d/xstatic-master.yaml index 501343590..0baa4c2e3 100644 --- a/.zuul.d/xstatic-master.yaml +++ b/.zuul.d/xstatic-master.yaml @@ -31,12 +31,6 @@ required-projects: *xstatic-projects - job: - name: horizon-nodejs16-run-test-xstatic-master - parent: horizon-nodejs16-run-test - required-projects: *xstatic-projects - pre-run: playbooks/npm-test-xstatic-master/pre.yaml - -- job: name: horizon-nodejs18-run-test-xstatic-master parent: horizon-nodejs18-run-test required-projects: *xstatic-projects |