commit 2ad94bc4d02c0fa12e302fb25806868748ecf267
author Zuul <zuul@review.openstack.org> Sun Dec 30 17:36:12 2018 +0000
committer Gerrit Code Review <review@openstack.org> Sun Dec 30 17:36:12 2018 +0000
tree 1f449b750a763038deb51d80a0baa3afd08d0a21
parent 4f21307528b64031d9deaf10bd0aaf58275b30a1
parent 09593acce3182480695e7100bb37f3bf44e9ae6f

Merge "Replace Ocata jobs with Rocky"

zuul.d/project.yaml

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

zuul.d/stable-jobs.yaml

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,5 +1,10 @@
 ---
 - job:
+    name: ironic-dsvm-standalone-rocky
+    parent: ironic-dsvm-standalone
+    override-checkout: stable/rocky
+
+- job:
     name: ironic-dsvm-standalone-queens
     parent: ironic-dsvm-standalone
     override-checkout: stable/queens
@@ -10,6 +15,11 @@
     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
     override-checkout: stable/queens
@@ -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