From f1cc76e8a25a46cc3aa21dee96d0e4b4e3de81ef Mon Sep 17 00:00:00 2001
From: Nicolas Hicher <nhicher@redhat.com>
Date: Wed, 24 Nov 2021 14:19:43 -0500
Subject: [PATCH] add upload-pypi, set pod to zuul-worker-ubi7 for py36

- Add upload-pypi job in release pipeline
- use zuul-worker-ubi7 for py36 tests
- add pyyaml<6.0.0 in requirements.txt to fix
  https://github.com/yaml/pyyaml/issues/576#

Change-Id: I3c03b57a878102e6e5ff6076d1643123bdf374a3
---
 .zuul.yaml       | 23 +++++++++++++++++++----
 requirements.txt |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index edd1053..a0f7dbc 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,10 +6,16 @@
         - tox-py27:
             voting: false
         - tox-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
         - tox-pep8-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
     gate:
       jobs:
@@ -18,8 +24,17 @@
         - tox-py27:
             voting: false
         - tox-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
         - tox-pep8-py36:
-            nodeset: fedora-latest-pod
+            nodeset:
+              nodes:
+                - name: testrunner
+                  label: zuul-worker-ubi7
             voting: true
+    release:
+      jobs:
+        - upload-pypi
diff --git a/requirements.txt b/requirements.txt
index 374b584..c254747 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,5 +2,5 @@ requests
 pycrypto
 urllib3
 PrettyTable
-pyyaml
+pyyaml<6.0.0
 GitPython