🛑 Stop using internal repositories
Remove the F31/F32 internal repositories since they are causing dnf download errors from time to time. The 8.2 repository override should have never been there in the first place since we're using the CDN. The 8.3 repository is no longer needed since we can register the RHEL 8.3 instances against the staging CDN and get beta content from there. Fixes #822. Signed-off-by: Major Hayden <major@redhat.com>
This commit is contained in:
parent
f9d70456ff
commit
e88b9c4bd7
6 changed files with 21 additions and 103 deletions
|
|
@ -42,31 +42,15 @@ sudo dnf repository-packages osbuild-mock list
|
|||
# Note: installing only -tests to catch missing dependencies
|
||||
retry sudo dnf -y install osbuild-composer-tests
|
||||
|
||||
# Copy the internal repositories into place when needed.
|
||||
if curl -fs http://download.devel.redhat.com > /dev/null; then
|
||||
|
||||
# Set up a directory to hold repository overrides.
|
||||
sudo mkdir -p /etc/osbuild-composer/repositories
|
||||
|
||||
case "${ID}${VERSION_ID}" in
|
||||
fedora31)
|
||||
sudo cp ${WORKSPACE}/test/internal-repos/fedora-31.json \
|
||||
/etc/osbuild-composer/repositories/fedora-31.json
|
||||
;;
|
||||
fedora32)
|
||||
sudo cp ${WORKSPACE}/test/internal-repos/fedora-32.json \
|
||||
/etc/osbuild-composer/repositories/fedora-32.json
|
||||
;;
|
||||
rhel8.2)
|
||||
sudo cp ${WORKSPACE}/test/external-repos/rhel-8.json \
|
||||
/etc/osbuild-composer/repositories/rhel-8.json
|
||||
;;
|
||||
rhel8.3)
|
||||
sudo cp ${WORKSPACE}/test/internal-repos/rhel-8.json \
|
||||
/etc/osbuild-composer/repositories/rhel-8.json
|
||||
;;
|
||||
esac
|
||||
# Set up a directory to hold repository overrides.
|
||||
sudo mkdir -p /etc/osbuild-composer/repositories
|
||||
|
||||
# NOTE(mhayden): RHEL 8.3 is the release we are currently targeting, but the
|
||||
# release is in beta right now. For RHEL 8.2 (latest release), ensure that
|
||||
# the production (non-beta content) is used.
|
||||
if [[ "${ID}${VERSION_ID//./}" == rhel82 ]]; then
|
||||
sudo cp ${WORKSPACE}/test/external-repos/rhel-8.json \
|
||||
/etc/osbuild-composer/repositories/rhel-8.json
|
||||
fi
|
||||
|
||||
# Start services.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue