Merge pull request #295 from kubevirt-bot/cherry-pick-269-to-release-1.2

[release-1.2] Remove the deprecated `centos.7` and `centos.stream8` preferences
kubevirt · Dec 9, 2024 · fa1d15d · fa1d15d
2 parents b6ea271 + 6736374
commit fa1d15d
Show file tree

Hide file tree

Showing 20 changed files with 0 additions and 200 deletions.
diff --git a/README.md b/README.md
@@ -307,13 +307,8 @@ provided by this project:
 Name | Guest OS
 -----|---------
 alpine | Alpine
-centos.7 | CentOS 7
-centos.7.desktop | CentOS 7
 centos.stream10 | CentOS Stream 10
 centos.stream10.desktop | CentOS Stream 10
-centos.stream8 | CentOS Stream 8
-centos.stream8.desktop | CentOS Stream 8
-centos.stream8.dpdk | CentOS Stream 8
 centos.stream9 | CentOS Stream 9
 centos.stream9.desktop | CentOS Stream 9
 centos.stream9.dpdk | CentOS Stream 9

diff --git a/preferences/centos/7/kustomization.yaml b/preferences/centos/7/kustomization.yaml
diff --git a/preferences/centos/7/metadata/kustomization.yaml b/preferences/centos/7/metadata/kustomization.yaml
diff --git a/preferences/centos/7/metadata/metadata.yaml b/preferences/centos/7/metadata/metadata.yaml
diff --git a/preferences/centos/7/requirements/kustomization.yaml b/preferences/centos/7/requirements/kustomization.yaml
diff --git a/preferences/centos/7/requirements/requirements.yaml b/preferences/centos/7/requirements/requirements.yaml
diff --git a/preferences/centos/7_desktop/kustomization.yaml b/preferences/centos/7_desktop/kustomization.yaml
diff --git a/preferences/centos/8_stream/kustomization.yaml b/preferences/centos/8_stream/kustomization.yaml
diff --git a/preferences/centos/8_stream/metadata/kustomization.yaml b/preferences/centos/8_stream/metadata/kustomization.yaml
diff --git a/preferences/centos/8_stream/metadata/metadata.yaml b/preferences/centos/8_stream/metadata/metadata.yaml
diff --git a/preferences/centos/8_stream/requirements/kustomization.yaml b/preferences/centos/8_stream/requirements/kustomization.yaml
diff --git a/preferences/centos/8_stream/requirements/requirements.yaml b/preferences/centos/8_stream/requirements/requirements.yaml
diff --git a/preferences/centos/8_stream_desktop/kustomization.yaml b/preferences/centos/8_stream_desktop/kustomization.yaml
diff --git a/preferences/centos/8_stream_dpdk/kustomization.yaml b/preferences/centos/8_stream_dpdk/kustomization.yaml
diff --git a/preferences/centos/8_stream_dpdk/metadata/kustomization.yaml b/preferences/centos/8_stream_dpdk/metadata/kustomization.yaml
diff --git a/preferences/centos/8_stream_dpdk/metadata/metadata.yaml b/preferences/centos/8_stream_dpdk/metadata/metadata.yaml
diff --git a/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml b/preferences/centos/8_stream_dpdk/requirements/kustomization.yaml
diff --git a/preferences/centos/8_stream_dpdk/requirements/requirements.yaml b/preferences/centos/8_stream_dpdk/requirements/requirements.yaml
diff --git a/preferences/centos/kustomization.yaml b/preferences/centos/kustomization.yaml
@@ -8,8 +8,3 @@ resources:
   - ./9_stream_desktop
   - ./9_stream_dpdk
   - ./9_stream
-  - ./8_stream_desktop
-  - ./8_stream_dpdk
-  - ./8_stream
-  - ./7_desktop
-  - ./7
diff --git a/tests/functests/instancetype_test.go b/tests/functests/instancetype_test.go
@@ -109,7 +109,6 @@ var _ = Describe("Common instance types func tests", func() {
 
 		It("[test_id:10737] can be created when enough resources are provided", func() {
 			preferenceInstancetypeMap := map[string]string{
-				"centos.stream8.dpdk": "u1.2xlarge",
 				"centos.stream9.dpdk": "u1.2xlarge",
 				"rhel.8.dpdk":         "u1.2xlarge",
 				"rhel.9.dpdk":         "u1.2xlarge",
@@ -163,10 +162,6 @@ var _ = Describe("Common instance types func tests", func() {
 		},
 			Entry("[test_id:10738] Fedora", fedoraContainerDisk, map[string]string{"amd64": "fedora", "arm64": "fedora.arm64"},
 				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("fedora")}),
-			Entry("[test_id:10740] CentOS 7", centos7ContainerDisk, map[string]string{"amd64": "centos.7"},
-				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("centos")}),
-			Entry("[test_id:10744] CentOS Stream 8", centosStream8ContainerDisk, map[string]string{"amd64": "centos.stream8"},
-				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("centos")}),
 			Entry("[test_id:10745] CentOS Stream 9", centosStream9ContainerDisk,
 				map[string]string{"amd64": "centos.stream9", "arm64": "centos.stream9"},
 				[]testFn{expectGuestAgentToBeConnected, expectSSHToRunCommandOnLinux("cloud-user")}),