openstack/tripleo-quickstart
Code Issues Proposed changes

Ignore empty values for dlrn hashes

Browse Source 
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
This commit is contained in:
Sagi Shnaidman 2018-03-21 13:26:51 +02:00 committed by Emilien Macchi
parent ad46263b7c
commit 9b77bdaf0a
25 changed files with 77 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/release/centosci/master-current-tripleo.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/centosci/ocata-current-tripleo.yml
View File

@ -23,7 +23,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -37,7 +37,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/centosci/pike-current-tripleo.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/centosci/queens-current-tripleo.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/tripleo-ci/consistent-master.yml
View File

@ -36,7 +36,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -99,7 +99,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/tripleo-ci/consistent-newton.yml
View File

@ -38,7 +38,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -101,5 +101,7 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}

2
config/release/tripleo-ci/consistent-ocata.yml
View File

@ -38,7 +38,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"

4
config/release/tripleo-ci/consistent-pike.yml
View File

@ -37,7 +37,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -100,7 +100,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/tripleo-ci/consistent-queens.yml
View File

@ -36,7 +36,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -99,7 +99,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

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

@ -50,8 +50,8 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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) }}/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 if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 exit 1

6
config/release/tripleo-ci/master.yml
View File

@ -34,8 +34,8 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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) }}/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 if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 exit 1
@ -115,7 +115,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/tripleo-ci/newton.yml
View File

@ -32,7 +32,7 @@ repo_cmd_before: |
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi fi
rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/current/delorean.repo | grep baseurl | cut -d= -f2` 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 if [[ -z "$rdo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 exit 1
@ -114,5 +114,7 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}

6
config/release/tripleo-ci/ocata.yml
View File

@ -31,8 +31,8 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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) }}/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 if [[ -z "$rdo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 exit 1
@ -114,5 +114,7 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}

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

@ -9,8 +9,8 @@ docker_registry_host: docker.io
docker_registry_namespace: tripleopike docker_registry_namespace: tripleopike
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" 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 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 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) }}/overcloud-full.tar overcloud_image_url: https://images.rdoproject.org/ocata/delorean/{{ dlrn_hash_path|default(dlrn_hash_tag, true) }}/overcloud-full.tar
images: images:
- name: undercloud - name: undercloud
url: "{{ undercloud_image_url }}" url: "{{ undercloud_image_url }}"
@ -43,8 +43,8 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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) }}/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 if [[ -z "$rdo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 exit 1

6
config/release/tripleo-ci/pike.yml
View File

@ -34,8 +34,8 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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) }}/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 if [[ -z "$rdo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 exit 1
@ -117,7 +117,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

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

@ -36,7 +36,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -99,7 +99,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

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

@ -38,7 +38,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -101,5 +101,7 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}

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

@ -38,7 +38,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -102,5 +102,7 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}

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

@ -37,7 +37,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -100,7 +100,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

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

@ -36,7 +36,7 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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 if [[ -z "$rdo_dlrn" || -z "$rdo_dlrn_deps" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
@ -99,7 +99,9 @@ repo_cmd_after: |
sudo rm -rf /etc/yum.repos.d/*.rpmsave; sudo rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
sudo yum clean metadata sudo yum clean metadata
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

6
config/release/tripleo-ci/queens.yml
View File

@ -34,8 +34,8 @@ repo_cmd_before: |
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi 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` 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) }}/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 if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
echo "Failed to parse dlrn hash" echo "Failed to parse dlrn hash"
exit 1 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/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 rm -rf /etc/yum.repos.d/*.rpmsave;
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/trunk/master.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/trunk/ocata.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/trunk/pike.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-jewel.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient

4
config/release/trunk/queens.yml
View File

@ -24,7 +24,7 @@ repos:
- type: generic - type: generic
reponame: delorean reponame: delorean
filename: delorean.repo 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 priority: 20
- type: file - type: file
@ -38,7 +38,9 @@ repos:
repo_cmd_after: | repo_cmd_after: |
sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0 sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0
sudo yum repolist; sudo yum repolist;
{% if repo_setup_run_update|default(true)|bool %}
sudo yum update -y sudo yum update -y
{% endif %}
undercloud_rpm_dependencies: >- undercloud_rpm_dependencies: >-
python-tripleoclient python-tripleoclient