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

config/release/tripleo-ci/CentOS-8/master.yml

@@ -42,14 +42,10 @@ inject_images:
   - "overcloud-full.initrd"
   - "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"
 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_cmd_before: |
   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_RDO_PROXY=https://trunk.rdoproject.org
   fi
-
-  # get the baseurl with hash for "current"
-  CURRENT_URL=`curl --silent {{ current_url }} -S 2>>~/current_curl_errors.log | grep baseurl | cut -d= -f2`
-  if [[ -z "$CURRENT_URL" ]]; then
-    echo "Failed to parse dlrn hash for current"
-    exit 1
-  fi
-
-  # this routine is for current-tripleo only.
+  {% if dlrn_hash_path_newest is defined and dlrn_hash_path_newest %}
+    export DLRN_PATH_TAG_NEWEST="current/{{ dlrn_hash_path_newest }}"
+  {% elif dlrn_hash_tag_newest is match("^[a-zA-Z0-9]{32}$") %}
+    export DLRN_PATH_TAG_NEWEST="current/{{ dlrn_hash_tag_newest[:2] }}/{{ dlrn_hash_tag_newest[2:4] }}/{{ dlrn_hash_tag_newest }}"
+  {% else %}
+    export DLRN_PATH_TAG_NEWEST="{{ dlrn_hash_tag_newest }}"
+  {% endif %}
   {% if dlrn_hash_path is defined and dlrn_hash_path %}
     export DLRN_PATH_TAG="{{ promote_source }}/{{ dlrn_hash_path }}"
   {% elif dlrn_hash_tag is match("^[a-zA-Z0-9]{32}$") %}
@@ -82,23 +76,24 @@ repo_cmd_before: |
   {% else %}
     export DLRN_PATH_TAG="{{ dlrn_hash_tag }}"
   {% endif %}
-  export CURRENT_TRIPLEO_URL="{{ dlrn_baseurl }}/${DLRN_PATH_TAG}"
-
-  # sub in the mirror $NODEPOOL_RDO_PROXY
-  export CURRENT_URL_MIRROR=${CURRENT_URL/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
-  export CURRENT_TRIPLEO_URL_MIRROR=${CURRENT_TRIPLEO_URL/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
+  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
+    echo "Failed to parse dlrn hash"
+    exit 1
+  fi
+  export RDO_DLRN_REPO=${rdo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
 
 repos:
   # RDO repos
   - type: file
     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
   - type: generic
     reponame: delorean-current
     filename: delorean-current.repo
-    baseurl: $CURRENT_URL_MIRROR
+    baseurl: $RDO_DLRN_REPO
     priority: 10
     includepkgs:
       - ansible-role-container-registry

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

@@ -50,18 +50,26 @@
     - dlrn_hash_tag_newest in known_hash_tags
     - ansible_distribution_major_version is version(8, '>=')
   block:
-    - name: Get DLRN hash newest - passed tag - component-based
-      shell: |
-        set -euo pipefail
-        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
+    - block:
+        - name: Get DLRN hash newest - passed tag - component-based - not use mirror url
+          shell: |
+            set -euo pipefail
+            curl -s --fail --show-error {{ dlrn_baseurl }}/{{ dlrn_hash_tag_newest }}/delorean.repo.md5
+          register: full_hash_result
+          retries: 5
+      rescue:
+        - name: Get DLRN hash newest - passed tag - component-based - use mirror url
+          shell: |
+            set -euo pipefail
+            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
       set_fact:

roles/repo-setup/tasks/get-dlrn-hash.yml

@@ -51,25 +51,32 @@
     - dlrn_hash_tag in known_hash_tags
     - ansible_distribution_major_version is version(8, '>=')
   block:
-    - name: Get DLRN hash - passed tag - component-based
-      shell: |
-        set -euo pipefail
-        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
+    - block:
+        - name: Get DLRN hash - passed tag - component-based - not use mirror url
+          shell: |
+            set -euo pipefail
+            curl -s --fail --show-error {{ dlrn_baseurl }}/{{ dlrn_hash_tag }}/delorean.repo.md5
+          register: full_hash_result
+          retries: 5
+      rescue:
+        - name: Get DLRN hash - passed tag - component-based - use mirror url
+          shell: |
+            set -euo pipefail
+            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
       set_fact:
         dlrn_hash: "{{ full_hash_result.stdout }}"
         cacheable: true
 
-
 # TODO: Fix for fedora
 - when: overcloud_release is defined and (overcloud_release | length != 0)
   block: