diff --git a/roles/nodejs-test-dependencies/tasks/Debian.yaml b/roles/nodejs-test-dependencies/tasks/Debian.yaml new file mode 100644 index 000000000..017b64747 --- /dev/null +++ b/roles/nodejs-test-dependencies/tasks/Debian.yaml @@ -0,0 +1,7 @@ +- name: Install browsers and xvfb + apt: + name: + - chromium + - firefox-esr + - xvfb + become: true diff --git a/roles/nodejs-test-dependencies/tasks/Ubuntu.yaml b/roles/nodejs-test-dependencies/tasks/Ubuntu.yaml new file mode 100644 index 000000000..a3fb4d4ad --- /dev/null +++ b/roles/nodejs-test-dependencies/tasks/Ubuntu.yaml @@ -0,0 +1,7 @@ +- name: Install browsers and xvfb + apt: + name: + - chromium-browser + - firefox + - xvfb + become: true diff --git a/roles/nodejs-test-dependencies/tasks/main.yaml b/roles/nodejs-test-dependencies/tasks/main.yaml index b837cd516..7d46096d6 100644 --- a/roles/nodejs-test-dependencies/tasks/main.yaml +++ b/roles/nodejs-test-dependencies/tasks/main.yaml @@ -1,17 +1,13 @@ -- name: Install chromium-brower - apt: - name: chromium-browser - become: true - -- name: Install firefox - apt: - name: firefox - become: true - -- name: Install xvfb - apt: - name: xvfb - become: true +- name: Install distro specific packages + include_tasks: "{{ zj_distro_pkgs }}" + vars: + params: + files: + - "{{ ansible_facts.distribution }}.yaml" + - "{{ ansible_facts.os_family }}.yaml" + loop: "{{ query('first_found', params, errors='ignore') }}" + loop_control: + loop_var: zj_distro_pkgs - name: Run Xvfb shell: "/usr/bin/Xvfb :99 -screen 0 '1280x1024x24' -ac +extension GLX +render -noreset 2>&1 > /dev/null &" diff --git a/zuul-tests.d/js-roles-jobs.yaml b/zuul-tests.d/js-roles-jobs.yaml index d7a0097a9..bca9eaa73 100644 --- a/zuul-tests.d/js-roles-jobs.yaml +++ b/zuul-tests.d/js-roles-jobs.yaml @@ -38,11 +38,71 @@ vars: zuul_use_fetch_output: false +- job: + name: zuul-jobs-test-nodejs-test-dependencies + description: Test the installation of nodejs test dependencies + tags: debuntu-platforms + files: + - roles/nodejs-test-dependencies/.* + run: test-playbooks/simple-role-test.yaml + vars: + role_name: nodejs-test-dependencies + # -* AUTOGENERATED *- # The following project section is autogenerated by # tox -e update-test-platforms # Please re-run to generate new job lists +- job: + name: zuul-jobs-test-nodejs-test-dependencies-debian-bullseye + description: Test the installation of nodejs test dependencies on debian-bullseye + parent: zuul-jobs-test-nodejs-test-dependencies + tags: auto-generated + nodeset: + nodes: + - name: debian-bullseye + label: debian-bullseye + +- job: + name: zuul-jobs-test-nodejs-test-dependencies-debian-buster + description: Test the installation of nodejs test dependencies on debian-buster + parent: zuul-jobs-test-nodejs-test-dependencies + tags: auto-generated + nodeset: + nodes: + - name: debian-buster + label: debian-buster + +- job: + name: zuul-jobs-test-nodejs-test-dependencies-ubuntu-bionic + description: Test the installation of nodejs test dependencies on ubuntu-bionic + parent: zuul-jobs-test-nodejs-test-dependencies + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-bionic + label: ubuntu-bionic + +- job: + name: zuul-jobs-test-nodejs-test-dependencies-ubuntu-focal + description: Test the installation of nodejs test dependencies on ubuntu-focal + parent: zuul-jobs-test-nodejs-test-dependencies + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-focal + label: ubuntu-focal + +- job: + name: zuul-jobs-test-nodejs-test-dependencies-ubuntu-jammy + description: Test the installation of nodejs test dependencies on ubuntu-jammy + parent: zuul-jobs-test-nodejs-test-dependencies + tags: auto-generated + nodeset: + nodes: + - name: ubuntu-jammy + label: ubuntu-jammy + - project: check: jobs: &id001 @@ -50,6 +110,11 @@ - zuul-jobs-test-ensure-yarn - zuul-jobs-test-fetch-javascript-tarball - zuul-jobs-test-fetch-javascript-tarball-synchronize + - zuul-jobs-test-nodejs-test-dependencies-debian-bullseye + - zuul-jobs-test-nodejs-test-dependencies-debian-buster + - zuul-jobs-test-nodejs-test-dependencies-ubuntu-bionic + - zuul-jobs-test-nodejs-test-dependencies-ubuntu-focal + - zuul-jobs-test-nodejs-test-dependencies-ubuntu-jammy gate: jobs: *id001 periodic-weekly: