From a91a693685d7c454093e060e8084947606fb5cdc Mon Sep 17 00:00:00 2001
From: Iury Gregory Melo Ferreira <imelofer@redhat.com>
Date: Mon, 7 Jan 2019 17:17:45 +0100
Subject: [PATCH] Remove dsvm from zuulv3 jobs
According to [1] the dsvm should be removed from zuulv3 jobs
[1] https://docs.openstack.org/infra/manual/drivers.html#naming-with-zuul-v3
Change-Id: I57da5d2f0827ce75ebac12962fc5b3f744613a18
---
zuul.d/ironic-jobs.yaml | 10 +++++-----
zuul.d/project.yaml | 19 +++++++++----------
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 07ec82ce5..641e9050b 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -18,7 +18,7 @@
USE_PYTHON3: True
- job:
- name: ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src
+ name: ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
parent: ironic-ipa-base
timeout: 7200
vars:
@@ -35,7 +35,7 @@
IRONIC_VM_EPHEMERAL_DISK: 0
- job:
- name: ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src
+ name: ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
parent: ironic-ipa-base
timeout: 7200
vars:
@@ -50,7 +50,7 @@
USE_PYTHON3: False
- job:
- name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src
+ name: ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
parent: ironic-ipa-base
timeout: 7200
vars:
@@ -58,7 +58,7 @@
IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi
- job:
- name: ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src
+ name: ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
parent: ironic-ipa-base
timeout: 7200
vars:
@@ -69,7 +69,7 @@
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
- job:
- name: ipa-tempest-dsvm-ironic-inspector-src
+ name: ipa-tempest-ironic-inspector-src
parent: ironic-ipa-base
timeout: 10800
required-projects:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 66e46fd15..0a54d16ab 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -9,12 +9,12 @@
- release-notes-jobs-python3
check:
jobs:
- - ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src
- - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src
- - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src
- - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src
+ - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
+ - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
+ - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
+ - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
# Non-voting jobs
- - ipa-tempest-dsvm-ironic-inspector-src:
+ - ipa-tempest-ironic-inspector-src:
voting: false
# NOTE(TheJulia): CoreOS jobs have a high failure rate.
# In order to reduce the odds of things like nested virt
@@ -38,10 +38,10 @@
gate:
queue: ironic
jobs:
- - ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src
- - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src
- - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src
- - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src
+ - ipa-tempest-partition-bios-ipmi-direct-tinyipa-src
+ - ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
+ - ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src
+ - ipa-tempest-wholedisk-bios-ipmi-iscsi-tinyipa-src
- openstack-tox-lower-constraints
experimental:
jobs:
@@ -51,4 +51,3 @@
jobs:
- ironic-python-agent-buildimage-coreos
- ironic-python-agent-buildimage-tinyipa
-