From 62101b6aa548f7d45c26892d714abf140f0b7b99 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Tue, 1 Feb 2022 15:39:24 +1100 Subject: [PATCH] Cleanup more CentOS 8 bits This removes some testing and mirror setup bits and pieces for CentOS 8 that is now EOL. Change-Id: I18dec9054cf9e023bdf086bda3ba253b28d6540d --- .../8-aarch64-build-succeeds/README.rst | 4 ---- .../8-aarch64-build-succeeds/element-deps | 3 --- .../environment.d/10-set-distro.bash | 1 - .../test-output-formats | 1 - .../test-elements/8-build-succeeds/README.rst | 1 - .../test-elements/8-build-succeeds/element-deps | 1 - .../environment.d/09-set-distro.bash | 1 - .../centos-minimal/yum.repos.d/8/appstream.repo | 5 ----- .../centos-minimal/yum.repos.d/8/base.repo | 5 ----- diskimage_builder/elements/centos/README.rst | 2 +- roles/dib-setup-gate-mirrors/tasks/main.yaml | 17 ----------------- .../centos-minimal/8/appstream.repo.j2 | 4 ---- .../templates/centos-minimal/8/base.repo.j2 | 4 ---- .../templates/centos-minimal/8/extras.repo.j2 | 5 ----- 14 files changed, 1 insertion(+), 53 deletions(-) delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/README.rst delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/element-deps delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/environment.d/10-set-distro.bash delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/test-output-formats delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps delete mode 100644 diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash delete mode 100644 diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo delete mode 100644 diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo delete mode 100644 roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2 delete mode 100644 roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2 delete mode 100644 roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2 diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/README.rst b/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/README.rst deleted file mode 100644 index 5c2428f8..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/README.rst +++ /dev/null @@ -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 diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/element-deps b/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/element-deps deleted file mode 100644 index 99857b0c..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/element-deps +++ /dev/null @@ -1,3 +0,0 @@ -block-device-efi -openstack-ci-mirrors -vm diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/environment.d/10-set-distro.bash b/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/environment.d/10-set-distro.bash deleted file mode 100644 index aa8eed5d..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/environment.d/10-set-distro.bash +++ /dev/null @@ -1 +0,0 @@ -export DIB_RELEASE=8 diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/test-output-formats b/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/test-output-formats deleted file mode 100644 index c780936b..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-aarch64-build-succeeds/test-output-formats +++ /dev/null @@ -1 +0,0 @@ -tar,qcow2 \ No newline at end of file diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst deleted file mode 100644 index fa1e50dc..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/README.rst +++ /dev/null @@ -1 +0,0 @@ -Verify we can build a centos-minimal image. diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps deleted file mode 100644 index 7791c84f..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/element-deps +++ /dev/null @@ -1 +0,0 @@ -openstack-ci-mirrors \ No newline at end of file diff --git a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash b/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash deleted file mode 100644 index d6c89677..00000000 --- a/diskimage_builder/elements/centos-minimal/test-elements/8-build-succeeds/environment.d/09-set-distro.bash +++ /dev/null @@ -1 +0,0 @@ -export DIB_RELEASE='8' diff --git a/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo b/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo deleted file mode 100644 index 328475e0..00000000 --- a/diskimage_builder/elements/centos-minimal/yum.repos.d/8/appstream.repo +++ /dev/null @@ -1,5 +0,0 @@ -[centos-appstream] -name=CentOS-$releasever - AppStream -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=appstream -gpgcheck=0 - diff --git a/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo b/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo deleted file mode 100644 index f263b2b6..00000000 --- a/diskimage_builder/elements/centos-minimal/yum.repos.d/8/base.repo +++ /dev/null @@ -1,5 +0,0 @@ -[centos-base] -name=CentOS-$releasever - Base -mirrorlist=http://mirrorlist.centos.org/?release=$releasever&arch=$basearch&repo=baseos -gpgcheck=0 - diff --git a/diskimage_builder/elements/centos/README.rst b/diskimage_builder/elements/centos/README.rst index 3ef56412..8d8295b4 100644 --- a/diskimage_builder/elements/centos/README.rst +++ b/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: diff --git a/roles/dib-setup-gate-mirrors/tasks/main.yaml b/roles/dib-setup-gate-mirrors/tasks/main.yaml index 697e846e..6ce85ea4 100644 --- a/roles/dib-setup-gate-mirrors/tasks/main.yaml +++ b/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" diff --git a/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2 b/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2 deleted file mode 100644 index 2cfa3951..00000000 --- a/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/appstream.repo.j2 +++ /dev/null @@ -1,4 +0,0 @@ -[AppStream] -name=CentOS-$releasever - AppStream -baseurl=http://{{ mirror_fqdn }}/centos/$releasever/AppStream/$basearch/os/ -gpgcheck=0 diff --git a/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2 b/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2 deleted file mode 100644 index 2f3aeb5e..00000000 --- a/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/base.repo.j2 +++ /dev/null @@ -1,4 +0,0 @@ -[base] -name=CentOS-$releasever - Base -baseurl=http://{{ mirror_fqdn }}/centos/$releasever/BaseOS/$basearch/os/ -gpgcheck=0 diff --git a/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2 b/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2 deleted file mode 100644 index 2c1d46ed..00000000 --- a/roles/dib-setup-gate-mirrors/templates/centos-minimal/8/extras.repo.j2 +++ /dev/null @@ -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