Use centos mirror content instead of compose
Currently CentOS stream contents are pre-released on http://mirror.stream.centos.org/9-stream. In TripleO Deployment, we are using compose to lay down the repos. But on the base system, It has contents from CentOS stream mirror where module metadata is coming and but those contents are not available in Compose. Due to mixing of compose and mirror content, packages which are not available in compose are getting filtered out. In order to avoid this issue, we are switching to CentOS Stream mirror content. Patch at [1] adds c9 stream mirror for opendev system-config repo. Also removes the use of lookup plugin as it caused problems for zuul native execution see [2]. Instead ansible_env can give us the same value. Also carries workaround for opendev centos9 stream repos until [3] or similar fix merges. [1] https://review.opendev.org/c/opendev/system-config/+/817136 [2] https://logserver.rdoproject.org/17/36817/4/check/tripleo-stream9-development-buildimage-overcloud-hardened-uefi-full-master/31ebe5e/job-output.txt [3] https://review.opendev.org/c/opendev/base-jobs/+/820018 Closes-Bug: 1949601 Co-Authored-By: Marios Andreou (marios) <mandreou@redhat.com> Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com> Change-Id: I480dbb83d4721a30c0d96913df3e2a9d57ea4f75
This commit is contained in:
Chandan Kumar (raukadah)
Marios Andreou
parent
5edec16c0f
commit
1622992972
|
|
@ -71,9 +71,13 @@ repo_cmd_before: |
|
|||
sudo dnf config-manager --enable gating-repo || true;
|
||||
if [ -e /etc/ci/mirror_info.sh ]; then
|
||||
source /etc/ci/mirror_info.sh
|
||||
#TODO(marios) workaround until https://review.opendev.org/c/opendev/base-jobs/+/820018
|
||||
if [[ ( -n "$NODEPOOL_CENTOS_MIRROR" ) && ( "$NODEPOOL_CENTOS_MIRROR" != *-stream ) ]] ; then
|
||||
export NODEPOOL_CENTOS_MIRROR="${NODEPOOL_CENTOS_MIRROR}-stream"
|
||||
fi
|
||||
else
|
||||
# Otherwise, fallback to official mirrors provided by CentOS.
|
||||
export NODEPOOL_CENTOS_MIRROR={{ lookup('env','NODEPOOL_CENTOS_MIRROR')|default('http://mirror.centos.org/centos', true) }}
|
||||
export NODEPOOL_CENTOS_MIRROR={{ ansible_env['NODEPOOL_CENTOS_MIRROR']|default('http://mirror.stream.centos.org', true) }}
|
||||
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
|
||||
fi
|
||||
{% if dlrn_hash_path_newest is defined and dlrn_hash_path_newest %}
|
||||
|
|
@ -146,12 +150,12 @@ repos:
|
|||
- type: generic
|
||||
reponame: quickstart-centos-base
|
||||
filename: quickstart-centos-base.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/os
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os
|
||||
|
||||
- type: generic
|
||||
reponame: quickstart-centos-appstreams
|
||||
filename: quickstart-centos-appstreams.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
|
||||
module_hotfixes: true
|
||||
# module_hotfixes workaround for https://bugs.launchpad.net/tripleo/+bug/1949601
|
||||
|
||||
|
|
@ -159,12 +163,12 @@ repos:
|
|||
- type: generic
|
||||
reponame: quickstart-centos-crb
|
||||
filename: quickstart-centos-crb.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/CRB/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/CRB/x86_64/os/
|
||||
|
||||
- type: generic
|
||||
reponame: quickstart-centos-highavailability
|
||||
filename: quickstart-centos-highavailability.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/HighAvailability/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/HighAvailability/x86_64/os/
|
||||
|
||||
# Extras will be available once c9 get's released as this contains release rpms for SIG.
|
||||
# - type: generic
|
||||
|
|
@ -176,7 +180,6 @@ repo_cmd_after: |
|
|||
# Replace trunk.rdoproject.org to nodepool proxy
|
||||
sudo sed -i -e "s|https://trunk.rdoproject.org|$NODEPOOL_RDO_PROXY|g" /etc/yum.repos.d/delorean.repo
|
||||
sudo sed -i -e "s|https://trunk.rdoproject.org|$NODEPOOL_RDO_PROXY|g" /etc/yum.repos.d/delorean-master-deps.repo
|
||||
sudo sed -i -e "s|http://mirror.centos.org/centos|$NODEPOOL_CENTOS_MIRROR|g" /etc/yum.repos.d/delorean-master-deps.repo
|
||||
# note potential name change - FIX ME
|
||||
sudo sed -i -e "s|https://trunk.rdoproject.org|$NODEPOOL_RDO_PROXY|g" /etc/yum.repos.d/delorean-current.repo
|
||||
sudo sed -i -e "s|priority=1|priority=20|g" /etc/yum.repos.d/delorean.repo
|
||||
|
|
|
|||
|
|
@ -51,9 +51,13 @@ repo_cmd_before: |
|
|||
sudo dnf config-manager --enable gating-repo || true;
|
||||
if [ -e /etc/ci/mirror_info.sh ]; then
|
||||
source /etc/ci/mirror_info.sh
|
||||
#TODO(marios) workaround until https://review.opendev.org/c/opendev/base-jobs/+/820018
|
||||
if [[ ( -n "$NODEPOOL_CENTOS_MIRROR" ) && ( "$NODEPOOL_CENTOS_MIRROR" != *-stream ) ]] ; then
|
||||
export NODEPOOL_CENTOS_MIRROR="${NODEPOOL_CENTOS_MIRROR}-stream"
|
||||
fi
|
||||
else
|
||||
# Otherwise, fallback to official mirrors provided by CentOS.
|
||||
export NODEPOOL_CENTOS_MIRROR={{ lookup('env','NODEPOOL_CENTOS_MIRROR')|default('http://mirror.centos.org/centos', true) }}
|
||||
export NODEPOOL_CENTOS_MIRROR={{ ansible_env['NODEPOOL_CENTOS_MIRROR']|default('http://mirror.stream.centos.org', true) }}
|
||||
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
|
||||
fi
|
||||
{% if dlrn_hash_path_newest is defined and dlrn_hash_path_newest %}
|
||||
|
|
@ -128,12 +132,12 @@ repos:
|
|||
- type: generic
|
||||
reponame: quickstart-centos-base
|
||||
filename: quickstart-centos-base.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/BaseOS/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/BaseOS/x86_64/os/
|
||||
|
||||
- type: generic
|
||||
reponame: quickstart-centos-appstreams
|
||||
filename: quickstart-centos-appstreams.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/AppStream/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/AppStream/x86_64/os/
|
||||
module_hotfixes: true
|
||||
# module_hotfixes workaround for https://bugs.launchpad.net/tripleo/+bug/1949601
|
||||
|
||||
|
|
@ -141,12 +145,12 @@ repos:
|
|||
- type: generic
|
||||
reponame: quickstart-centos-crb
|
||||
filename: quickstart-centos-crb.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/CRB/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/CRB/x86_64/os/
|
||||
|
||||
- type: generic
|
||||
reponame: quickstart-centos-highavailability
|
||||
filename: quickstart-centos-highavailability.repo
|
||||
baseurl: https://composes.stream.centos.org/production/latest-CentOS-Stream/compose/HighAvailability/x86_64/os/
|
||||
baseurl: ${NODEPOOL_CENTOS_MIRROR}/9-stream/HighAvailability/x86_64/os/
|
||||
|
||||
# Extras will be available once c9 get's released as this contains release rpms for SIG.
|
||||
# - type: generic
|
||||
|
|
@ -159,7 +163,6 @@ repo_cmd_after: |
|
|||
# # Replace trunk.rdoproject.org to nodepool proxy
|
||||
sudo sed -i -e "s|https://trunk.rdoproject.org|$NODEPOOL_RDO_PROXY|g" /etc/yum.repos.d/delorean.repo
|
||||
sudo sed -i -e "s|https://trunk.rdoproject.org|$NODEPOOL_RDO_PROXY|g" /etc/yum.repos.d/delorean-master-deps.repo
|
||||
sudo sed -i -e "s|http://mirror.centos.org/centos|$NODEPOOL_CENTOS_MIRROR|g" /etc/yum.repos.d/delorean-master-deps.repo
|
||||
sudo sed -i -e "s|priority=1|priority=20|g" /etc/yum.repos.d/delorean.repo
|
||||
# continue from here
|
||||
sudo rpm -e epel-release || true;
|
||||
|
|
|
|||
Loading…
Reference in New Issue