Remove RHEL-7 and CentOS-7 images from e2e tests (#634)

GoogleCloudPlatform · Jul 2, 2024 · 956c630 · 956c630
1 parent 3ce31d9
commit 956c630
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 47 deletions.
diff --git a/e2e_tests/test_suites/inventory/test_setup.go b/e2e_tests/test_suites/inventory/test_setup.go
@@ -66,13 +66,6 @@ var (
 		timeout:     25 * time.Minute,
 	}
 
-	el7Setup = &inventoryTestSetup{
-		packageType: []string{"rpm"},
-		startup:     compute.BuildInstanceMetadataItem("startup-script", utils.InstallOSConfigEL7()),
-		machineType: "e2-standard-2",
-		timeout:     25 * time.Minute,
-	}
-
 	el8Setup = &inventoryTestSetup{
 		packageType: []string{"rpm"},
 		startup:     compute.BuildInstanceMetadataItem("startup-script", utils.InstallOSConfigEL8()),
@@ -105,7 +98,6 @@ func headImageTestSetup() (setup []*inventoryTestSetup) {
 	// This maps a specific inventoryTestSetup to test setup names and associated images.
 	headTestSetupMapping := map[*inventoryTestSetup]map[string]string{
 		windowsSetup:     utils.HeadWindowsImages,
-		el7Setup:         utils.HeadEL7Images,
 		el8Setup:         utils.HeadEL8Images,
 		el9Setup:         utils.HeadEL9Images,
 		busterAptSetup:   utils.HeadBusterAptImages,

diff --git a/e2e_tests/test_suites/inventoryreporting/test_setup.go b/e2e_tests/test_suites/inventoryreporting/test_setup.go
@@ -135,14 +135,6 @@ var (
 		return nil
 	}
 
-	el7Setup = &inventoryTestSetup{
-		packageType: []string{"rpm"},
-		startup:     compute.BuildInstanceMetadataItem("startup-script", getStartupScriptEL("7")),
-		machineType: "e2-medium",
-		timeout:     25 * time.Minute,
-		itemCheck:   yumBashInstalledCheck,
-	}
-
 	el8Setup = &inventoryTestSetup{
 		packageType: []string{"rpm"},
 		startup:     compute.BuildInstanceMetadataItem("startup-script", getStartupScriptEL("8")),
@@ -297,7 +289,6 @@ func headImageTestSetup() (setup []*inventoryTestSetup) {
 	// This maps a specific inventoryTestSetup to test setup names and associated images.
 	headTestSetupMapping := map[*inventoryTestSetup]map[string]string{
 		windowsSetup:     utils.HeadWindowsImages,
-		el7Setup:         utils.HeadEL7Images,
 		el8Setup:         utils.HeadEL8Images,
 		el9Setup:         utils.HeadEL9Images,
 		busterAptSetup:   utils.HeadBusterAptImages,

diff --git a/e2e_tests/test_suites/patch/test_setup.go b/e2e_tests/test_suites/patch/test_setup.go
@@ -109,15 +109,6 @@ echo 'Pin-priority: 9999' >> /etc/apt/preferences
 	// apt Downgrade setup
 	bullseyeAptDowngradeSetup = createAptDowngradeSetup("debian-11")
 
-	el7Setup = &patchTestSetup{
-		assertTimeout: 30 * time.Minute,
-		metadata: []*computeApi.MetadataItems{
-			compute.BuildInstanceMetadataItem("startup-script", linuxRecordBoot+utils.InstallOSConfigEL7()+linuxLocalPrePatchScript),
-			enableOsconfig,
-			disableFeatures,
-		},
-		machineType: "e2-medium",
-	}
 	el8Setup = &patchTestSetup{
 		assertTimeout: 30 * time.Minute,
 		metadata: []*computeApi.MetadataItems{
@@ -187,7 +178,6 @@ func headImageTestSetup() []*patchTestSetup {
 	// This maps a specific patchTestSetup to test setup names and associated images.
 	mapping := map[*patchTestSetup]map[string]string{
 		windowsSetup:     utils.HeadWindowsImages,
-		el7Setup:         utils.HeadEL7Images,
 		el8Setup:         utils.HeadEL8Images,
 		el9Setup:         utils.HeadEL9Images,
 		busterAptSetup:   utils.HeadBusterAptImages,
@@ -203,7 +193,6 @@ func oldImageTestSetup() []*patchTestSetup {
 	// This maps a specific patchTestSetup to test setup names and associated images.
 	mapping := map[*patchTestSetup]map[string]string{
 		windowsSetup: utils.OldWindowsImages,
-		el7Setup:     utils.OldEL7Images,
 		el8Setup:     utils.OldEL8Images,
 		el9Setup:     utils.OldEL9Images,
 		suseSetup:    utils.OldSUSEImages,
@@ -235,7 +224,6 @@ func aptDowngradeImageTestSetup() []*patchTestSetup {
 func yumHeadImageTestSetup() []*patchTestSetup {
 	// This maps a specific patchTestSetup to test setup names and associated images.
 	mapping := map[*patchTestSetup]map[string]string{
-		el7Setup: utils.HeadEL7Images,
 		el8Setup: utils.HeadEL8Images,
 		el9Setup: utils.HeadEL9Images,
 	}

diff --git a/e2e_tests/utils/utils.go b/e2e_tests/utils/utils.go
@@ -281,7 +281,6 @@ func InstallOSConfigEL(image string) string {
 		return InstallOSConfigEL8()
 	case image == "7" || containsAnyOf(imageName, []string{"rhel-7", "rhel-sap-7", "centos-7"}):
 		return InstallOSConfigEL7()
-
 	}
 	return ""
 }
@@ -390,20 +389,6 @@ var OldSUSEImages = func() map[string]string {
 	return imgsMap
 }()
 
-// HeadEL7Images is a map of names to image paths for public EL7 image families. (RHEL, CentOS)
-var HeadEL7Images = map[string]string{
-	"centos-cloud/centos-7": "projects/centos-cloud/global/images/family/centos-7",
-
-	"rhel-cloud/rhel-7": "projects/rhel-cloud/global/images/family/rhel-7",
-
-	"rhel-sap-cloud/rhel-7-9-sap": "projects/rhel-sap-cloud/global/images/family/rhel-7-9-sap-ha",
-}
-
-// OldEL7Images is a map of names to image paths for old EL7 images.
-var OldEL7Images = map[string]string{
-	// Currently empty
-}
-
 // HeadEL8Images is a map of names to image paths for public EL8 image families. (RHEL, CentOS, Rocky)
 var HeadEL8Images = map[string]string{
 	"rhel-cloud/rhel-8": "projects/rhel-cloud/global/images/family/rhel-8",
@@ -442,9 +427,6 @@ var OldEL9Images = map[string]string{
 // HeadELImages is a map of names to image paths for public EL image families. (RHEL, CentOS, Rocky)
 var HeadELImages = func() (newMap map[string]string) {
 	newMap = make(map[string]string)
-	for k, v := range HeadEL7Images {
-		newMap[k] = v
-	}
 	for k, v := range HeadEL8Images {
 		newMap[k] = v
 	}