diff options
| author | Zuul <zuul@review.opendev.org> | 2022-12-04 03:23:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-12-04 03:23:18 +0000 |
| commit | 217d94d3334ef7bcf6fb4896c57159c9463e5e66 (patch) | |
| tree | e93c3427ec1a83e20b47f7df517334961f4493e3 | |
| parent | 19a0132ab20b6accc95977162bf7dc7fae70c506 (diff) | |
| parent | 9a43c7964d0bb9a210c85cf803357ee3915fe2dc (diff) | |
| download | horizon-217d94d3334ef7bcf6fb4896c57159c9463e5e66.tar.gz | |
Merge "Set Nodeset to debian-bullseye for npm, integration and selenium job"
| -rw-r--r-- | .zuul.d/base.yaml | 2 | ||||
| -rw-r--r-- | .zuul.d/nodejs-jobs.yaml | 4 | ||||
| -rw-r--r-- | .zuul.d/tempest-and-integrated.yaml | 2 | ||||
| -rw-r--r-- | bindep.txt | 3 | ||||
| -rw-r--r-- | roles/setup-selenium-tests/defaults/main.yaml | 2 |
5 files changed, 7 insertions, 6 deletions
diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml index 06f8fd3a1..e63d10020 100644 --- a/.zuul.d/base.yaml +++ b/.zuul.d/base.yaml @@ -10,7 +10,7 @@ - job: name: horizon-selenium-headless parent: horizon-openstack-tox-base - nodeset: ubuntu-focal + nodeset: debian-bullseye pre-run: playbooks/horizon-selenium-headless/pre.yaml vars: tox_envlist: selenium-headless diff --git a/.zuul.d/nodejs-jobs.yaml b/.zuul.d/nodejs-jobs.yaml index a9d22f519..8346a1715 100644 --- a/.zuul.d/nodejs-jobs.yaml +++ b/.zuul.d/nodejs-jobs.yaml @@ -6,7 +6,7 @@ vars: node_version: 18 tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" - nodeset: ubuntu-focal + nodeset: debian-bullseye pre-run: playbooks/horizon-nodejs/pre.yaml required-projects: - openstack/horizon @@ -21,7 +21,7 @@ node_version: 18 tox_constraints_file: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/requirements'].src_dir }}/upper-constraints.txt" pre-run: playbooks/horizon-nodejs/pre.yaml - nodeset: ubuntu-focal + nodeset: debian-bullseye required-projects: - openstack/horizon - openstack/requirements diff --git a/.zuul.d/tempest-and-integrated.yaml b/.zuul.d/tempest-and-integrated.yaml index c33578af0..21ada7ccc 100644 --- a/.zuul.d/tempest-and-integrated.yaml +++ b/.zuul.d/tempest-and-integrated.yaml @@ -1,7 +1,7 @@ - job: name: horizon-integration-tests parent: devstack - nodeset: openstack-single-node-focal + nodeset: devstack-single-node-debian-bullseye pre-run: playbooks/horizon-devstack-integration/pre.yaml run: playbooks/horizon-devstack-integration/run.yaml post-run: playbooks/horizon-devstack-integration/post.yaml diff --git a/bindep.txt b/bindep.txt index 6de4ffdf9..0c3f3dba1 100644 --- a/bindep.txt +++ b/bindep.txt @@ -1,6 +1,7 @@ # selenium tests ffmpeg [selenium] -firefox [selenium] +firefox [selenium platform:ubuntu] +firefox-esr [selenium platform:debian] xvfb [selenium platform:dpkg] # already part of xorg-x11-server on openSUSE xorg-x11-server-Xvfb [selenium platform:redhat] diff --git a/roles/setup-selenium-tests/defaults/main.yaml b/roles/setup-selenium-tests/defaults/main.yaml index 97ee57cc6..fcbc59a25 100644 --- a/roles/setup-selenium-tests/defaults/main.yaml +++ b/roles/setup-selenium-tests/defaults/main.yaml @@ -1,2 +1,2 @@ --- -geckodriver_url: "https://github.com/mozilla/geckodriver/releases/download/v0.27.0/geckodriver-v0.27.0-linux64.tar.gz" +geckodriver_url: "https://github.com/mozilla/geckodriver/releases/download/v0.32.0/geckodriver-v0.32.0-linux64.tar.gz" |