From d179768fa6ab49e3f9f3463dd46412bf0984de03 Mon Sep 17 00:00:00 2001
From: "Gael Chamoulaud (Strider)" <gchamoul@redhat.com>
Date: Wed, 29 Apr 2020 15:48:04 +0200
Subject: [PATCH] Fix CentOS8 Migration leftover

This patch also removes duplicates nova_status line in jobs queue.

Change-Id: Ifa4287f5dabb340065059aec93b1d0a0722f2abb
Signed-off-by: Gael Chamoulaud (Strider) <gchamoul@redhat.com>
---
 role-addition.yml    | 4 ++--
 zuul.d/molecule.yaml | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/role-addition.yml b/role-addition.yml
index 96c06e425..3c06f4da6 100644
--- a/role-addition.yml
+++ b/role-addition.yml
@@ -50,7 +50,7 @@
           ---
           {% set items = molecule_yaml['content'] | b64decode | from_yaml %}
           {% set job_index = [] %}
-          {% set new_job_name = "tripleo-validations-centos-7-molecule-" ~ _role_name %}
+          {% set new_job_name = "tripleo-validations-centos-8-molecule-" ~ _role_name %}
           {% for item in items %}
           {%   if 'project-template' in item %}
           {%     if item['project-template']['name'] == "tripleo-validations-molecule-jobs" %}
@@ -74,7 +74,7 @@
           {% if (job_index | length) < 1 %}
           {%   set new_job = {
                   "name": new_job_name,
-                  "parent": "tripleo-validations-centos-7-base",
+                  "parent": "tripleo-validations-centos-8-base",
                   "files": [
                     "^roles/" ~ _role_name ~ "/.*"
                   ],
diff --git a/zuul.d/molecule.yaml b/zuul.d/molecule.yaml
index 10d8491a6..ad6ffafd9 100644
--- a/zuul.d/molecule.yaml
+++ b/zuul.d/molecule.yaml
@@ -26,6 +26,7 @@
       jobs:
       - tripleo-validations-centos-8-molecule-ceph
       - tripleo-validations-centos-8-molecule-check_latest_packages_version
+      - tripleo-validations-centos-8-molecule-check_network_gateway
       - tripleo-validations-centos-8-molecule-controller_token
       - tripleo-validations-centos-8-molecule-controller_ulimits
       - tripleo-validations-centos-8-molecule-ctlplane_ip_range
@@ -39,14 +40,10 @@
       - tripleo-validations-centos-8-molecule-undercloud_cpu
       - tripleo-validations-centos-8-molecule-undercloud_debug
       - tripleo-validations-centos-8-molecule-undercloud_disk_space
-      - tripleo-validations-centos-8-molecule-nova_status
-      - tripleo-validations-centos-8-molecule-image_serve
-      - tripleo-validations-centos-8-molecule-check_network_gateway
       - tripleo-validations-centos-8-molecule-undercloud_heat_purge_deleted
       - tripleo-validations-centos-8-molecule-undercloud_ram
       - tripleo-validations-centos-8-molecule-undercloud_tokenflush
       - tripleo-validations-centos-8-molecule-validate_selinux
-      # - tripleo-validations-centos-8-molecule-check_network_gateway
     name: tripleo-validations-molecule-jobs
 - job:
     files: