From b4e000cc6d7365e0f1ac844467886852fd7fc296 Mon Sep 17 00:00:00 2001 From: wes hayutin Date: Sat, 14 Jul 2018 23:39:05 +0000 Subject: [PATCH] Revert "Don't trigger repo injection if nothing was built" This reverts commit 6fd5393cbdbafb7ba2f6390b071ae9b9d107acd3. Closes-Bug: #1781752 Change-Id: I398980184f3c2ae2057b7cc5c56a6a1f42774be0 --- playbooks/multinode-overcloud-upgrade.yml | 5 +-- playbooks/multinode-standalone.yml | 3 +- playbooks/multinode-undercloud-upgrade.yml | 3 +- playbooks/multinode-undercloud.yml | 8 ++--- playbooks/ovb-setup.yml | 38 +++++----------------- roles/build-test-packages/tasks/main.yml | 6 ---- 6 files changed, 13 insertions(+), 50 deletions(-) diff --git a/playbooks/multinode-overcloud-upgrade.yml b/playbooks/multinode-overcloud-upgrade.yml index 7e29d8130..e04084bd3 100644 --- a/playbooks/multinode-overcloud-upgrade.yml +++ b/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: - - hostvars['undercloud']['compressed_gating_repo'] is defined - - hostvars['undercloud']['compressed_gating_repo'] - - mixed_upgrade|default(false)|bool + when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool - name: Prepare containers for Upgrade hosts: undercloud diff --git a/playbooks/multinode-standalone.yml b/playbooks/multinode-standalone.yml index aa47e45d4..d35498af0 100644 --- a/playbooks/multinode-standalone.yml +++ b/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 - when: compressed_gating_repo is defined and compressed_gating_repo + - { role: install-built-repo, when: compressed_gating_repo is defined } tags: - build diff --git a/playbooks/multinode-undercloud-upgrade.yml b/playbooks/multinode-undercloud-upgrade.yml index 0deb4d15b..65a1ecd71 100644 --- a/playbooks/multinode-undercloud-upgrade.yml +++ b/playbooks/multinode-undercloud-upgrade.yml @@ -12,8 +12,7 @@ roles: - role: repo-setup - role: build-test-packages - - role: install-built-repo - when: compressed_gating_repo is defined and compressed_gating_repo + - { role: install-built-repo, when: compressed_gating_repo is defined } - name: Run tripleo-upgrade role to upgrade undercloud hosts: undercloud diff --git a/playbooks/multinode-undercloud.yml b/playbooks/multinode-undercloud.yml index 31303eae9..f442fdef2 100644 --- a/playbooks/multinode-undercloud.yml +++ b/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 - when: compressed_gating_repo is defined and compressed_gating_repo + - { role: install-built-repo, when: compressed_gating_repo is defined } tags: - build @@ -54,10 +53,7 @@ - role: repo-setup when: not mixed_upgrade|default(false)|bool - role: install-built-repo - when: - - hostvars['undercloud']['compressed_gating_repo'] is defined - - hostvars['undercloud']['compressed_gating_repo'] - - not mixed_upgrade|default(false)|bool + when: hostvars['undercloud']['compressed_gating_repo'] is defined and not mixed_upgrade|default(false)|bool tags: - build diff --git a/playbooks/ovb-setup.yml b/playbooks/ovb-setup.yml index f3324c63a..42642569d 100644 --- a/playbooks/ovb-setup.yml +++ b/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 - when: build_test_packages|default(false)|bool - - role: install-built-repo - when: compressed_gating_repo is defined and compressed_gating_repo + - { role: build-test-packages, when: build_test_packages|default(false)|bool } + - { role: install-built-repo, when: compressed_gating_repo is defined } tags: - build @@ -60,29 +58,9 @@ modify_image_vc_cpu: 4 modify_image_vc_verbose: true roles: - - role: fetch-images - 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 - 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 + - { role: fetch-images, 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, 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 and 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 and not to_build|bool } + diff --git a/roles/build-test-packages/tasks/main.yml b/roles/build-test-packages/tasks/main.yml index a45d4cec4..792565e4c 100644 --- a/roles/build-test-packages/tasks/main.yml +++ b/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