opendev/system-config
Code Issues Proposed changes

Run jobs with a jammy bridge.openstack.org

Browse Source 
In prepartion for upgrading this host, run jobs with a Jammy based
bridge.openstack.org.

Since this has a much later Python, it brings in a later version of
selenium when testing (used for screenshots) which has dropped some of
the APIs we use.  Pin it to the old version; we will fix this in a
follow-on just to address one thing at a time
(I6a9d02bfc79b90417b1f5b3d9431f4305864869c).

Change-Id: If53286c284f8d25248abf4a1b2edd6951437dec2
This commit is contained in:
Ian Wienand 2022-09-15 12:17:22 +10:00
parent e65928128b
commit 34dc0f2679
No known key found for this signature in database
2 changed files with 30 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tox.ini
View File

@ -39,7 +39,7 @@ commands = sphinx-build -W -E -b html doc/source doc/build/html
deps = deps =
pytest-html # MPL-2.0 pytest-html # MPL-2.0
pytest-testinfra[ansible]>=6.0.0 pytest-testinfra[ansible]>=6.0.0
selenium selenium==3.141.0
requests requests
# This environment assumes a gate-hosts.yaml file has been written. # This environment assumes a gate-hosts.yaml file has been written.

86
zuul.d/system-config-run.yaml
View File

@ -59,8 +59,7 @@
currently in use. currently in use.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - &bridge_node_x86 { name: bridge.openstack.org, label: ubuntu-jammy }
label: ubuntu-bionic
- name: xenial - name: xenial
label: ubuntu-xenial label: ubuntu-xenial
- name: bionic - name: bionic
@ -82,8 +81,7 @@
Run the base playbook with the latest ansible. Run the base playbook with the latest ansible.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-focal
- name: xenial - name: xenial
label: ubuntu-xenial label: ubuntu-xenial
- name: bionic - name: bionic
@ -124,8 +122,7 @@
Run the "base" playbook on ARM64. Run the "base" playbook on ARM64.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - &bridge_node_arm64 { name: bridge.openstack.org, label: ubuntu-jammy-arm64 }
label: ubuntu-bionic-arm64
- name: bionic - name: bionic
label: ubuntu-bionic-arm64 label: ubuntu-bionic-arm64
- name: focal - name: focal
@ -154,8 +151,7 @@
- ptgbot-container-image - ptgbot-container-image
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: eavesdrop01.opendev.org - name: eavesdrop01.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -196,8 +192,7 @@
Run the playbook for letsencrypt key acquisition Run the playbook for letsencrypt key acquisition
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: adns-letsencrypt.opendev.org - name: adns-letsencrypt.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: letsencrypt01.opendev.org - name: letsencrypt01.opendev.org
@ -244,8 +239,7 @@
post-run: playbooks/zuul/run-lists-post.yaml post-run: playbooks/zuul/run-lists-post.yaml
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: lists.openstack.org - name: lists.openstack.org
label: ubuntu-focal label: ubuntu-focal
- name: lists.katacontainers.io - name: lists.katacontainers.io
@ -293,8 +287,7 @@
Run the playbook for nodepool. Run the playbook for nodepool.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: zk04.opendev.org - name: zk04.opendev.org
label: ubuntu-focal label: ubuntu-focal
- name: nl01.opendev.org - name: nl01.opendev.org
@ -341,8 +334,7 @@
- opendev/zone-zuul-ci.org - opendev/zone-zuul-ci.org
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: adns1.opendev.org - name: adns1.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: ns1.opendev.org - name: ns1.opendev.org
@ -374,8 +366,7 @@
Run the playbook for borg backup configuration Run the playbook for borg backup configuration
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: borg-backup01.region.provider.opendev.org - name: borg-backup01.region.provider.opendev.org
label: ubuntu-focal label: ubuntu-focal
- name: borg-backup-focal.opendev.org - name: borg-backup-focal.opendev.org
@ -450,8 +441,7 @@
parent: system-config-run-mirror-base parent: system-config-run-mirror-base
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: mirror01.openafs.provider.opendev.org - name: mirror01.openafs.provider.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: mirror02.openafs.provider.opendev.org - name: mirror02.openafs.provider.opendev.org
@ -462,8 +452,7 @@
parent: system-config-run-mirror-base parent: system-config-run-mirror-base
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_arm64
label: ubuntu-bionic-arm64
- name: mirror01.openafs.provider.opendev.org - name: mirror01.openafs.provider.opendev.org
label: ubuntu-focal-arm64 label: ubuntu-focal-arm64
@ -474,8 +463,7 @@
Run the playbook for a mirror update node Run the playbook for a mirror update node
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: mirror-update99.opendev.org - name: mirror-update99.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -498,8 +486,7 @@
Run the playbook for the docker registry. Run the playbook for the docker registry.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: insecure-ci-registry01.opendev.org - name: insecure-ci-registry01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
vars: vars:
@ -532,8 +519,7 @@
- opendev/system-config - opendev/system-config
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: codesearch01.opendev.org - name: codesearch01.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -560,8 +546,7 @@
requires: etherpad-container-image requires: etherpad-container-image
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: etherpad01.opendev.org - name: etherpad01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
vars: vars:
@ -586,7 +571,7 @@
timeout: 4800 timeout: 4800
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic label: ubuntu-bionic
- name: gitea-lb02.opendev.org - name: gitea-lb02.opendev.org
label: ubuntu-jammy label: ubuntu-jammy
@ -664,8 +649,7 @@
- openstack/project-config - openstack/project-config
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: grafana01.opendev.org - name: grafana01.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -692,8 +676,7 @@
- opendev/system-config - opendev/system-config
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: graphite02.opendev.org - name: graphite02.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -721,8 +704,7 @@
Run the playbook for the keycloak servers. Run the playbook for the keycloak servers.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: keycloak01.opendev.org - name: keycloak01.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -747,8 +729,7 @@
Run the playbook for jitsi-meet. Run the playbook for jitsi-meet.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: meetpad01.opendev.org - name: meetpad01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
- name: jvb01.opendev.org - name: jvb01.opendev.org
@ -786,8 +767,7 @@
- lodgeit-container-image - lodgeit-container-image
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: paste99.opendev.org - name: paste99.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -813,8 +793,7 @@
Run the playbook for the jaeger servers. Run the playbook for the jaeger servers.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: tracing99.opendev.org - name: tracing99.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -838,8 +817,7 @@
Run the playbook for the zookeeper cluster. Run the playbook for the zookeeper cluster.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: zk04.opendev.org - name: zk04.opendev.org
label: ubuntu-focal label: ubuntu-focal
vars: vars:
@ -864,8 +842,7 @@
Run the playbook for the zuul-preview service. Run the playbook for the zuul-preview service.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: zp01.opendev.org - name: zp01.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
vars: vars:
@ -885,8 +862,7 @@
Run the playbook for the main Zuul cluster. Run the playbook for the main Zuul cluster.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: zk04.opendev.org - name: zk04.opendev.org
label: ubuntu-focal label: ubuntu-focal
- name: zm01.opendev.org - name: zm01.opendev.org
@ -962,8 +938,7 @@
Base job for testing gerrit Base job for testing gerrit
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: review99.opendev.org - name: review99.opendev.org
label: ubuntu-focal label: ubuntu-focal
required-projects: required-projects:
@ -1042,8 +1017,7 @@
Run the playbook for a static node. Run the playbook for a static node.
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: static99.opendev.org - name: static99.opendev.org
label: ubuntu-bionic label: ubuntu-bionic
vars: vars:
@ -1073,8 +1047,7 @@
- refstack-container-image - refstack-container-image
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: refstack01.openstack.org - name: refstack01.openstack.org
label: ubuntu-focal label: ubuntu-focal
host-vars: host-vars:
@ -1105,8 +1078,7 @@
Run the playbook for kerberos servers Run the playbook for kerberos servers
nodeset: nodeset:
nodes: nodes:
- name: bridge.openstack.org - <<: *bridge_node_x86
label: ubuntu-bionic
- name: kdc-primary.opendev.org - name: kdc-primary.opendev.org
label: ubuntu-focal label: ubuntu-focal
- name: kdc-replica.opendev.org - name: kdc-replica.opendev.org