summaryrefslogtreecommitdiff
path: root/zuul.d
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-01 15:20:52 +0000
committerGerrit Code Review <review@openstack.org>2018-10-01 15:20:52 +0000
commitf60de6433ed6fc6226e0c04442b282b8fa201699 (patch)
treeaeabcd8dc59ef27dbd43bd0dc2b9fc6c66d5460f /zuul.d
parent9c819cd153cee0f3fe020d68f92de2abc2b38ad5 (diff)
parent86e9c7e0f9e95b18957afdc285884748c8197824 (diff)
downloadironic-f60de6433ed6fc6226e0c04442b282b8fa201699.tar.gz
Merge "Switch ironic-tempest-dsvm-functional-python2 to zuulv3"
Diffstat (limited to 'zuul.d')
-rw-r--r--zuul.d/ironic-jobs.yaml34
-rw-r--r--zuul.d/legacy-ironic-jobs.yaml6
2 files changed, 34 insertions, 6 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 6411a3fb8..ab2735d30 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -266,3 +266,37 @@
devstack_localrc:
IRONIC_AGENT_IMAGE_DOWNLOAD_SOURCE: http
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
+
+- job:
+ name: ironic-tempest-dsvm-functional-python2
+ description: ironic-tempest-dsvm-functional-python2
+ parent: ironic-base
+ timeout: 5400
+ pre-run: playbooks/ci-workarounds/etc-neutron.yaml
+ vars:
+ tempest_test_regex: ironic_tempest_plugin.tests.api
+ devstack_localrc:
+ IRONIC_BAREMETAL_BASIC_OPS: False
+ IRONIC_DEFAULT_DEPLOY_INTERFACE: ""
+ IRONIC_DEFAULT_NETWORK_INTERFACE: noop
+ IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
+ IRONIC_VM_EPHEMERAL_DISK: 0
+ devstack_services:
+ g-api: False
+ g-reg: False
+ n-api: False
+ n-api-meta: False
+ n-cauth: False
+ n-cond: False
+ n-cpu: False
+ n-novnc: False
+ n-obj: False
+ n-sch: False
+ nova: False
+ placement-api: False
+ neutron-api: False
+ neutron-agent: False
+ neutron-dhcp: False
+ neutron-l3: False
+ neutron-metadata-agent: False
+ neutron-metering: False
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index f734e742d..62cca3c55 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -109,12 +109,6 @@
nodeset: legacy-ubuntu-xenial-2-node
- job:
- name: ironic-tempest-dsvm-functional-python2
- parent: legacy-ironic-dsvm-base
- run: playbooks/legacy/tempest-dsvm-ironic-functional-python2/run.yaml
- timeout: 5400
-
-- job:
name: ironic-tempest-dsvm-functional-python3
parent: legacy-ironic-dsvm-base
run: playbooks/legacy/tempest-dsvm-ironic-functional-python3/run.yaml