From 531b129ba205dd382a6b0aa65c1097dc1c888b3f Mon Sep 17 00:00:00 2001
From: Carlos Goncalves <cgoncalves@redhat.com>
Date: Thu, 20 Jun 2019 16:53:23 +0200
Subject: [PATCH] Rename iptables-based active-standby jobs

Rename jobs so that it does not conflict with amphora stats-based
active-standby jobs being added in
Ibcd5552a67cea650edc72bfaa986357267ca2407 and will become default
active-standby jobs from Rocky.

Change-Id: Ie61f42f0d5565455a766b321055f0b854820a865
---
 zuul.d/jobs.yaml     | 22 +++++++++++-----------
 zuul.d/projects.yaml | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 4692d826..1f23f698 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -444,7 +444,7 @@
     parent: octavia-v2-dsvm-py2-scenario-centos-7
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-scenario
+    name: octavia-v2-act-stdby-iptables-dsvm-scenario
     parent: octavia-dsvm-live-base
     pre-run: playbooks/act_stby_iptables/pre.yaml
     vars:
@@ -469,15 +469,15 @@
       tox_envlist: all
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-py2-scenario
-    parent: octavia-v2-act-stdby-dsvm-scenario
+    name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
+    parent: octavia-v2-act-stdby-iptables-dsvm-scenario
     vars:
       devstack_localrc:
         USE_PYTHON3: False
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-py2-scenario-centos-7
-    parent: octavia-v2-act-stdby-dsvm-py2-scenario
+    name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7
+    parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
     nodeset: devstack-single-node-centos-7
     vars:
       devstack_localrc:
@@ -492,16 +492,16 @@
               amphora_ssh_user: centos
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-scenario-stable-stein
-    parent: octavia-v2-act-stdby-dsvm-scenario
+    name: octavia-v2-act-stdby-iptables-dsvm-scenario-stable-stein
+    parent: octavia-v2-act-stdby-iptables-dsvm-scenario
     override-checkout: stable/stein
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-py2-scenario-stable-rocky
-    parent: octavia-v2-act-stdby-dsvm-py2-scenario
+    name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky
+    parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
     override-checkout: stable/rocky
 
 - job:
-    name: octavia-v2-act-stdby-dsvm-py2-scenario-stable-queens
-    parent: octavia-v2-act-stdby-dsvm-py2-scenario
+    name: octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens
+    parent: octavia-v2-act-stdby-iptables-dsvm-py2-scenario
     override-checkout: stable/queens
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index af516d7a..787dfb07 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -26,17 +26,17 @@
             voting: false
         - octavia-v2-dsvm-py2-scenario-two-node:
             voting: false
-        - octavia-v2-act-stdby-dsvm-scenario:
+        - octavia-v2-act-stdby-iptables-dsvm-scenario:
             voting: false
-        - octavia-v2-act-stdby-dsvm-py2-scenario:
+        - octavia-v2-act-stdby-iptables-dsvm-py2-scenario:
             voting: false
-        - octavia-v2-act-stdby-dsvm-py2-scenario-centos-7:
+        - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-centos-7:
             voting: false
-        - octavia-v2-act-stdby-dsvm-scenario-stable-stein:
+        - octavia-v2-act-stdby-iptables-dsvm-scenario-stable-stein:
             voting: false
-        - octavia-v2-act-stdby-dsvm-py2-scenario-stable-rocky:
+        - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-rocky:
             voting: false
-        - octavia-v2-act-stdby-dsvm-py2-scenario-stable-queens:
+        - octavia-v2-act-stdby-iptables-dsvm-py2-scenario-stable-queens:
             voting: false
         - octavia-v2-dsvm-tls-barbican:
             voting: false