From d0d3da82f53efd46b2b1ed12d5a4e02d1bf76470 Mon Sep 17 00:00:00 2001
From: Jens Harbott <j.harbott@x-ion.de>
Date: Thu, 17 Jun 2021 07:27:24 +0200
Subject: [PATCH] Fix nodeset selections for zuul jobs

We now are using focal nodes by default, so we no longer need to
explicitly select those, instead we need bionic for py36+py37.

Change-Id: I0f0f44e57a100420d8e6d2eaec7dbb5d77b654af
---
 .zuul.yaml | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 14faf50c..e9d54721 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -5,16 +5,16 @@
       - publish-opendev-tox-docs
     check:
       jobs: &jobs
-        - build-python-release:
-            nodeset: ubuntu-focal
+        - build-python-release
         - tox-linters
         - tox-py35:
             nodeset: ubuntu-xenial
-        - tox-py36
-        - tox-py37
+        - tox-py36:
+            nodeset: ubuntu-bionic
+        - tox-py37:
+            nodeset: ubuntu-bionic
         - tox-py38
-        - tox-py39:
-            nodeset: ubuntu-focal
+        - tox-py39
     gate:
       jobs: *jobs
     promote:
@@ -22,5 +22,4 @@
         - opendev-promote-python
     release:
       jobs:
-        - opendev-release-python:
-            nodeset: ubuntu-focal
+        - opendev-release-python