Ignore empty values for dlrn hashes

When dlrn_hash_path(_newest) is empty, ignore it and use default
value.
This patch also adds the option of not running 'yum update' when
configuring any release file. This can be achieved by setting
'repo_setup_run_update' fo false when invoking repo-setup role.

Change-Id: Id35eac7ea87662fbfc134203886f7fb58147153b

config/release/centosci/master-current-tripleo.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/centosci/ocata-current-tripleo.yml

@@ -23,7 +23,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -37,7 +37,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/centosci/pike-current-tripleo.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/centosci/queens-current-tripleo.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/tripleo-ci/consistent-master.yml

@@ -36,7 +36,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -99,7 +99,9 @@ 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

config/release/tripleo-ci/consistent-newton.yml

@@ -38,7 +38,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -101,5 +101,7 @@ 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 %}
 

config/release/tripleo-ci/consistent-ocata.yml

@@ -38,7 +38,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"

config/release/tripleo-ci/consistent-pike.yml

@@ -37,7 +37,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -100,7 +100,9 @@ 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

config/release/tripleo-ci/consistent-queens.yml

@@ -36,7 +36,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -99,7 +99,9 @@ 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

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

@@ -50,8 +50,8 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1

config/release/tripleo-ci/master.yml

@@ -34,8 +34,8 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1
@@ -115,7 +115,9 @@ 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

config/release/tripleo-ci/newton.yml

@@ -32,7 +32,7 @@ repo_cmd_before: |
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
   rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/current/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1
@@ -114,5 +114,7 @@ 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 %}
 

config/release/tripleo-ci/ocata.yml

@@ -31,8 +31,8 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1
@@ -114,5 +114,7 @@ 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 %}
 

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

@@ -9,8 +9,8 @@ docker_registry_host: docker.io
 docker_registry_namespace: tripleopike
 docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 undercloud_image_url: https://images.rdoproject.org/pike/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/undercloud.qcow2
-ipa_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/ironic-python-agent.tar
-overcloud_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/overcloud-full.tar
+ipa_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/ironic-python-agent.tar
+overcloud_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/overcloud-full.tar
 images:
     - name: undercloud
       url: "{{ undercloud_image_url }}"
@@ -43,8 +43,8 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1

config/release/tripleo-ci/pike.yml

@@ -34,8 +34,8 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1
@@ -117,7 +117,9 @@ 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

config/release/tripleo-ci/promotion-testing-hash-master.yml

@@ -36,7 +36,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-master/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -99,7 +99,9 @@ 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

config/release/tripleo-ci/promotion-testing-hash-newton.yml

@@ -38,7 +38,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -101,5 +101,7 @@ 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 %}
 

config/release/tripleo-ci/promotion-testing-hash-ocata.yml

@@ -38,7 +38,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -102,5 +102,7 @@ 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 %}
 

config/release/tripleo-ci/promotion-testing-hash-pike.yml

@@ -37,7 +37,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -100,7 +100,9 @@ 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

config/release/tripleo-ci/promotion-testing-hash-queens.yml

@@ -36,7 +36,7 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   rdo_dlrn_deps=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/delorean-deps.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
     echo "Failed to parse dlrn hash"
@@ -99,7 +99,9 @@ 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

config/release/tripleo-ci/queens.yml

@@ -34,8 +34,8 @@ repo_cmd_before: |
     export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
     export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
   fi
-  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-queens/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/delorean.repo | grep baseurl | cut -d= -f2`
   if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
     echo "Failed to parse dlrn hash"
     exit 1
@@ -114,7 +114,9 @@ repo_cmd_after: |
   sudo rm -rf /etc/yum.repos.d/CentOS-OpenStack-*.repo /etc/yum.repos.d/CentOS-Ceph-*.repo /etc/yum.repos.d/CentOS-QEMU-EV.repo;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/trunk/master.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/trunk/ocata.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/trunk/pike.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient

config/release/trunk/queens.yml

@@ -24,7 +24,7 @@ repos:
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/
+    baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/
     priority: 20
 
   - type: file
@@ -38,7 +38,9 @@ repos:
 repo_cmd_after: |
   sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
   sudo yum repolist;
+  {% if repo_setup_run_update|default(true)|bool %}
   sudo yum update -y
+  {% endif %}
 
 undercloud_rpm_dependencies: >-
   python-tripleoclient