Ensure gated packages are installed during upgrade.

This ensures built packages from the gate are installed and used
during the upgrade using the new workflow.

It ensures that docker images get updated as well.

It also prevents a small warning by not trying to build the
tripleo-upgrade package.

Change-Id: Id1a7ac0f92d99ae01f1d34ab5c141398d5b37cd9

playbooks/multinode-overcloud-upgrade-new.yml

@@ -1,12 +1,3 @@
-- name: Prepare containers for Upgrade
-  hosts: undercloud
-  gather_facts: no
-  tags:
-    - overcloud-prep-containers
-  roles:
-    - role: overcloud-prep-containers
-      when: containerized_overcloud_upgrade|bool
-
 - name: Generate repo-setup script for overcloud upgrade
   hosts: undercloud
   tags:
@@ -20,7 +11,19 @@
   roles:
     - role: repo-setup
       when: containerized_overcloud_upgrade|bool
+      role: install-built-repo
+      when: hostvars['undercloud']['compressed_gating_repo'] is defined and mixed_upgrade|default(false)|bool
 
+- name: Prepare containers for Upgrade
+  hosts: undercloud
+  gather_facts: no
+  tags:
+    - overcloud-prep-containers
+  roles:
+    - role: overcloud-prep-containers
+      # This need the new repo in place.
+      update_containers: true
+      when: containerized_overcloud_upgrade|bool
 
 #FIXME(chem): tech-debt LP#1749740
 - name: Upgrade TripleO

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

@@ -15,6 +15,7 @@ artg_skipped_projects:
   - openstack/puppet-watcher
   - openstack/tripleo-quickstart
   - openstack/tripleo-quickstart-extras
+  - openstack/tripleo-upgrade
   - openstack-dev/grenade
   - openstack-infra/project-config
   - openstack-infra/tripleo-ci