openstack/requirements
Code Issues Proposed changes

Switch node tests to inherit nodejs-run-test-browser.

Browse Source 
Current base of nodjs-npm-run-test is deprecated. We need to switch to
the newer base job to pick up new behavior. Horizon npm tests require
a browser so the job inherit nodejs-run-test-browser now.

In addition, tox is not anymore pre-installed on the OpenDev CI images.
npm jobs in horizon need tox, so we need to install it in pre-run phase.

Change-Id: Iffa3f7631bec0a5f7b0c701df87305725cae5708
Signed-off-by: Sean McGinnis <sean.mcginnis@gmail.com>
Co-Authored-By: Akihiro Motoki <amotoki@gmail.com>
This commit is contained in:
Sean McGinnis 2020-06-22 13:33:38 -05:00 committed by Akihiro Motoki
parent d9bc8c5e8b
commit 5b67b111ca
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.zuul.d/cross-jobs.yaml
View File

@ -23,7 +23,7 @@
- job: - job:
name: requirements-cross-npm name: requirements-cross-npm
parent: nodejs-npm-run-test parent: nodejs-run-test-browser
timeout: 2400 timeout: 2400
description: | description: |
A parent job to perform cross-repository npm tests. A parent job to perform cross-repository npm tests.
@ -39,6 +39,7 @@
vars: vars:
zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}" zuul_work_dir: "{{ (zuul.projects.values() | selectattr('required') | selectattr('name', 'match', '^(?!openstack/requirements)') | list)[0].src_dir }}"
tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt"
pre-run: playbooks/nodejs-pre.yaml
files: files:
- upper-constraints.txt - upper-constraints.txt
- .zuul.d/cross-jobs.yaml - .zuul.d/cross-jobs.yaml

6
playbooks/nodejs-pre.yaml Normal file
View File

@ -0,0 +1,6 @@
- hosts: all
roles:
# package.json needs to run 'tox' as command, ensure that it's
# installed and can be used globally.
- role: ensure-tox
ensure_global_symlinks: True