Revert "Don't trigger repo injection if nothing was built"

This reverts commit 6fd5393cbd.

Closes-Bug: #1781752
Change-Id: I398980184f3c2ae2057b7cc5c56a6a1f42774be0

playbooks/multinode-overcloud-upgrade.yml

@@ -14,10 +14,7 @@
       when: containerized_overcloud_upgrade|default(false)|bool
     - role: build-test-packages
     - role: install-built-repo
-      when:
+      when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool
-        - hostvars['undercloud']['compressed_gating_repo'] is defined
-        - hostvars['undercloud']['compressed_gating_repo']
-        - mixed_upgrade|default(false)|bool
 
 - name: Prepare containers for Upgrade
   hosts: undercloud

playbooks/multinode-standalone.yml

@@ -22,8 +22,7 @@
     artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
   roles:
     - build-test-packages
-    - role: install-built-repo
+    - { role: install-built-repo, when: compressed_gating_repo is defined }
-      when: compressed_gating_repo is defined and compressed_gating_repo
   tags:
     - build
 

playbooks/multinode-undercloud-upgrade.yml

@@ -12,8 +12,7 @@
   roles:
     - role: repo-setup
     - role: build-test-packages
-    - role: install-built-repo
+    - { role: install-built-repo, when: compressed_gating_repo is defined }
-      when: compressed_gating_repo is defined and compressed_gating_repo
 
 - name: Run tripleo-upgrade role to upgrade undercloud
   hosts: undercloud

playbooks/multinode-undercloud.yml

@@ -41,8 +41,7 @@
     artg_compressed_gating_repo: "${HOME}/gating_repo.tar.gz"
   roles:
     - build-test-packages
-    - role: install-built-repo
+    - { role: install-built-repo, when: compressed_gating_repo is defined }
-      when: compressed_gating_repo is defined and compressed_gating_repo
   tags:
     - build
 
@@ -54,10 +53,7 @@
     - role: repo-setup
       when: not mixed_upgrade|default(false)|bool
     - role: install-built-repo
-      when:
+      when: hostvars['undercloud']['compressed_gating_repo'] is defined and not mixed_upgrade|default(false)|bool
-        - hostvars['undercloud']['compressed_gating_repo'] is defined
-        - hostvars['undercloud']['compressed_gating_repo']
-        - not mixed_upgrade|default(false)|bool
 
   tags:
     - build

playbooks/ovb-setup.yml

@@ -43,10 +43,8 @@
     artg_repos_dir: "{{ repo_clone_dir|default('/opt/stack/new') }}"
     ib_create_web_repo: "{{ to_build|bool }}"
   roles:
-    - role: build-test-packages
+    - { role: build-test-packages, when: build_test_packages|default(false)|bool }
-      when: build_test_packages|default(false)|bool
+    - { role: install-built-repo, when: compressed_gating_repo is defined }
-    - role: install-built-repo
-      when: compressed_gating_repo is defined and compressed_gating_repo
   tags:
     - build
 
@@ -60,29 +58,9 @@
     modify_image_vc_cpu: 4
     modify_image_vc_verbose: true
   roles:
-    - role: fetch-images
+    - { role: fetch-images, when: not to_build|bool }
-      when: not to_build|bool
+    - { role: repo-setup, repo_inject_image_path: "$HOME/overcloud-full.qcow2", repo_run_live: false, when: not to_build|bool }
-    - role: repo-setup
+    - { role: repo-setup, repo_inject_image_path: "$HOME/ironic-python-agent.initramfs", repo_run_live: false, initramfs_image: true, libguestfs_mode: false, when: not to_build|bool }
-      repo_inject_image_path: "$HOME/overcloud-full.qcow2"
+    - { role: install-built-repo, ib_repo_image_path: "$HOME/overcloud-full.qcow2", when: compressed_gating_repo is defined and not to_build|bool }
-      repo_run_live: false
+    - { role: install-built-repo, ib_repo_image_path: "$HOME/ironic-python-agent.initramfs", initramfs_image: true, libguestfs_mode: false, when: compressed_gating_repo is defined and not to_build|bool }
-      when: not to_build|bool
+
-    - role: repo-setup
-      repo_inject_image_path: "$HOME/ironic-python-agent.initramfs"
-      repo_run_live: false
-      initramfs_image: true
-      libguestfs_mode: false
-      when: not to_build|bool
-    - role: install-built-repo
-      ib_repo_image_path: "$HOME/overcloud-full.qcow2"
-      when:
-        - compressed_gating_repo is defined
-        - compressed_gating_repo
-        - not to_build|bool
-    - role: install-built-repo
-      ib_repo_image_path: "$HOME/ironic-python-agent.initramfs"
-      initramfs_image: true
-      libguestfs_mode: false
-      when:
-        - compressed_gating_repo is defined
-        - compressed_gating_repo
-        - not to_build|bool

roles/build-test-packages/tasks/main.yml

@@ -195,9 +195,3 @@
   when:
     - repo_built is defined
     - repo_built.skipped is not defined
-
-- name: Don't trigger repo injection if nothing is built
-  set_fact:
-    compressed_gating_repo: ""
-    cacheable: true
-  when: repo_built is not defined or repo_built.skipped is defined