From 0a0e9014c66b9fef36fe3e7e6f1730c61579476a Mon Sep 17 00:00:00 2001
From: Riccardo Pittau <elfosardo@gmail.com>
Date: Thu, 4 Mar 2021 09:24:32 +0100
Subject: [PATCH] Do not build iso for ussuri ipa

Since ipa-builder is branchless its code is used directly from master to
test ipa in stable releases.
The iso has been fixed only recently, and since we need to use
ipa-builder version 2.2.0 in stable/ussuri to test, build and publish
the ipa ramdisk, we can't also build an iso in CI or the build job will
break.
As a result we do not buildi an iso for ussuri ironic-python-agent.

Change-Id: I4801e87f5b3c37f113bfc9578c8e2aaa4d4f32f0
---
 roles/ipa-build-tinyipa-image/tasks/main.yaml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/roles/ipa-build-tinyipa-image/tasks/main.yaml b/roles/ipa-build-tinyipa-image/tasks/main.yaml
index 4e1aaa4..ae96f15 100644
--- a/roles/ipa-build-tinyipa-image/tasks/main.yaml
+++ b/roles/ipa-build-tinyipa-image/tasks/main.yaml
@@ -1,11 +1,20 @@
 - name: Build a TinyIPA image
-  command: make all
+  command: make
   args:
     chdir: '{{ tinyipa_dir }}'
   environment:
     BRANCH_PATH: '{{ ipa_branch_path }}'
     IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
 
+- name: Build a TinyIPA iso
+  command: make iso
+  args:
+    chdir: '{{ tinyipa_dir }}'
+  environment:
+    BRANCH_PATH: '{{ ipa_branch_path }}'
+    IPA_SOURCE_DIR: '{{ ansible_user_dir }}/src/opendev.org/openstack/ironic-python-agent'
+  when: "'ussuri' not in ipa_branch_path"
+
 - name: Move resulting files
   shell: |
     mv tinyipa*.tar.gz* "{{ ipa_tar_dir }}"