From f50d529ccafd173bec580d806b171ffffacd564a Mon Sep 17 00:00:00 2001
From: "Chandan Kumar (raukadah)" <chkumar@redhat.com>
Date: Wed, 27 Jul 2022 17:31:51 +0530
Subject: [PATCH] Use nodepool_rdo_proxy url instead of rdo trunk url

Currently in release file, we have rdo trunk url to lay
down dlrn and dlrn-deps repo.

In a restricted environment having network instability,
curl fails with `could not connect to rdo trunk url error`
while laying down the repo.

RDO trunk contents are already mirrored on different
cloud AFS mirror which are easily accessible.
Let use that one and avoid these errors.

This issue is seen in IBM cloud. Using nodepool_rdo_proxy
url exists with in the cloud fixes the issue.

Here is the testproject:
https://review.rdoproject.org/r/c/testproject/+/44235/2#message-09494ed17f2f9404b1bac0166ce45514d7ba8d12

Closes-Bug: #1982942

Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: I06a1784931abb7eb1bab7fc9dcd8be2cc14cfb66
---
 config/release/tripleo-ci/CentOS-9/master.yml                 | 4 ++--
 .../tripleo-ci/CentOS-9/promotion-testing-hash-master.yml     | 4 ++--
 .../tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml    | 4 ++--
 config/release/tripleo-ci/CentOS-9/wallaby.yml                | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/release/tripleo-ci/CentOS-9/master.yml b/config/release/tripleo-ci/CentOS-9/master.yml
index 672cc8c78..4eb79c175 100644
--- a/config/release/tripleo-ci/CentOS-9/master.yml
+++ b/config/release/tripleo-ci/CentOS-9/master.yml
@@ -119,7 +119,7 @@ repos:
   # RDO repos
   - type: file
     filename: delorean.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
 
   # name of delorean-tripleo-component-current? naming is hard
   - type: generic
@@ -158,7 +158,7 @@ repos:
 
   - type: file
     filename: delorean-master-deps.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
 
   # CentOS related repos
   - type: generic
diff --git a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml
index 1e8b10a60..0618de1d1 100644
--- a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml
+++ b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-master.yml
@@ -86,7 +86,7 @@ repo_cmd_before: |
 repos:
   - type: file
     filename: delorean.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
 
   # ATM current is not used in promotion jobs, this is a bug.
   # However for consistency w/ what is merged. removing
@@ -128,7 +128,7 @@ repos:
 
   - type: file
     filename: delorean-master-deps.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
 
   # CentOS related repos
   - type: generic
diff --git a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml
index 77fb1c051..17288656d 100644
--- a/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml
+++ b/config/release/tripleo-ci/CentOS-9/promotion-testing-hash-wallaby.yml
@@ -80,7 +80,7 @@ repo_cmd_before: |
 repos:
   - type: file
     filename: delorean.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
 
   # ATM current is not used in promotion jobs, this is a bug.
   # However for consistency w/ what is merged. removing
@@ -122,7 +122,7 @@ repos:
 
   - type: file
     filename: delorean-wallaby-deps.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
 
   # CentOS related repos
   - type: generic
diff --git a/config/release/tripleo-ci/CentOS-9/wallaby.yml b/config/release/tripleo-ci/CentOS-9/wallaby.yml
index 6129d0235..dda51230a 100644
--- a/config/release/tripleo-ci/CentOS-9/wallaby.yml
+++ b/config/release/tripleo-ci/CentOS-9/wallaby.yml
@@ -131,7 +131,7 @@ repos:
   # RDO repos
   - type: file
     filename: delorean.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/${DLRN_PATH_TAG}/delorean.repo"
 
   # name of delorean-tripleo-component-current? naming is hard
   - type: generic
@@ -170,7 +170,7 @@ repos:
 
   - type: file
     filename: delorean-wallaby-deps.repo
-    down_url: "https://trunk.rdoproject.org/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
+    down_url: "${NODEPOOL_RDO_PROXY}/{{ distro_ver }}-{{ release }}/delorean-deps.repo"
 
   # CentOS related repos
   - type: generic