Rename install-javascript-packages to ensure-javascript-packages for consistency

The old role will be kept and include ensure-javascript-packages for backwards-compatability.

Change-Id: Ibb896edf0652a19be13018b4abddb4a81c51f07b
This commit is contained in:
vass 2020-04-01 19:43:39 +02:00 committed by Mohammed Naser
parent 84c06a37c4
commit ff44b6cd4e
6 changed files with 66 additions and 45 deletions

View File

@ -1,6 +1,7 @@
Javascript Roles
================
.. zuul:autorole:: ensure-javascript-packages
.. zuul:autorole:: fetch-javascript-content-tarball
.. zuul:autorole:: fetch-javascript-output
.. zuul:autorole:: fetch-javascript-tarball

View File

@ -2,4 +2,4 @@
roles:
- install-nodejs
- install-yarn
- install-javascript-packages
- ensure-javascript-packages

View File

@ -0,0 +1,14 @@
Install javascript dependencies needed for a project
**Role Variables**
.. zuul:rolevar:: zuul_work_dir
:default: {{ zuul.project.src_dir }}
The directory to work in.
.. zuul:rolevar:: tox_constraints_file
Path to a pip constraints file. Will set the
``UPPER_CONSTRAINTS_FILE`` environment variable. Useful if npm
``postinstall`` runs tox.

View File

@ -0,0 +1,3 @@
npm_environment:
DISPLAY: ':99'
zuul_work_dir: "{{ zuul.project.src_dir }}"

View File

@ -0,0 +1,44 @@
- name: Check to see if the constraints file exists
stat:
path: "{{ tox_constraints_file }}"
get_checksum: false
get_mime: false
get_md5: false
register: stat_results
when: tox_constraints_file is defined
- name: Fail if constraints file is missing
when: tox_constraints_file is defined and not stat_results.stat.exists
fail:
msg: tox_constraints_file is defined but was not found
- name: Record file location
set_fact:
tox_constraints_env:
TOX_CONSTRAINTS_FILE: "{{ tox_constraints_file }}"
# Backward compatibility, to be removed
UPPER_CONSTRAINTS_FILE: "{{ tox_constraints_file }}"
when: tox_constraints_file is defined
- name: Check for yarn.lock file
stat:
path: "{{ zuul_work_dir }}/yarn.lock"
get_checksum: false
get_mime: false
get_md5: false
register: yarn_lock
- name: Install yarn dependencies
command: yarn install
environment:
DISPLAY: ':99'
args:
chdir: "{{ zuul_work_dir }}"
when: yarn_lock.stat.exists
- name: Install npm dependencies
command: npm install --verbose
environment: "{{ npm_environment|combine(tox_constraints_env|default({})) }}"
args:
chdir: "{{ zuul_work_dir }}"
when: not yarn_lock.stat.exists

View File

@ -1,44 +1,3 @@
- name: Check to see if the constraints file exists
stat:
path: "{{ tox_constraints_file }}"
get_checksum: false
get_mime: false
get_md5: false
register: stat_results
when: tox_constraints_file is defined
- name: Fail if constraints file is missing
when: tox_constraints_file is defined and not stat_results.stat.exists
fail:
msg: tox_constraints_file is defined but was not found
- name: Record file location
set_fact:
tox_constraints_env:
TOX_CONSTRAINTS_FILE: "{{ tox_constraints_file }}"
# Backward compatibility, to be removed
UPPER_CONSTRAINTS_FILE: "{{ tox_constraints_file }}"
when: tox_constraints_file is defined
- name: Check for yarn.lock file
stat:
path: "{{ zuul_work_dir }}/yarn.lock"
get_checksum: false
get_mime: false
get_md5: false
register: yarn_lock
- name: Install yarn dependencies
command: yarn install
environment:
DISPLAY: ':99'
args:
chdir: "{{ zuul_work_dir }}"
when: yarn_lock.stat.exists
- name: Install npm dependencies
command: npm install --verbose
environment: "{{ npm_environment|combine(tox_constraints_env|default({})) }}"
args:
chdir: "{{ zuul_work_dir }}"
when: not yarn_lock.stat.exists
- name: Include ensure-javascript-packages
include_role:
name: ensure-javascript-packages