Merge "Update node to v14 and update to new jobs"
This commit is contained in:
commit
dff2ec282c
54
.zuul.yaml
54
.zuul.yaml
|
@ -65,7 +65,7 @@
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: zuul-build-dashboard
|
name: zuul-build-dashboard
|
||||||
parent: build-javascript-content
|
parent: build-javascript-deployment
|
||||||
success-url: 'npm/html/'
|
success-url: 'npm/html/'
|
||||||
files:
|
files:
|
||||||
- web/.*
|
- web/.*
|
||||||
|
@ -73,16 +73,26 @@
|
||||||
vars:
|
vars:
|
||||||
javascript_content_dir: "../zuul/web/static"
|
javascript_content_dir: "../zuul/web/static"
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
zuul_api_url: https://zuul.openstack.org
|
create_tarball_directory: build
|
||||||
node_version: 10
|
|
||||||
run: playbooks/dashboard/run.yaml
|
run: playbooks/dashboard/run.yaml
|
||||||
|
|
||||||
- job:
|
- 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
|
parent: zuul-build-dashboard
|
||||||
vars:
|
vars:
|
||||||
zuul_api_url: https://softwarefactory-project.io/zuul
|
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
|
# 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
|
# the other project will be picked up via image builds which appear in
|
||||||
|
@ -178,7 +188,6 @@
|
||||||
parent: build-python-release
|
parent: build-python-release
|
||||||
pre-run: playbooks/release/pre.yaml
|
pre-run: playbooks/release/pre.yaml
|
||||||
vars: &zuul_build_vars
|
vars: &zuul_build_vars
|
||||||
node_version: 10
|
|
||||||
release_python: python3
|
release_python: python3
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
|
@ -188,6 +197,8 @@
|
||||||
vars: *zuul_build_vars
|
vars: *zuul_build_vars
|
||||||
|
|
||||||
- project:
|
- project:
|
||||||
|
vars:
|
||||||
|
node_version: 14
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
- zuul-build-image
|
- zuul-build-image
|
||||||
|
@ -217,15 +228,14 @@
|
||||||
ZUUL_TEST_ROOT: /tmp/zuul-test
|
ZUUL_TEST_ROOT: /tmp/zuul-test
|
||||||
tox_environment:
|
tox_environment:
|
||||||
ZUUL_TEST_ROOT: /tmp/zuul-test
|
ZUUL_TEST_ROOT: /tmp/zuul-test
|
||||||
- zuul-build-dashboard
|
- zuul-build-dashboard-openstack-whitelabel
|
||||||
- zuul-build-dashboard-multi-tenant
|
- zuul-build-dashboard-software-factory
|
||||||
- nodejs-npm-run-lint:
|
- zuul-build-dashboard-opendev
|
||||||
|
- nodejs-run-lint:
|
||||||
vars:
|
vars:
|
||||||
node_version: 10
|
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
- nodejs-npm-run-test:
|
- nodejs-run-test:
|
||||||
vars:
|
vars:
|
||||||
node_version: 10
|
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
success-url: 'npm/reports/bundle.html'
|
success-url: 'npm/reports/bundle.html'
|
||||||
files:
|
files:
|
||||||
|
@ -241,11 +251,6 @@
|
||||||
- nodepool-zuul-functional:
|
- nodepool-zuul-functional:
|
||||||
voting: false
|
voting: false
|
||||||
- zuul-build-python-release
|
- 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:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
- zuul-upload-image
|
- zuul-upload-image
|
||||||
|
@ -276,13 +281,11 @@
|
||||||
tox_environment:
|
tox_environment:
|
||||||
ZUUL_TEST_ROOT: /tmp/zuul-test
|
ZUUL_TEST_ROOT: /tmp/zuul-test
|
||||||
- zuul-build-dashboard
|
- zuul-build-dashboard
|
||||||
- nodejs-npm-run-lint:
|
- nodejs-run-lint:
|
||||||
vars:
|
vars:
|
||||||
node_version: 10
|
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
- nodejs-npm-run-test:
|
- nodejs-run-test:
|
||||||
vars:
|
vars:
|
||||||
node_version: 10
|
|
||||||
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
zuul_work_dir: "{{ zuul.project.src_dir }}/web"
|
||||||
success-url: 'npm/reports/bundle.html'
|
success-url: 'npm/reports/bundle.html'
|
||||||
files:
|
files:
|
||||||
|
@ -296,11 +299,6 @@
|
||||||
requires: nodepool-container-image
|
requires: nodepool-container-image
|
||||||
dependencies: zuul-upload-image
|
dependencies: zuul-upload-image
|
||||||
- zuul-build-python-release
|
- 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:
|
promote:
|
||||||
jobs:
|
jobs:
|
||||||
- zuul-promote-image
|
- zuul-promote-image
|
||||||
|
@ -308,7 +306,9 @@
|
||||||
- opendev-promote-python:
|
- opendev-promote-python:
|
||||||
vars:
|
vars:
|
||||||
download_artifact_job: zuul-build-python-release
|
download_artifact_job: zuul-build-python-release
|
||||||
- opendev-promote-javascript-content
|
- opendev-promote-javascript-deployment:
|
||||||
|
vars:
|
||||||
|
download_artifact_job: zuul-build-dashboard
|
||||||
release:
|
release:
|
||||||
jobs:
|
jobs:
|
||||||
- zuul-release-python
|
- zuul-release-python
|
||||||
|
|
|
@ -2,10 +2,9 @@
|
||||||
roles:
|
roles:
|
||||||
- revoke-sudo
|
- revoke-sudo
|
||||||
- set-zuul-log-path-fact
|
- set-zuul-log-path-fact
|
||||||
- role: npm
|
- js-package-manager
|
||||||
npm_command: build
|
|
||||||
environment:
|
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: './'
|
PUBLIC_URL: './'
|
||||||
# NOTE: using "./" is not enough to support html5 links, even with
|
# NOTE: using "./" is not enough to support html5 links, even with
|
||||||
# rewrite rules for unknown files, accessing 'job/devstack' will make
|
# rewrite rules for unknown files, accessing 'job/devstack' will make
|
||||||
|
|
|
@ -22,9 +22,8 @@ if [[ ! $(command -v yarn) ]]
|
||||||
then
|
then
|
||||||
pip install nodeenv
|
pip install nodeenv
|
||||||
# Initialize nodeenv and tell it to re-use the currently active virtualenv
|
# 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
|
attempts=0
|
||||||
until nodeenv --python-virtualenv -n 10.16.0; do
|
until nodeenv --python-virtualenv -n 14.3.0 ; do
|
||||||
((attempts++))
|
((attempts++))
|
||||||
if [[ $attempts > 2 ]]
|
if [[ $attempts > 2 ]]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in New Issue