From af7ba5759f799c0134fa1335d40e3c5c2afab59d Mon Sep 17 00:00:00 2001
From: Eduardo Olivares <eolivare@redhat.com>
Date: Thu, 24 Aug 2023 12:33:46 +0200
Subject: [PATCH] Jobs cleanup prior to drop of python3.6 support

Tobiko next release 0.7.0 will not support python3.6.
This patch removes some obsolete jobs from the
devstack-plugin-tobiko project.

Change-Id: I4a5ac77948ddb65944b0852b03122190a659269b
---
 .pre-commit-config.yaml            |  2 +-
 zuul.d/devstack-tobiko-fedora.yaml | 27 ---------------------------
 zuul.d/nodesets.yaml               | 22 +---------------------
 zuul.d/project.yaml                |  1 -
 4 files changed, 2 insertions(+), 50 deletions(-)
 delete mode 100644 zuul.d/devstack-tobiko-fedora.yaml

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1e6759d..29129bf 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.31.0
+    rev: v1.32.0
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
diff --git a/zuul.d/devstack-tobiko-fedora.yaml b/zuul.d/devstack-tobiko-fedora.yaml
deleted file mode 100644
index c97b13c..0000000
--- a/zuul.d/devstack-tobiko-fedora.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-
-- project-template:
-    name: devstack-tobiko-fedora
-    description: Fedora Devstack Tobiko Plugin jobs
-    periodic: &PERIODIC
-      jobs:
-        - devstack-tobiko-fedora
-
-
-# --- Minimal jobs -----------------------------------------------------------
-
-- job:
-    abstract: false
-    name: devstack-tobiko-fedora
-    parent: devstack-tobiko-minimal
-    nodeset: devstack-tobiko-fedora
-    voting: false
-    description: Fedora Devstack Tobiko Plugin job
-    vars:
-      devstack_local_conf:
-        post-config:
-          $NEUTRON_CONF:
-            ovn:
-              # NOTE(slaweq): In Fedora OVN already supports allow-stateless
-              # keyword as an ACL's action
-              allow_stateless_action_supported: True
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 62a8b4b..fc07d95 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -25,15 +25,7 @@
     name: devstack-tobiko-centos
     nodes:
       - name: controller
-        label: nested-virt-centos-8-stream
-    groups: *STANDALONE_GROUPS
-
-
-- nodeset:
-    name: devstack-tobiko-fedora
-    nodes:
-      - name: controller
-        label: fedora-34
+        label: nested-virt-centos-9-stream
     groups: *STANDALONE_GROUPS
 
 
@@ -72,15 +64,3 @@
         nodes:
           - compute1
           - compute2
-
-
-- nodeset:
-    name: devstack-tobiko-multinode-fedora
-    nodes:
-      - name: controller
-        label: fedora-34
-      - name: compute1
-        label: fedora-34
-      - name: compute2
-        label: fedora-34
-    groups: *MULTINODE_GROUPS
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 5f52530..0af8e3a 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,7 +6,6 @@
       - devstack-tobiko
       - devstack-tobiko-centos
       - devstack-tobiko-designate
-      - devstack-tobiko-fedora
       - devstack-tobiko-functional
       - devstack-tobiko-heat
       - devstack-tobiko-minimal