fedora: don't use CI mirrors
OpenDev has removed Fedora from the mirror AFS volumes. Don't try to use it during build. Co-authored-by: Ian Wienand <iwienand@redhat.com> Change-Id: I0b337c37421de2ff893bcd90d99f569d6551c79e Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
parent
ed9bdf805d
commit
d8eb624e72
@ -30,8 +30,6 @@ if [[ "${DISTRO_NAME}" == "ubuntu" ]]; then
|
|||||||
elif [[ "${DISTRO_NAME}" == "debian" ]]; then
|
elif [[ "${DISTRO_NAME}" == "debian" ]]; then
|
||||||
export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_DEBIAN_MIRROR
|
export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_DEBIAN_MIRROR
|
||||||
export DIB_DEBOOTSTRAP_EXTRA_ARGS+=" --no-check-gpg"
|
export DIB_DEBOOTSTRAP_EXTRA_ARGS+=" --no-check-gpg"
|
||||||
elif [[ "${DISTRO_NAME}" == "fedora" ]]; then
|
|
||||||
export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_FEDORA_MIRROR
|
|
||||||
elif [[ "${DISTRO_NAME}" == "centos" ]]; then
|
elif [[ "${DISTRO_NAME}" == "centos" ]]; then
|
||||||
if [[ "${DIB_RELEASE}" == '9-stream' ]]; then
|
if [[ "${DIB_RELEASE}" == '9-stream' ]]; then
|
||||||
# NOTE(ianw) 2021-10-18 : no 9-stream mirrors, yet
|
# NOTE(ianw) 2021-10-18 : no 9-stream mirrors, yet
|
||||||
@ -55,13 +53,7 @@ export DIB_DISTRIBUTION_MIRROR_UBUNTU_INSECURE=1
|
|||||||
# in the gate. Not relevant inside the chroot.
|
# in the gate. Not relevant inside the chroot.
|
||||||
if [[ -d ${DIB_OS_CI_YUM_REPOS:-/not/a/path/} ]]; then
|
if [[ -d ${DIB_OS_CI_YUM_REPOS:-/not/a/path/} ]]; then
|
||||||
|
|
||||||
if [[ "${DISTRO_NAME}" == "fedora" ]]; then
|
if [[ "${DISTRO_NAME}" == "centos" ]]; then
|
||||||
if [[ -d ${DIB_OS_CI_YUM_REPOS}/fedora-minimal/${DIB_RELEASE} ]]; then
|
|
||||||
export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/fedora-minimal/${DIB_RELEASE}/yum.repos.d
|
|
||||||
else
|
|
||||||
export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/fedora-minimal/default/yum.repos.d
|
|
||||||
fi
|
|
||||||
elif [[ "${DISTRO_NAME}" == "centos" ]]; then
|
|
||||||
export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/centos-minimal/${DIB_RELEASE}/yum.repos.d
|
export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/centos-minimal/${DIB_RELEASE}/yum.repos.d
|
||||||
elif [[ "${DISTRO_NAME}" == "openeuler" ]]; then
|
elif [[ "${DISTRO_NAME}" == "openeuler" ]]; then
|
||||||
export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/openeuler-minimal/${DIB_RELEASE}/yum.repos.d
|
export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/openeuler-minimal/${DIB_RELEASE}/yum.repos.d
|
||||||
|
@ -54,26 +54,6 @@
|
|||||||
- base.repo
|
- base.repo
|
||||||
- appstream.repo
|
- appstream.repo
|
||||||
|
|
||||||
- name: Create fedora-minimal directories
|
|
||||||
file:
|
|
||||||
path: "{{ dib_gate_mirror_repos }}/fedora-minimal/{{ item }}/yum.repos.d"
|
|
||||||
state: directory
|
|
||||||
mode: 0775
|
|
||||||
recurse: yes
|
|
||||||
# sometimes Fedora moves things and we need different versions; keep
|
|
||||||
# the loops for future use.
|
|
||||||
with_items:
|
|
||||||
- default
|
|
||||||
|
|
||||||
- name: Install fedora-minimal repo files
|
|
||||||
template:
|
|
||||||
dest: "{{ dib_gate_mirror_repos }}/fedora-minimal/{{ item[0] }}/yum.repos.d/dib-mirror-{{ item[1] }}"
|
|
||||||
mode: 0644
|
|
||||||
src: "fedora-minimal/{{ item[0] }}/{{ item[1] }}.j2"
|
|
||||||
with_nested:
|
|
||||||
- [ 'default' ]
|
|
||||||
- [ 'fedora.repo', 'fedora-updates.repo' ]
|
|
||||||
|
|
||||||
- name: Create openeuler-minimal 22.03-LTS directory
|
- name: Create openeuler-minimal 22.03-LTS directory
|
||||||
file:
|
file:
|
||||||
path: "{{ dib_gate_mirror_repos }}/openeuler-minimal/22.03-LTS/yum.repos.d"
|
path: "{{ dib_gate_mirror_repos }}/openeuler-minimal/22.03-LTS/yum.repos.d"
|
||||||
|
@ -1,9 +0,0 @@
|
|||||||
[updates]
|
|
||||||
name=Fedora $releasever - $basearch - Updates
|
|
||||||
baseurl=http://{{ mirror_fqdn }}/fedora/updates/$releasever/Everything/$basearch/
|
|
||||||
enabled=1
|
|
||||||
gpgcheck=0
|
|
||||||
metadata_expire=6h
|
|
||||||
skip_if_unavailable=False
|
|
||||||
deltarpm=False
|
|
||||||
deltarpm_percentage=0
|
|
@ -1,9 +0,0 @@
|
|||||||
[fedora]
|
|
||||||
name=Fedora $releasever - $basearch
|
|
||||||
baseurl=http://{{ mirror_fqdn }}/fedora/releases/$releasever/Everything/$basearch/os/
|
|
||||||
enabled=1
|
|
||||||
metadata_expire=7d
|
|
||||||
gpgcheck=0
|
|
||||||
skip_if_unavailable=False
|
|
||||||
deltarpm=False
|
|
||||||
deltarpm_percentage=0
|
|
Loading…
Reference in New Issue
Block a user