Merge "Switch ironic-tempest-dsvm-functional-python3 to zuulv3"

openstack · Oct 4, 2018 · d2c9bba · d2c9bba
2 parents c80e912 + f34799b
commit d2c9bba
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 86 deletions.
diff --git a/playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
@@ -300,3 +300,13 @@
         neutron-l3: False
         neutron-metadata-agent: False
         neutron-metering: False
+
+- job:
+    name: ironic-tempest-dsvm-functional-python3
+    description: ironic-tempest-dsvm-functional-python3
+    parent: ironic-tempest-dsvm-functional-python2
+    vars:
+      devstack_localrc:
+        IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
+        IRONIC_VM_EPHEMERAL_DISK: 1
+        USE_PYTHON3: True
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
@@ -108,8 +108,3 @@
       - openstack/placement
     nodeset: legacy-ubuntu-xenial-2-node
 
-- job:
-    name: ironic-tempest-dsvm-functional-python3
-    parent: legacy-ironic-dsvm-base
-    run: playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml
-    timeout: 5400