From 9887876bd6f71e0b41e8f7c95a2f8191dd4482a5 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Fri, 20 Mar 2020 11:56:32 +0100
Subject: [PATCH] Rebase tobiko-tox-py* jobs on top of openstack-tox-py* ones

Change-Id: I7b9171c60e29d8248b0f0a814b59de9396a0ae91
---
 zuul.d/unit.yaml | 31 ++++++-------------------------
 1 file changed, 6 insertions(+), 25 deletions(-)

diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 63e9a93c7..55968e80b 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -1,58 +1,39 @@
 ---
 
-- job:
-    name: tobiko-tox-py36-base
-    parent: openstack-tox
-    abstract: true
-    timeout: 2400
-    description: |
-      Run unit tests for an OpenStack Python project under cPython version 3.6.
-      Uses tox with the ``py36`` environment.
-    vars:
-      tox_envlist: py36
-      bindep_profile: test py36
-      python_version: 3.6
-
-
 - job:
     name: tobiko-tox-py36-centos-7
-    parent: tobiko-tox-py36-base
+    parent: openstack-tox-py36
     nodeset: centos-7
     voting: false
 
 
 - job:
     name: tobiko-tox-py36-centos-8
-    parent: tobiko-tox-py36-base
+    parent: openstack-tox-py36
     nodeset: centos-8
     voting: false
 
 
 - job:
-    name: tobiko-tox-py38-base
-    parent: openstack-tox
-    abstract: true
+    name: tobiko-tox-py38
+    parent: openstack-tox-py38
     timeout: 2400
     description: |
       Run unit tests for an OpenStack Python project under cPython version 3.8.
       Uses tox with the ``py38`` environment.
-    vars:
-      tox_envlist: py38
-      bindep_profile: test py38
-      python_version: 3.8
     # compile and install python3.8 from source code
     pre-run: playbooks/tox-py38/pre.yaml
 
 
 - job:
     name: tobiko-tox-py38-centos-7
-    parent: tobiko-tox-py38-base
+    parent: tobiko-tox-py38
     nodeset: centos-7
     voting: false
 
 
 - job:
     name: tobiko-tox-py38-centos-8
-    parent: tobiko-tox-py38-base
+    parent: tobiko-tox-py38
     nodeset: centos-8
     voting: false