diff --git a/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash b/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash index 1cde1a26..dc5c0005 100644 --- a/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash +++ b/diskimage_builder/elements/openstack-ci-mirrors/environment.d/11-dib-distribution-mirror.bash @@ -30,8 +30,6 @@ if [[ "${DISTRO_NAME}" == "ubuntu" ]]; then elif [[ "${DISTRO_NAME}" == "debian" ]]; then export DIB_DISTRIBUTION_MIRROR=$NODEPOOL_DEBIAN_MIRROR 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 if [[ "${DIB_RELEASE}" == '9-stream' ]]; then # 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. if [[ -d ${DIB_OS_CI_YUM_REPOS:-/not/a/path/} ]]; then - if [[ "${DISTRO_NAME}" == "fedora" ]]; 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 + if [[ "${DISTRO_NAME}" == "centos" ]]; then export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/centos-minimal/${DIB_RELEASE}/yum.repos.d elif [[ "${DISTRO_NAME}" == "openeuler" ]]; then export DIB_YUM_MINIMAL_BOOTSTRAP_REPOS=${DIB_OS_CI_YUM_REPOS}/openeuler-minimal/${DIB_RELEASE}/yum.repos.d diff --git a/roles/dib-setup-gate-mirrors/tasks/main.yaml b/roles/dib-setup-gate-mirrors/tasks/main.yaml index 2b5e37b1..0a329fdd 100644 --- a/roles/dib-setup-gate-mirrors/tasks/main.yaml +++ b/roles/dib-setup-gate-mirrors/tasks/main.yaml @@ -54,26 +54,6 @@ - base.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 file: path: "{{ dib_gate_mirror_repos }}/openeuler-minimal/22.03-LTS/yum.repos.d" diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 deleted file mode 100644 index 8aa56dfe..00000000 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora-updates.repo.j2 +++ /dev/null @@ -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 diff --git a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 b/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 deleted file mode 100644 index b5ca357d..00000000 --- a/roles/dib-setup-gate-mirrors/templates/fedora-minimal/default/fedora.repo.j2 +++ /dev/null @@ -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