chore: remove references to jvm-build-service

- jvm-build-service is currently not being used by anyone - It is going to undergo major breaking changes and is going to be removed for now until the changes are done - Current tests are probably going to be useless due to the rewrite
konflux-ci · Dec 11, 2024 · 8449f48 · 8449f48
1 parent 79e3c06
commit 8449f48
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 642 deletions.
diff --git a/magefiles/utils.go b/magefiles/utils.go
@@ -27,7 +27,7 @@ import (
 	"github.com/magefile/mage/sh"
 )
 
-const quayPrefixesToDeleteRegexp = "rhtap[-_]demo|happy-path|multi-platform|ex-registry|gitlab|build-e2e|build-templates|byoc|user1|spi|release-|integration|jvm|stat-rep|nbe|stack|rs[-_]demos|push-pyxis"
+const quayPrefixesToDeleteRegexp = "rhtap[-_]demo|happy-path|multi-platform|ex-registry|gitlab|build-e2e|build-templates|byoc|user1|spi|release-|integration|stat-rep|nbe|stack|rs[-_]demos|push-pyxis"
 
 func getRemoteAndBranchNameFromPRLink(url string) (remote, branchName string, err error) {
 	ghRes := &GithubPRInfo{}

diff --git a/pkg/clients/jvmbuildservice/OWNERS b/pkg/clients/jvmbuildservice/OWNERS
diff --git a/pkg/clients/jvmbuildservice/artifact_builds.go b/pkg/clients/jvmbuildservice/artifact_builds.go
diff --git a/pkg/clients/jvmbuildservice/caches.go b/pkg/clients/jvmbuildservice/caches.go
diff --git a/pkg/clients/jvmbuildservice/controller.go b/pkg/clients/jvmbuildservice/controller.go
diff --git a/pkg/clients/jvmbuildservice/dependency_builds.go b/pkg/clients/jvmbuildservice/dependency_builds.go
diff --git a/pkg/clients/jvmbuildservice/jbs_configs.go b/pkg/clients/jvmbuildservice/jbs_configs.go
diff --git a/pkg/clients/jvmbuildservice/rebuilt_artifacts.go b/pkg/clients/jvmbuildservice/rebuilt_artifacts.go
diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go
@@ -167,9 +167,6 @@ const (
 	QuayRepositorySecretName      = "quay-repository"
 	QuayRepositorySecretNamespace = "e2e-secrets"
 
-	JVMBuildImageSecretName = "jvm-build-image-secrets"
-	JBSConfigName           = "jvm-build-config"
-
 	BuildPipelineConfigConfigMapYamlURL = "https://raw.githubusercontent.com/redhat-appstudio/infra-deployments/main/components/build-service/base/build-pipeline-config/build-pipeline-config.yaml"
 
 	DefaultImagePushRepo         = "quay.io/" + DefaultQuayOrg + "/test-images"

diff --git a/pkg/framework/framework.go b/pkg/framework/framework.go
@@ -15,7 +15,6 @@ import (
 	"github.com/konflux-ci/e2e-tests/pkg/clients/has"
 	"github.com/konflux-ci/e2e-tests/pkg/clients/imagecontroller"
 	"github.com/konflux-ci/e2e-tests/pkg/clients/integration"
-	"github.com/konflux-ci/e2e-tests/pkg/clients/jvmbuildservice"
 	kubeCl "github.com/konflux-ci/e2e-tests/pkg/clients/kubernetes"
 	"github.com/konflux-ci/e2e-tests/pkg/clients/release"
 	"github.com/konflux-ci/e2e-tests/pkg/clients/tekton"
@@ -25,14 +24,13 @@ import (
 )
 
 type ControllerHub struct {
-	HasController             *has.HasController
-	CommonController          *common.SuiteController
-	TektonController          *tekton.TektonController
-	GitOpsController          *gitops.GitopsController
-	ReleaseController         *release.ReleaseController
-	IntegrationController     *integration.IntegrationController
-	JvmbuildserviceController *jvmbuildservice.JvmbuildserviceController
-	ImageController           *imagecontroller.ImageController
+	HasController         *has.HasController
+	CommonController      *common.SuiteController
+	TektonController      *tekton.TektonController
+	GitOpsController      *gitops.GitopsController
+	ReleaseController     *release.ReleaseController
+	IntegrationController *integration.IntegrationController
+	ImageController       *imagecontroller.ImageController
 }
 
 type Framework struct {
@@ -201,26 +199,19 @@ func InitControllerHub(cc *kubeCl.CustomClient) (*ControllerHub, error) {
 		return nil, err
 	}
 
-	// Initialize JVM Build Service Controller
-	jvmbuildserviceController, err := jvmbuildservice.NewSuiteController(cc)
-	if err != nil {
-		return nil, err
-	}
-
 	// Initialize Image Controller
 	imageController, err := imagecontroller.NewSuiteController(cc)
 	if err != nil {
 		return nil, err
 	}
 
 	return &ControllerHub{
-		HasController:             hasController,
-		CommonController:          commonCtrl,
-		TektonController:          tektonController,
-		GitOpsController:          gitopsController,
-		ReleaseController:         releaseController,
-		IntegrationController:     integrationController,
-		JvmbuildserviceController: jvmbuildserviceController,
-		ImageController:           imageController,
+		HasController:         hasController,
+		CommonController:      commonCtrl,
+		TektonController:      tektonController,
+		GitOpsController:      gitopsController,
+		ReleaseController:     releaseController,
+		IntegrationController: integrationController,
+		ImageController:       imageController,
 	}, nil
 }