From 09593acce3182480695e7100bb37f3bf44e9ae6f Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Mon, 3 Dec 2018 11:24:33 +0100
Subject: [PATCH] Replace Ocata jobs with Rocky

Ocata is in extended maintanance mode, while Rocky needs testing.

Change-Id: Ieb14b4c393e61bc737e1d92de29bbff801d2bb3d
---
 zuul.d/project.yaml     | 14 ++++++++------
 zuul.d/stable-jobs.yaml | 27 ++++++++++++++++-----------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 57de958..8e83e90 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -6,37 +6,39 @@
     check:
       jobs:
         - ironic-dsvm-standalone
+        - ironic-dsvm-standalone-rocky
         - ironic-dsvm-standalone-queens
         - ironic-dsvm-standalone-pike
         - ironic-tempest-dsvm-functional-python3
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+        - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike
-        - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ocata
         - ironic-tempest-dsvm-ironic-inspector
+        - ironic-tempest-dsvm-ironic-inspector-rocky
         - ironic-tempest-dsvm-ironic-inspector-queens
         - ironic-tempest-dsvm-ironic-inspector-pike
-        - ironic-tempest-dsvm-ironic-inspector-ocata
         - ironic-inspector-tempest-dsvm-discovery
+        - ironic-inspector-tempest-dsvm-discovery-rocky
         - ironic-inspector-tempest-dsvm-discovery-queens
         - ironic-inspector-tempest-dsvm-discovery-pike
-        - ironic-inspector-tempest-dsvm-discovery-ocata
     gate:
       queue: ironic
       jobs:
         - ironic-dsvm-standalone
+        - ironic-dsvm-standalone-rocky
         - ironic-dsvm-standalone-queens
         - ironic-dsvm-standalone-pike
         - ironic-tempest-dsvm-functional-python3
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+        - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens
         - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-pike
-        - ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ocata
         - ironic-tempest-dsvm-ironic-inspector
+        - ironic-tempest-dsvm-ironic-inspector-rocky
         - ironic-tempest-dsvm-ironic-inspector-queens
         - ironic-tempest-dsvm-ironic-inspector-pike
-        - ironic-tempest-dsvm-ironic-inspector-ocata
         - ironic-inspector-tempest-dsvm-discovery
+        - ironic-inspector-tempest-dsvm-discovery-rocky
         - ironic-inspector-tempest-dsvm-discovery-queens
         - ironic-inspector-tempest-dsvm-discovery-pike
-        - ironic-inspector-tempest-dsvm-discovery-ocata
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 32c5080..f5f3682 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,4 +1,9 @@
 ---
+- job:
+    name: ironic-dsvm-standalone-rocky
+    parent: ironic-dsvm-standalone
+    override-checkout: stable/rocky
+
 - job:
     name: ironic-dsvm-standalone-queens
     parent: ironic-dsvm-standalone
@@ -9,6 +14,11 @@
     parent: ironic-dsvm-standalone
     override-checkout: stable/pike
 
+- job:
+    name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-rocky
+    parent: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
+    override-checkout: stable/rocky
+
 - job:
     name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-queens
     parent: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
@@ -20,9 +30,9 @@
     override-checkout: stable/pike
 
 - job:
-    name: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode-ocata
-    parent: ironic-tempest-dsvm-ipa-wholedisk-agent_ipmitool-tinyipa-multinode
-    override-checkout: stable/ocata
+    name: ironic-tempest-dsvm-ironic-inspector-rocky
+    parent: ironic-tempest-dsvm-ironic-inspector
+    override-checkout: stable/rocky
 
 - job:
     name: ironic-tempest-dsvm-ironic-inspector-queens
@@ -35,9 +45,9 @@
     override-checkout: stable/pike
 
 - job:
-    name: ironic-tempest-dsvm-ironic-inspector-ocata
-    parent: ironic-tempest-dsvm-ironic-inspector
-    override-checkout: stable/ocata
+    name: ironic-inspector-tempest-dsvm-discovery-rocky
+    parent: ironic-inspector-tempest-dsvm-discovery
+    override-checkout: stable/rocky
 
 - job:
     name: ironic-inspector-tempest-dsvm-discovery-queens
@@ -48,8 +58,3 @@
     name: ironic-inspector-tempest-dsvm-discovery-pike
     parent: ironic-inspector-tempest-dsvm-discovery
     override-checkout: stable/pike
-
-- job:
-    name: ironic-inspector-tempest-dsvm-discovery-ocata
-    parent: ironic-inspector-tempest-dsvm-discovery
-    override-checkout: stable/ocata