Update node to v14 and update to new jobs
v14 is the latest lts. Let's use it. Also - rename the jobs to make it clear what they're doing, and add a dashboard job that points at opendev's multi-tenat api too. There are new jobs that default to latest node LTS and auto-detect yarn vs npm. Update to use them. Depends-On: https://review.opendev.org/728097 Depends-On: https://review.opendev.org/726547 Change-Id: I5717edea2cd09acc5bce673c38bbe7fa8057a376
This commit is contained in:
parent
931eac4030
commit
349991c568
54
.zuul.yaml
54
.zuul.yaml
@ -74,7 +74,7 @@
|
||||
|
||||
- job:
|
||||
name: zuul-build-dashboard
|
||||
parent: build-javascript-content
|
||||
parent: build-javascript-deployment
|
||||
success-url: 'npm/html/'
|
||||
files:
|
||||
- web/.*
|
||||
@ -82,16 +82,26 @@
|
||||
vars:
|
||||
javascript_content_dir: "../zuul/web/static"
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
zuul_api_url: https://zuul.openstack.org
|
||||
node_version: 10
|
||||
create_tarball_directory: build
|
||||
run: playbooks/dashboard/run.yaml
|
||||
|
||||
- job:
|
||||
name: zuul-build-dashboard-multi-tenant
|
||||
name: zuul-build-dashboard-openstack-whitelabel
|
||||
parent: zuul-build-dashboard
|
||||
vars:
|
||||
zuul_api_url: https://zuul.openstack.org
|
||||
|
||||
- job:
|
||||
name: zuul-build-dashboard-software-factory
|
||||
parent: zuul-build-dashboard
|
||||
vars:
|
||||
zuul_api_url: https://softwarefactory-project.io/zuul
|
||||
node_version: 10
|
||||
|
||||
- job:
|
||||
name: zuul-build-dashboard-opendev
|
||||
parent: zuul-build-dashboard
|
||||
vars:
|
||||
zuul_api_url: https://zuul.opendev.org
|
||||
|
||||
# This job is run on changes to both Zuul and Nodepool; any changes to
|
||||
# the other project will be picked up via image builds which appear in
|
||||
@ -187,7 +197,6 @@
|
||||
parent: build-python-release
|
||||
pre-run: playbooks/release/pre.yaml
|
||||
vars: &zuul_build_vars
|
||||
node_version: 10
|
||||
release_python: python3
|
||||
|
||||
- job:
|
||||
@ -197,6 +206,8 @@
|
||||
vars: *zuul_build_vars
|
||||
|
||||
- project:
|
||||
vars:
|
||||
node_version: 14
|
||||
check:
|
||||
jobs:
|
||||
- zuul-build-image
|
||||
@ -226,15 +237,14 @@
|
||||
ZUUL_TEST_ROOT: /tmp/zuul-test
|
||||
tox_environment:
|
||||
ZUUL_TEST_ROOT: /tmp/zuul-test
|
||||
- zuul-build-dashboard
|
||||
- zuul-build-dashboard-multi-tenant
|
||||
- nodejs-npm-run-lint:
|
||||
- zuul-build-dashboard-openstack-whitelabel
|
||||
- zuul-build-dashboard-software-factory
|
||||
- zuul-build-dashboard-opendev
|
||||
- nodejs-run-lint:
|
||||
vars:
|
||||
node_version: 10
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
- nodejs-npm-run-test:
|
||||
- nodejs-run-test:
|
||||
vars:
|
||||
node_version: 10
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
success-url: 'npm/reports/bundle.html'
|
||||
files:
|
||||
@ -251,11 +261,6 @@
|
||||
- nodepool-zuul-functional:
|
||||
voting: false
|
||||
- zuul-build-python-release
|
||||
- build-javascript-content-tarball:
|
||||
vars:
|
||||
node_version: 10
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
create_tarball_directory: build
|
||||
gate:
|
||||
jobs:
|
||||
- zuul-upload-image
|
||||
@ -286,13 +291,11 @@
|
||||
tox_environment:
|
||||
ZUUL_TEST_ROOT: /tmp/zuul-test
|
||||
- zuul-build-dashboard
|
||||
- nodejs-npm-run-lint:
|
||||
- nodejs-run-lint:
|
||||
vars:
|
||||
node_version: 10
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
- nodejs-npm-run-test:
|
||||
- nodejs-run-test:
|
||||
vars:
|
||||
node_version: 10
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
success-url: 'npm/reports/bundle.html'
|
||||
files:
|
||||
@ -307,11 +310,6 @@
|
||||
requires: nodepool-container-image
|
||||
dependencies: zuul-upload-image
|
||||
- zuul-build-python-release
|
||||
- build-javascript-content-tarball:
|
||||
vars:
|
||||
node_version: 10
|
||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||
create_tarball_directory: build
|
||||
promote:
|
||||
jobs:
|
||||
- zuul-promote-image
|
||||
@ -319,7 +317,9 @@
|
||||
- opendev-promote-python:
|
||||
vars:
|
||||
download_artifact_job: zuul-build-python-release
|
||||
- opendev-promote-javascript-content
|
||||
- opendev-promote-javascript-deployment:
|
||||
vars:
|
||||
download_artifact_job: zuul-build-dashboard
|
||||
release:
|
||||
jobs:
|
||||
- zuul-release-python
|
||||
|
@ -2,10 +2,9 @@
|
||||
roles:
|
||||
- revoke-sudo
|
||||
- set-zuul-log-path-fact
|
||||
- role: npm
|
||||
npm_command: build
|
||||
- js-package-manager
|
||||
environment:
|
||||
REACT_APP_ZUUL_API: "{{ zuul_api_url }}/api/"
|
||||
REACT_APP_ZUUL_API: "{% if zuul_api_url is defined %}{{ zuul_api_url }}/api/{% endif %}"
|
||||
PUBLIC_URL: './'
|
||||
# NOTE: using "./" is not enough to support html5 links, even with
|
||||
# rewrite rules for unknown files, accessing 'job/devstack' will make
|
||||
|
@ -22,9 +22,8 @@ if [[ ! $(command -v yarn) ]]
|
||||
then
|
||||
pip install nodeenv
|
||||
# Initialize nodeenv and tell it to re-use the currently active virtualenv
|
||||
# TODO(jeblair): remove node version pin. upath 1.0.4 objects to node >9.
|
||||
attempts=0
|
||||
until nodeenv --python-virtualenv -n 10.16.0; do
|
||||
until nodeenv --python-virtualenv -n 14.3.0 ; do
|
||||
((attempts++))
|
||||
if [[ $attempts > 2 ]]
|
||||
then
|
||||
|
Loading…
x
Reference in New Issue
Block a user