Skip to content

Commit

Permalink
feat: removes rhel 7.9 rhel 8.4 and centos 7.9 (#1072)
Browse files Browse the repository at this point in the history
* feat: removes rhel 7.9 centos 7.9 rhel 8.4

* fix: removes oracle 8.4 files
  • Loading branch information
faiq authored May 23, 2024
1 parent 6cb5a26 commit b633d84
Show file tree
Hide file tree
Showing 22 changed files with 6 additions and 328 deletions.
41 changes: 1 addition & 40 deletions .github/workflows/aws-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,45 +15,6 @@ jobs:
max-parallel: 30
matrix:
include:
# CentoOS 7.9
- os: "centos 7.9"
buildConfig: "basic"
- os: "centos 7.9"
buildConfig: "fips"
- os: "centos 7.9"
buildConfig: "nvidia"
- os: "centos 7.9"
buildConfig: "offline"
- os: "centos 7.9"
buildConfig: "offline-fips"
- os: "centos 7.9"
buildConfig: "offline-nvidia"
# RHEL 7.9
- os: "redhat 7.9"
buildConfig: "basic"
- os: "redhat 7.9"
buildConfig: "fips"
- os: "redhat 7.9"
buildConfig: "nvidia"
- os: "redhat 7.9"
buildConfig: "offline"
- os: "redhat 7.9"
buildConfig: "offline-fips"
- os: "redhat 7.9"
buildConfig: "offline-nvidia"
# RHEL 8.4
- os: "redhat 8.4"
buildConfig: "basic"
- os: "redhat 8.4"
buildConfig: "fips"
- os: "redhat 8.4"
buildConfig: "nvidia"
- os: "redhat 8.4"
buildConfig: "offline"
- os: "redhat 8.4"
buildConfig: "offline-fips"
- os: "redhat 8.4"
buildConfig: "offline-nvidia"
# RHEL 8.6
- os: "redhat 8.6"
buildConfig: "basic"
Expand Down Expand Up @@ -112,7 +73,7 @@ jobs:
buildConfig: "basic"
- os: "rocky 9.1"
buildConfig: "offline"
runs-on:
runs-on:
- self-hosted
- small
continue-on-error: false
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/gcp-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ jobs:
os:
- "ubuntu 20.04"
- "ubuntu 18.04"
- "centos 7.9"
buildConfig:
- "basic"
runs-on:
runs-on:
- self-hosted
- small
continue-on-error: false
Expand Down
14 changes: 1 addition & 13 deletions .github/workflows/release-ami.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,20 +17,8 @@ jobs:
max-parallel: 10
matrix:
include:
- os: "centos 7.9"
buildConfig: "offline"
- os: "centos 7.9"
buildConfig: "offline-fips"
- os: "oracle 7.9"
buildConfig: "fips"
- os: "redhat 7.9"
buildConfig: "offline"
- os: "redhat 7.9"
buildConfig: "offline-fips"
- os: "redhat 8.4"
buildConfig: "offline"
- os: "redhat 8.4"
buildConfig: "offline-fips"
- os: "redhat 8.6"
buildConfig: "offline"
- os: "redhat 8.6"
Expand All @@ -52,7 +40,7 @@ jobs:
- os: "flatcar"
buildConfig: "basic"

runs-on:
runs-on:
- self-hosted
- small
continue-on-error: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release-azure.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- os: "ubuntu 20.04"
buildConfig: "basic"

runs-on:
runs-on:
- self-hosted
- small
continue-on-error: false
Expand Down
4 changes: 1 addition & 3 deletions .github/workflows/release-vsphere-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ jobs:
max-parallel: 3
matrix:
include:
- os: "redhat 8.4"
buildConfig: "offline"
- os: "redhat 8.6"
buildConfig: "offline"
- os: "redhat 8.8"
Expand All @@ -27,7 +25,7 @@ jobs:
buildConfig: "offline"
- os: "flatcar"
buildConfig: "basic"
runs-on:
runs-on:
- self-hosted
- small
continue-on-error: false
Expand Down
10 changes: 1 addition & 9 deletions .github/workflows/vsphere-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,6 @@ jobs:
max-parallel: 5
matrix:
include:
- os: "redhat 7.9"
buildConfig: "offline"
- os: "redhat 7.9"
buildConfig: "offline-fips"
- os: "redhat 8.4"
buildConfig: "offline"
- os: "redhat 8.4"
buildConfig: "offline-fips"
- os: "redhat 8.6"
buildConfig: "offline"
- os: "redhat 8.6"
Expand All @@ -37,7 +29,7 @@ jobs:
buildConfig: "offline"
- os: "flatcar"
buildConfig: "basic"
runs-on:
runs-on:
- self-hosted
- small
continue-on-error: false
Expand Down
14 changes: 0 additions & 14 deletions ansible/roles/containerd/tasks/redhat.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,20 +39,6 @@
when:
- ansible_distribution == 'OracleLinux'

# only required for RHEL when not installing from a local file
- name: install container-selinux GPG key
rpm_key:
state: present
key: "{{ docker_rpm_container_selinux_gpg_key_url }}"
register: result
until: result is success
retries: 5
delay: 6
when:
- ansible_distribution == 'RedHat'
- ansible_distribution_major_version|int == 7
- not offline_mode_enabled

- name: install container-selinux rpm package
yum:
name: "{{
Expand Down
50 changes: 0 additions & 50 deletions ansible/roles/gpu/tasks/nvidia-gpu-CentOS7.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions ansible/roles/gpu/tasks/nvidia-gpu.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
---
- name: "NVIDIA Gpu - CentOS 7"
include_tasks: nvidia-gpu-CentOS7.yaml
when: ansible_distribution == "CentOS" and ansible_distribution_major_version == '7'

- name: "NVIDIA Gpu - RHEL"
include_tasks: nvidia-gpu-RHEL.yaml
when: ansible_distribution == 'RedHat'
Expand Down
9 changes: 0 additions & 9 deletions ansible/roles/providers/tasks/vmware.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,6 @@
packages: "cloud-init cloud-utils python3-netifaces"
when: ansible_os_family == "VMware Photon OS"

# pip on CentOS needs to be upgraded, but since it's still
# Python 2.7, need < 21.0
- name: Upgrade pip
pip:
name: pip<21.0
extra_args: "{{ '--no-index --find-links=' + pip_packages_remote_filesystem_repo_path if offline_mode_enabled }}"
state: forcereinstall
when: ansible_os_family == "RedHat" and ansible_distribution_major_version == '7'

- name: Copy vmware guestinfo datasource
copy:
src: "{{ item }}"
Expand Down
14 changes: 0 additions & 14 deletions images/ami/centos-79.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions images/ami/oracle-84.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions images/ami/rhel-79.yaml

This file was deleted.

15 changes: 0 additions & 15 deletions images/ami/rhel-84.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions images/azure/centos-79.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions images/azure/oracle-79.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions images/azure/oracle-84.yaml

This file was deleted.

13 changes: 0 additions & 13 deletions images/azure/rhel-79.yaml

This file was deleted.

16 changes: 0 additions & 16 deletions images/gcp/centos-79.yaml

This file was deleted.

4 changes: 0 additions & 4 deletions images/generic/centos-7.yaml

This file was deleted.

Loading

0 comments on commit b633d84

Please sign in to comment.