summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormanchandavishal <manchandavishal143@gmail.com>2022-11-23 23:01:57 +0530
committerVishal Manchanda <manchandavishal143@gmail.com>2022-11-29 17:00:31 +0000
commit9a43c7964d0bb9a210c85cf803357ee3915fe2dc (patch)
treefc6863a8753fd2dc69221b4cb45df02c8b41c41c
parentbebc8dad2fdcd8d766ca7a1f529c5afab9b9e203 (diff)
downloadhorizon-9a43c7964d0bb9a210c85cf803357ee3915fe2dc.tar.gz
Set Nodeset to debian-bullseye for npm, integration and selenium job
This patch changes nodeset to "debian-bullseye" from "ubuntu-focal" for horizon-selenium-headless, horizon-nodejs, and horizon-integration-tests jobs. Debian bullseye is also a runtime for the 2023.1 cycle as mentioned here [1]. Right now if we change nodeset to "ubuntu-jammy" all of the above jobs start failing. One possible solution to run these jobs on "ubuntu-jammy" nodeset is to install firefox as a deb. package instead of using snap as discussed here [2]. We can switch nodeset to "ubuntu-jammy" in the future once the firefox issue with snap is fixed [3]. Also geckodriver version is upadted to latest(i.e. v0.32.0) to include latest bug fix. [1] https://governance.openstack.org/tc/reference/runtimes/2023.1.html [2] https://meetings.opendev.org/irclogs/%23openstack-infra/%23openstack-infra.2022-11-23.log.html#t2022-11-23T14:15:08 [3] https://bugs.launchpad.net/ubuntu/+source/snapd/+bug/1951491 Depends-On: https://review.opendev.org/c/zuul/zuul-jobs/+/865459 Related-Bug: #1996638 Change-Id: Ic50fbb8b29fc5dec42d1a5e94095c9777c7d5fb6
-rw-r--r--.zuul.d/base.yaml2
-rw-r--r--.zuul.d/nodejs-jobs.yaml4
-rw-r--r--.zuul.d/tempest-and-integrated.yaml2
-rw-r--r--bindep.txt3
-rw-r--r--roles/setup-selenium-tests/defaults/main.yaml2
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 25e7a3f2a..59786bc1b 100644
--- a/.zuul.d/nodejs-jobs.yaml
+++ b/.zuul.d/nodejs-jobs.yaml
@@ -6,7 +6,7 @@
vars:
node_version: 16
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: 16
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"