Skip to content

Commit 91e7a29

Browse files
committed
e2e: remove any reference to RHEL 8.8
# Conflicts: # .github/workflows/release-vsphere-template.yaml
1 parent e0b18d5 commit 91e7a29

File tree

19 files changed

+2
-283
lines changed

19 files changed

+2
-283
lines changed

.github/workflows/aws-e2e.yaml

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,6 @@ jobs:
1515
max-parallel: 30
1616
matrix:
1717
include:
18-
# RHEL 8.8
19-
- os: "redhat 8.8"
20-
buildConfig: "basic"
21-
- os: "redhat 8.8"
22-
buildConfig: "fips"
23-
- os: "redhat 8.8"
24-
buildConfig: "fips-kernel"
25-
- os: "redhat 8.8"
26-
buildConfig: "nvidia"
27-
- os: "redhat 8.8"
28-
buildConfig: "offline"
29-
- os: "redhat 8.8"
30-
buildConfig: "offline-fips"
31-
- os: "redhat 8.8"
32-
buildConfig: "offline-nvidia"
3318
#RHEL 8.10
3419
- os: "redhat 8.10"
3520
buildConfig: "basic"

.github/workflows/release-ami.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ jobs:
1919
include:
2020
- os: "oracle 8.9"
2121
buildConfig: "fips"
22-
- os: "redhat 8.8"
23-
buildConfig: "offline"
24-
- os: "redhat 8.8"
25-
buildConfig: "offline-fips"
26-
- os: "redhat 8.8"
27-
buildConfig: "fips-kernel"
2822
- os: "redhat 8.10"
2923
buildConfig: "offline"
3024
- os: "redhat 8.10"

.github/workflows/release-vsphere-template.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,6 @@ jobs:
1313
max-parallel: 10
1414
matrix:
1515
include:
16-
- os: "redhat 8.8"
17-
buildConfig: "offline"
18-
- os: "redhat 8.8"
19-
buildConfig: "offline-fips"
2016
- os: "redhat 8.10"
2117
buildConfig: "offline"
2218
- os: "redhat 8.10"

.github/workflows/vsphere-e2e.yaml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ jobs:
1515
max-parallel: 8
1616
matrix:
1717
include:
18-
- os: "redhat 8.8"
19-
buildConfig: "offline"
20-
- os: "redhat 8.8"
21-
buildConfig: "offline-fips"
2218
- os: "redhat 8.10"
2319
buildConfig: "offline"
2420
- os: "redhat 8.10"

ansible/molecule/ec2_full/molecule.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,6 @@ platforms:
4343
instance_type: p2.xlarge
4444
spot_price: false
4545
ssh_user: ec2-user
46-
- name: konvoyimage-rhel8.4-${USER:-ci}-${HOSTNAME:-local}
47-
image_search_name: "RHEL-8.4.0_HVM-*"
48-
image_search_owner: "309956199498"
49-
region: us-east-1
50-
instance_type: p2.xlarge
51-
spot_price: false
52-
ssh_user: ec2-user
5346
- name: konvoyimage-ubuntu-20.04-${USER:-ci}-${HOSTNAME:-local}
5447
image_search_name: "*ubuntu-focal-20.04-amd64-server-*"
5548
image_search_owner: "099720109477"

ansible/molecule/ec2_gpu/molecule.yml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,6 @@ platforms:
2626
instance_type: p2.xlarge
2727
spot_price: false
2828
ssh_user: ec2-user
29-
- name: konvoyimage-rhel8.4-${USER:-ci}-${HOSTNAME:-local}
30-
image_search_name: "RHEL-8.4.0_HVM-*"
31-
image_search_owner: "309956199498"
32-
region: us-east-1
33-
instance_type: p2.xlarge
34-
spot_price: false
35-
ssh_user: ec2-user
3629
- name: konvoyimage-flatcar-stable-${USER:-ci}-${HOSTNAME:-local}
3730
image_search_name: "Flatcar*stable*"
3831
image_search_owner: "075585003325"

ansible/roles/gpu/tasks/nvidia-gpu-RHEL.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,4 @@
11
---
2-
- name: enable RHEL 8 repos
3-
shell: subscription-manager repos --enable=rhel-8-for-x86_64-baseos-eus-rpms
4-
when:
5-
- rhelorg != None or rheluser != None
6-
- ansible_distribution_major_version == '8'
7-
- ansible_distribution_version is version('8.10', '<')
8-
9-
102
- name: install kernel headers and devel for kernel version on remote detected {{ hostvars[inventory_hostname].ansible_kernel }}
113
yum:
124
name:

ansible/roles/networking/tasks/main.yaml

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,26 +78,6 @@
7878
[keyfile]
7979
unmanaged-devices=interface-name:cali*;interface-name:tunl*;interface-name:vxlan.calico;interface-name:wireguard.cali
8080
81-
# The NetworkManager bug in RHEL 8.4 (https://bugzilla.redhat.com/show_bug.cgi?id=2007341) adds conflicting entry in route table
82-
# the conflicting entry hijacks traffic from host to containers.
83-
# Until the fix is available in upstream RHEL 8.X AMI, configure the nm-cloud-setup to prevent adding conflicting entry in route table in AWS.
84-
- name: configure NetworkManager-cloud-setup service to disable cloud setup on RHEL 8.x on AWS
85-
when:
86-
- packer_builder_type.startswith('amazon')
87-
- ansible_os_family == "RedHat"
88-
- ansible_distribution_major_version == '8'
89-
block:
90-
- name: ensure /etc/systemd/system/nm-cloud-setup.service.d exists
91-
file:
92-
path: /etc/systemd/system/nm-cloud-setup.service.d
93-
state: directory
94-
- name: create drop-in to disable nm-cloud-setup for AWS
95-
copy:
96-
dest: /etc/systemd/system/nm-cloud-setup.service.d/override.conf
97-
content: |
98-
[Service]
99-
Environment=NM_CLOUD_SETUP_EC2=no
100-
10181
- name: add iptable ALLOW rules for control-plane
10282
iptables:
10383
chain: INPUT

bundles/redhat8.8/README.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

bundles/redhat8.8/bundle.sh.gotmpl

Lines changed: 0 additions & 95 deletions
This file was deleted.

0 commit comments

Comments
 (0)