Merge "Cleanup more CentOS 8 bits"

diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/README.rst

@@ -1,4 +0,0 @@
-Verify we can build a centos-minimal image.
-
-Note this test includes the vm element to test the bootloader install,
-and specifies to output a .qcow2

diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/element-deps

@@ -1,3 +0,0 @@
-block-device-efi
-openstack-ci-mirrors
-vm

diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/environment.d/10-set-distro.bash

@@ -1 +0,0 @@
-export DIB_RELEASE=8

diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/test-output-formats

@@ -1 +0,0 @@
-tar,qcow2

diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst

@@ -1 +0,0 @@
-Verify we can build a centos-minimal image.

diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps

@@ -1 +0,0 @@
-openstack-ci-mirrors

diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash

@@ -1 +0,0 @@
-export DIB_RELEASE='8'

diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo

@@ -1,5 +0,0 @@
-[centos-appstream]
-name=CentOS-$releasever - AppStream
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=appstream
-gpgcheck=0
-

diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo

@@ -1,5 +0,0 @@
-[centos-base]
-name=CentOS-$releasever - Base
-mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=baseos
-gpgcheck=0
-

diskimage_builder/elements/centos/README.rst

@@ -14,7 +14,7 @@ DIB_DISTRIBUTION_MIRROR:
    :Default: None
    :Description: To use a CentOS Yum mirror, set this variable to the mirror URL
                  before running bin/disk-image-create. This URL should point to
-                 the directory containing the ``7/8/8-stream`` directories.
+                 the directory containing the ``7/8-stream/9-stream`` directories.
    :Example: ``DIB_DISTRIBUTION_MIRROR=http://amirror.com/centos``
 
 DIB_CLOUD_IMAGES:

roles/dib-setup-gate-mirrors/tasks/main.yaml

@@ -22,23 +22,6 @@
     - updates.repo
     - extras.repo
 
-- name: Create centos-minimal 8 directory
-  file:
-    path: "{{ dib_gate_mirror_repos }}/centos-minimal/8/yum.repos.d"
-    state: directory
-    mode: 0775
-    recurse: yes
-
-- name: Install centos-minimal 8 repo files
-  template:
-    dest: "{{ dib_gate_mirror_repos }}/centos-minimal/8/yum.repos.d/dib-mirror-{{ item }}"
-    mode: 0644
-    src: "centos-minimal/8/{{ item }}.j2"
-  with_items:
-    - base.repo
-    - appstream.repo
-    - extras.repo
-
 - name: Create centos-minimal 8-stream directory
   file:
     path: "{{ dib_gate_mirror_repos }}/centos-minimal/8-stream/yum.repos.d"

roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2

@@ -1,4 +0,0 @@
-[AppStream]
-name=CentOS-$releasever - AppStream
-baseurl=http://{{ mirror_fqdn }}/centos/$releasever/AppStream/$basearch/os/
-gpgcheck=0

roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2

@@ -1,4 +0,0 @@
-[base]
-name=CentOS-$releasever - Base
-baseurl=http://{{ mirror_fqdn }}/centos/$releasever/BaseOS/$basearch/os/
-gpgcheck=0

roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2

@@ -1,5 +0,0 @@
-#additional packages that may be useful
-[extras]
-name=CentOS-$releasever - Extras
-baseurl=http://{{ mirror_fqdn }}/centos/$releasever/extras/$basearch/os/
-gpgcheck=0