From a445d6b8979bddd32df899cf58f0ee374970b838 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.

Also Remove lower-constraints job

As discussed during the upstream ironic community meeting on
Monday Dec 14 2020, the lower-constraints job is being removed.

Plus Cap version of ipa-builder to 2.2.0

Versions higher than 2.2.0 of ironic-python-agent-builder use
tinycore 11.x to build tinyipa, and that uses a kernel too recent
to be built on bionic.

Change-Id: Ied8cafd32c3e634d498467ebe878a411f0b24e6d
(cherry picked from commit 97ceb38a725cac797f9acf2c643d76c36e7293e0)
(cherry picked from commit 840488e5951a360bb0f61ce36d33b5253ed19655)
(cherry picked from commit 85a1e3d23aa72c20364f7b684e5029c7af219745)
---
 zuul.d/ironic-jobs.yaml | 8 ++++++--
 zuul.d/project.yaml     | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 9302bf6aa3..61410deee2 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -7,7 +7,8 @@
     required-projects:
       - openstack/ironic
       - openstack/ironic-python-agent
-      - openstack/ironic-python-agent-builder
+      - name: openstack/ironic-python-agent-builder
+        override-checkout: 2.2.0
       - openstack/ironic-tempest-plugin
     irrelevant-files:
       - ^.*\.rst$
@@ -337,12 +338,15 @@
 - job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
     description: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
-    parent: tempest-multinode-full
+    parent: tempest-multinode-full-base
+    nodeset: openstack-two-node-bionic
     pre-run: playbooks/ci-workarounds/pre.yaml
     timeout: 10800
     required-projects:
       - openstack/ironic
       - openstack/ironic-python-agent
+      - name: openstack/ironic-python-agent-builder
+        override-checkout: 2.2.0
       - openstack/ironic-tempest-plugin
       - openstack/networking-generic-switch
     irrelevant-files:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 946057583b..6f326fdf1f 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -2,7 +2,6 @@
     templates:
       - check-requirements
       - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
       - openstack-python-jobs
       - openstack-python3-train-jobs
       - periodic-stable-jobs