Merge "Zuul CI: remove manual workaround for Python3 and TOX" into develop

2025-10-30 01:32:21 +00:00 · 2020-03-30 13:19:01 +00:00
parent 4582aed895 734b6dfef4
commit 856f07e707
1 changed files with 4 additions and 16 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,22 +1,10 @@
 ---
-# TODO: remove once https://review.opendev.org/c/712804/ gets merged upstream
- job:
-    name: tox-py37-oopt-gnpy
-    parent: tox-py37
-    vars:
-      tox_prefer_python2: false
- job:
-    name: tox-docs-oopt-gnpy
-    parent: tox-docs
-    vars:
-      tox_prefer_python2: false
-
 - project:
    check:
      jobs:
-      - tox-py37-oopt-gnpy
-      - tox-docs-oopt-gnpy
+      - tox-py37
+      - tox-docs
    gate:
      jobs:
-      - tox-py37-oopt-gnpy
-      - tox-docs-oopt-gnpy
+      - tox-py37
+      - tox-docs