Merge "In mixed version upgrade we don't want yum upgrade to be triggered."

config/release/tripleo-ci/master-undercloud-pike-overcloud.yml

@@ -127,4 +127,11 @@ repo_cmd_after: |
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum repolist;
   sudo yum clean metadata
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
+
+undercloud_rpm_dependencies: >-
+  python-tripleoclient
+  ceph-ansible
+

config/release/tripleo-ci/pike-undercloud-ocata-overcloud.yml

@@ -125,4 +125,11 @@ repo_cmd_after: |
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum repolist;
   sudo yum clean metadata
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
+
+undercloud_rpm_dependencies: >-
+  python-tripleoclient
+  ceph-ansible
+

roles/repo-setup/README.md

@@ -27,6 +27,9 @@ Role Variables
 * `add_repos` - dictionary of additional repositories to add, could be populated in code, by
                 default is empty. Note that this dictionary will be constructed in the same manner
                 as a typical `repos` dictionary. See examples below.
+* `repo_setup_run_update` - false/true - whether to run or not yum update after setting up the repo.
+                            Default to true.
+
 
   *File*
   ------

roles/repo-setup/defaults/main.yml

@@ -30,6 +30,8 @@ repos:
     filename: delorean-deps.repo
     down_url: https://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo
 
+repo_setup_run_update: true
+
 # For adding custom repositories in featureset files
 add_repos: []
 # rhsm variables