From 97ceb38a725cac797f9acf2c643d76c36e7293e0 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Fri, 11 Dec 2020 14:18:12 +0100
Subject: [PATCH] CI: switch the multinode job to tempest-multinode-full-base

The non-base job is designed for the integrated gate and may have
unnecessary side effects. It has recently overriding the OVS agent
bridge settings, breaking our job.

Make the job voting again.

Change-Id: Ied8cafd32c3e634d498467ebe878a411f0b24e6d
---
 zuul.d/ironic-jobs.yaml | 3 ++-
 zuul.d/project.yaml     | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 3f83981810..489370a5b4 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -414,7 +414,8 @@
 - job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
     description: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-    parent: tempest-multinode-full-py3
+    parent: tempest-multinode-full-base
+    nodeset: openstack-two-node-focal
     pre-run: playbooks/ci-workarounds/pre.yaml
     required-projects:
       - openstack/ironic
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1e72e3a6cf..7b3ac2fe2f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -19,8 +19,7 @@
         - ironic-tempest-wholedisk-bios-snmp-pxe
         - ironic-tempest-ipa-partition-pxe_ipmitool
         - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
-            voting: false
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-bios-ipmi-direct-tinyipa
         - ironic-tempest-bfv
         - ironic-tempest-ipa-partition-uefi-pxe-grub2
@@ -57,6 +56,7 @@
         - ironic-tempest-wholedisk-bios-snmp-pxe
         - ironic-tempest-ipa-partition-pxe_ipmitool
         - ironic-tempest-ipa-partition-uefi-pxe_ipmitool
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
         - ironic-tempest-bios-ipmi-direct-tinyipa
         - ironic-tempest-bfv
         - ironic-tempest-ipa-partition-uefi-pxe-grub2