From 7f3a7e111d4068d695eb8ce63792c5850d13ebb0 Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Mon, 15 Mar 2021 12:56:11 +0100
Subject: [PATCH] Prepare to use ussuri jobs from ipa-builder

Temporary remove the tinyipa ussuri jobs definitions.
We need to add them back once [0] merges.

[0] https://review.opendev.org/c/openstack/ironic-python-agent-builder/+/780556

Change-Id: Ie073f34384be29e5e5fd61ca760ddcf33d7dbb19
---
 zuul.d/ironic-python-agent-jobs.yaml | 16 ----------------
 zuul.d/project.yaml                  | 12 +++++++++---
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml
index 7b7e89383..987a01812 100644
--- a/zuul.d/ironic-python-agent-jobs.yaml
+++ b/zuul.d/ironic-python-agent-jobs.yaml
@@ -224,19 +224,3 @@
 - job:
     name: ipa-tempest-bios-ipmi-iscsi-tinyipa-src
     parent: ipa-tempest-partition-bios-ipmi-iscsi-tinyipa-src
-
-- job:
-    name: ironic-python-agent-build-image-tinyipa-ussuri
-    parent: ironic-python-agent-build-image-tinyipa
-    nodeset: ubuntu-bionic
-    required-projects:
-      - name: openstack/ironic-python-agent-builder
-        override-checkout: 2.2.0
-
-- job:
-    name: ironic-python-agent-check-image-tinyipa-ussuri
-    parent: ironic-python-agent-check-image-tinyipa
-    nodeset: ubuntu-bionic
-    required-projects:
-        - name: openstack/ironic-python-agent-builder
-          override-checkout: 2.2.0
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 693d5a649..27b7f68b8 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -13,10 +13,13 @@
         - ipa-tempest-bios-ipmi-iscsi-tinyipa-src
         - ironic-standalone-ipa-src
         - metalsmith-integration-ipa-src
+        # NOTE(rpittau) temporarily commenting this out until
+        # https://review.opendev.org/c/openstack/ironic-python-agent-builder/+/780556
+        # merges
+        #- ironic-python-agent-check-image-tinyipa-ussuri:
+        #    voting: false
         # NOTE(dtantsur): non-voting because IPA source code is very unlikely
         # to break them. They rather serve as a canary for broken POST jobs.
-        - ironic-python-agent-check-image-tinyipa-ussuri:
-            voting: false
         - ironic-python-agent-check-image-dib-centos8:
             voting: false
         # Non-voting jobs
@@ -43,5 +46,8 @@
         - ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa
     post:
       jobs:
-        - ironic-python-agent-build-image-tinyipa-ussuri
+        # NOTE(rpittau) temporarily commenting this out until
+        # https://review.opendev.org/c/openstack/ironic-python-agent-builder/+/780556
+        # merges
+        #- ironic-python-agent-build-image-tinyipa-ussuri
         - ironic-python-agent-build-image-dib-centos8