From 74b064c7bd3522743b29f276b389461593492946 Mon Sep 17 00:00:00 2001
From: Wes Hayutin <weshayutin@gmail.com>
Date: Wed, 14 Apr 2021 10:23:01 -0600
Subject: [PATCH] Use a more targeted job for tripleo-validations

* using multinode jobs for validations is too heavy
and uses too much resources
* remove standalone004 - worthless sans rpm build
* add a validations job that targets validations

Change-Id: Ifef837dc884c7338f9396214e36a197cdbb060c6
(cherry picked from commit aa8d53b1d514bb6b90d67b288055d7df73a8d0a2)
(cherry picked from commit 5ab70c56ab0c3a669a244ad57166e7d5df45c180)
(cherry picked from commit aed39ea68dd3fe85a2bd9c4fd3dfee153314c686)
---
 zuul.d/base.yaml   |  9 ++++++++
 zuul.d/layout.yaml | 57 ++++++++++++++++++++++++----------------------
 2 files changed, 39 insertions(+), 27 deletions(-)

diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index a3c60ff05..011c039c2 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -13,3 +13,12 @@
     - zuul.d/playbooks/run.yml
     timeout: 1800
     voting: true
+
+- job:
+    name: tripleo-ci-centos-8-standalone-tv-validation
+    parent: tripleo-ci-centos-8-standalone
+    vars:
+      featureset: '052'
+      validate_services: true
+      enable_validation: true
+      component: validation
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 30c2d40ce..87f5770a9 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -1,36 +1,39 @@
 - project:
     templates:
-    - tripleo-multinode-container-minimal-pipeline
-    - openstack-python3-train-jobs
-    - tripleo-validations-molecule-jobs
-    - check-requirements
-    - release-notes-jobs-python3
+      - openstack-python3-train-jobs
+      - tripleo-validations-molecule-jobs
+      - release-notes-jobs-python3
     check:
       jobs:
-      - openstack-tox-linters
-      - tripleo-ci-centos-8-content-provider:
-          dependencies:
-            - openstack-tox-linters
-      - openstack-tox-docs: &tripleo-docs
-          files:
-          - ^doc/.*
-          - ^README.rst
-      - tripleo-ci-centos-8-scenario004-standalone: &scenario004
-          vars:
-            consumer_job: true
-            build_container_images: false
-            tags:
-              - standalone
-          dependencies:
-            - tripleo-ci-centos-8-content-provider
-          files:
-            - ^roles/ceph.*$
+        - openstack-tox-linters: &tripleo-linters
+            nodeset: centos-8
+        - openstack-tox-docs: &tripleo-docs
+            files:
+              - ^doc/.*
+              - ^molecule-requirements.txt
+              - ^requirements.txt
+              - ^README.rst
+        - tripleo-ci-centos-8-content-provider:
+            dependencies:
+              - openstack-tox-linters
+        - tripleo-ci-centos-8-standalone-tv-validation:
+            vars: &consumer_vars
+              consumer_job: true
+              build_container_images: false
+              remove_tags:
+                - build
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
     gate:
       jobs:
-      - openstack-tox-linters
-      - tripleo-ci-centos-8-content-provider
-      - openstack-tox-docs: *tripleo-docs
-      - tripleo-ci-centos-8-scenario004-standalone: *scenario004
+        - openstack-tox-linters
+        - openstack-tox-docs: *tripleo-docs
+        - tripleo-ci-centos-8-content-provider
+        - tripleo-ci-centos-8-standalone-tv-validation:
+            vars: *consumer_vars
+            dependencies:
+              - tripleo-ci-centos-8-content-provider
+
     promote:
       jobs:
       - promote-openstack-tox-docs: *tripleo-docs