From a6da91f7530ee5f601528752a4db8e3e0837a183 Mon Sep 17 00:00:00 2001
From: Ian Wienand <iwienand@redhat.com>
Date: Fri, 15 Oct 2021 10:21:10 +1100
Subject: [PATCH] functests: drop minimal tests in the gate

We test the minimal builds in the devstack based end-to-end tests.
There is no need to also run these functional tests; they test *less*
than the full build/upload/boot testing done in the devstack test.

We consolidate the separate "image" based job

Change-Id: I73ca83bedb4b0c40af5209f9c93a0e657c152591
---
 .zuul.d/jobs.yaml    | 31 +------------------------------
 .zuul.d/project.yaml |  1 -
 2 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/.zuul.d/jobs.yaml b/.zuul.d/jobs.yaml
index fc2100425..4b6199270 100644
--- a/.zuul.d/jobs.yaml
+++ b/.zuul.d/jobs.yaml
@@ -20,29 +20,9 @@
     parent: dib-functests-base
     vars:
       dib_functests:
-        - centos-minimal/7-build-succeeds
-        - centos-minimal/8-build-succeeds
-        # TODO: enable when CentOS 8 Stream repos mirrored.
-        # - centos-minimal/8-stream-build-succeeds
-        - fedora/build-succeeds
-        - ubuntu-minimal/xenial-build-succeeds
-        - ubuntu-minimal/bionic-build-succeeds
-        - ubuntu-minimal/focal-build-succeeds
         - containerfile/focal-build-succeeds
-        - fedora-container/build-succeeds
         - openeuler-minimal/20.03-LTS-SP2-build-succeeds
-
-- job:
-    name: dib-functests-image
-    description: |
-      This is tests that rely on downloading an upstream
-      image.  We generally do not have mirrors for these images
-      so they can be slighlty unreliable.
-    abstract: true
-    voting: false
-    parent: dib-functests-base
-    vars:
-      dib_functests:
+        # Image based tests
         - centos/8-build-succeeds
         - centos/8-stream-build-succeeds
         - fedora/build-succeeds
@@ -62,7 +42,6 @@
     vars:
       dib_functests:
         - gentoo/build-succeeds
-        - debian-minimal/stable-vm
 
 - job:
     name: dib-functests-arm64
@@ -85,14 +64,6 @@
     parent: dib-functests-default
     nodeset: ubuntu-bionic
 
-- job:
-    name: dib-functests-bionic-python3-image
-    description: |
-      The image tests on a Bionic build host with Python 3
-    parent: dib-functests-image
-    nodeset: ubuntu-bionic
-    voting: false
-
 - job:
     name: dib-functests-bionic-python3-extras
     description: |
diff --git a/.zuul.d/project.yaml b/.zuul.d/project.yaml
index cc648250f..512f93020 100644
--- a/.zuul.d/project.yaml
+++ b/.zuul.d/project.yaml
@@ -27,7 +27,6 @@
         - dib-nodepool-functional-openstack-opensuse-tumbleweed-src:
             voting: false
         - dib-functests-bionic-python3
-        - dib-functests-bionic-python3-image
         - dib-functests-bionic-python3-extras
         - ironic-python-agent-check-image-dib-centos8
         - dib-nodepool-functional-openstack-debian-bullseye-src: