openstack
/
tripleo-quickstart
Code Issues Proposed changes

Revert "ensure dlrn current is actually pulling current" 

This reverts commit dc25776f63.

Reason for revert: With the patch overridden dlrn_hash_tag_newest will
not work, also the actual issue seems due to mirror sync so let's use
non mirror urls to get hash and fallback to mirror ones.

Change-Id: I4a859f3146b4d8c03d2e97405d4412d31b6c329c
Related-Bug: #1906347
This commit is contained in:
yatin 2020-12-02 15:50:16 +00:00 committed by yatinkarel
parent dc25776f63
commit 46f074d8d9
3 changed files with 56 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
config/release/tripleo-ci/CentOS-8/master.yml
View File

@ -42,14 +42,10 @@ inject_images:
- "overcloud-full.initrd" - "overcloud-full.initrd"
- "overcloud-full.vmlinuz" - "overcloud-full.vmlinuz"
dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/overcloud-full.tar" overcloud_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/overcloud-full.tar"
ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar" ipa_image_url: "https://images.rdoproject.org/{{ distro_ver }}/{{ release }}/rdo_trunk/{{ promote_source }}/ironic-python-agent.tar"
# IF you need to RECREATE or RERUN on a SPECIFIC HASH, to pin current override "current_url"
# To override current-tripleo, use "dlrn_hash_tag"
dlrn_baseurl: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}"
current_url: "{{ dlrn_baseurl }}/component/tripleo/current/delorean.repo"
# repo setup # repo setup
repo_cmd_before: | repo_cmd_before: |
sudo rm -rf /etc/yum.repos.d/delorean*; sudo rm -rf /etc/yum.repos.d/delorean*;
@ -66,15 +62,13 @@ repo_cmd_before: |
export NODEPOOL_CENTOS_MIRROR={{ lookup('env','NODEPOOL_CENTOS_MIRROR')|default('http://mirror.centos.org/centos', true) }} export NODEPOOL_CENTOS_MIRROR={{ lookup('env','NODEPOOL_CENTOS_MIRROR')|default('http://mirror.centos.org/centos', true) }}
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
fi fi
{% if dlrn_hash_path_newest is defined and dlrn_hash_path_newest %}
# get the baseurl with hash for "current" export DLRN_PATH_TAG_NEWEST="current/{{ dlrn_hash_path_newest }}"
CURRENT_URL=`curl --silent {{ current_url }} -S 2>>~/current_curl_errors.log | grep baseurl | cut -d= -f2` {% elif dlrn_hash_tag_newest is match("^[a-zA-Z0-9]{32}$") %}
if [[ -z "$CURRENT_URL" ]]; then export DLRN_PATH_TAG_NEWEST="current/{{ dlrn_hash_tag_newest[:2] }}/{{ dlrn_hash_tag_newest[2:4] }}/{{ dlrn_hash_tag_newest }}"
echo "Failed to parse dlrn hash for current" {% else %}
exit 1 export DLRN_PATH_TAG_NEWEST="{{ dlrn_hash_tag_newest }}"
fi {% endif %}
# this routine is for current-tripleo only.
{% if dlrn_hash_path is defined and dlrn_hash_path %} {% if dlrn_hash_path is defined and dlrn_hash_path %}
export DLRN_PATH_TAG="{{ promote_source }}/{{ dlrn_hash_path }}" export DLRN_PATH_TAG="{{ promote_source }}/{{ dlrn_hash_path }}"
{% elif dlrn_hash_tag is match("^[a-zA-Z0-9]{32}$") %} {% elif dlrn_hash_tag is match("^[a-zA-Z0-9]{32}$") %}
@ -82,23 +76,24 @@ repo_cmd_before: |
{% else %} {% else %}
export DLRN_PATH_TAG="{{ dlrn_hash_tag }}" export DLRN_PATH_TAG="{{ dlrn_hash_tag }}"
{% endif %} {% endif %}
export CURRENT_TRIPLEO_URL="{{ dlrn_baseurl }}/${DLRN_PATH_TAG}" rdo_dlrn=`curl --silent https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG_NEWEST}/delorean.repo -S 2>>~/dlrn_repo_curl_errors.log | grep baseurl | grep "component/tripleo" | cut -d= -f2`
if [[ -z "$rdo_dlrn" ]]; then
# sub in the mirror $NODEPOOL_RDO_PROXY echo "Failed to parse dlrn hash"
export CURRENT_URL_MIRROR=${CURRENT_URL/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY} exit 1
export CURRENT_TRIPLEO_URL_MIRROR=${CURRENT_TRIPLEO_URL/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY} fi
export RDO_DLRN_REPO=${rdo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
repos: repos:
# RDO repos # RDO repos
- type: file - type: file
filename: delorean.repo filename: delorean.repo
down_url: "${CURRENT_TRIPLEO_URL_MIRROR}/delorean.repo" down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
# name of delorean-tripleo-component-current? naming is hard # name of delorean-tripleo-component-current? naming is hard
- type: generic - type: generic
reponame: delorean-current reponame: delorean-current
filename: delorean-current.repo filename: delorean-current.repo
baseurl: $CURRENT_URL_MIRROR baseurl: $RDO_DLRN_REPO
priority: 10 priority: 10
includepkgs: includepkgs:
- ansible-role-container-registry - ansible-role-container-registry

32
roles/repo-setup/tasks/get-dlrn-hash-newest.yml
View File

@ -50,18 +50,26 @@
- dlrn_hash_tag_newest in known_hash_tags - dlrn_hash_tag_newest in known_hash_tags
- ansible_distribution_major_version is version(8, '>=') - ansible_distribution_major_version is version(8, '>=')
block: block:
- name: Get DLRN hash newest - passed tag - component-based - block:
shell: | - name: Get DLRN hash newest - passed tag - component-based - not use mirror url
set -euo pipefail shell: |
dlrn_base={{ dlrn_baseurl }} set -euo pipefail
if [ -e /etc/ci/mirror_info.sh ]; then curl -s --fail --show-error {{ dlrn_baseurl }}/{{ dlrn_hash_tag_newest }}/delorean.repo.md5
source /etc/ci/mirror_info.sh register: full_hash_result
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org} retries: 5
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY} rescue:
fi - name: Get DLRN hash newest - passed tag - component-based - use mirror url
curl -s --fail --show-error ${dlrn_base}/{{ dlrn_hash_tag_newest }}/delorean.repo.md5 shell: |
register: full_hash_result set -euo pipefail
retries: 5 dlrn_base={{ dlrn_baseurl }}
if [ -e /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org}
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
fi
curl -s --fail --show-error ${dlrn_base}/{{ dlrn_hash_tag_newest }}/delorean.repo.md5
register: full_hash_result
retries: 5
- name: Set fact for dlrn_hash_newest - name: Set fact for dlrn_hash_newest
set_fact: set_fact:

33
roles/repo-setup/tasks/get-dlrn-hash.yml
View File

@ -51,25 +51,32 @@
- dlrn_hash_tag in known_hash_tags - dlrn_hash_tag in known_hash_tags
- ansible_distribution_major_version is version(8, '>=') - ansible_distribution_major_version is version(8, '>=')
block: block:
- name: Get DLRN hash - passed tag - component-based - block:
shell: | - name: Get DLRN hash - passed tag - component-based - not use mirror url
set -euo pipefail shell: |
dlrn_base={{ dlrn_baseurl }} set -euo pipefail
if [ -e /etc/ci/mirror_info.sh ]; then curl -s --fail --show-error {{ dlrn_baseurl }}/{{ dlrn_hash_tag }}/delorean.repo.md5
source /etc/ci/mirror_info.sh register: full_hash_result
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org} retries: 5
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY} rescue:
fi - name: Get DLRN hash - passed tag - component-based - use mirror url
curl -s --fail --show-error ${dlrn_base}/{{ dlrn_hash_tag }}/delorean.repo.md5 shell: |
register: full_hash_result set -euo pipefail
retries: 5 dlrn_base={{ dlrn_baseurl }}
if [ -e /etc/ci/mirror_info.sh ]; then
source /etc/ci/mirror_info.sh
NODEPOOL_RDO_PROXY=${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org}
dlrn_base=${dlrn_base/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
fi
curl -s --fail --show-error ${dlrn_base}/{{ dlrn_hash_tag }}/delorean.repo.md5
register: full_hash_result
retries: 5
- name: Set fact for dlrn_hash - name: Set fact for dlrn_hash
set_fact: set_fact:
dlrn_hash: "{{ full_hash_result.stdout }}" dlrn_hash: "{{ full_hash_result.stdout }}"
cacheable: true cacheable: true
# TODO: Fix for fedora # TODO: Fix for fedora
- when: overcloud_release is defined and (overcloud_release | length != 0) - when: overcloud_release is defined and (overcloud_release | length != 0)
block: block: