feat: enable service provider tests with local dev images

On-behalf-of: @SAP [email protected]
Signed-off-by: Christopher Junk <[email protected]>

Author: christophrj

e2e/main_test.go

@@ -12,12 +12,15 @@ import (
 
 	"github.com/openmcp-project/openmcp-testing/pkg/providers"
 	"github.com/openmcp-project/openmcp-testing/pkg/setup"
+	"github.com/vladimirvivien/gexe"
 )
 
 var testenv env.Environment
 
 func TestMain(m *testing.M) {
 	initLogging()
+	serviceProviderImage := "ghcr.io/openmcp-project/images/service-provider-crossplane:v0.1.4"
+	mustPullImage(serviceProviderImage)
 	openmcp := setup.OpenMCPSetup{
 		Namespace: "openmcp-system",
 		Operator: setup.OpenMCPOperatorSetup{
@@ -35,7 +38,7 @@ func TestMain(m *testing.M) {
 		ServiceProviders: []providers.ServiceProviderSetup{
 			{
 				Name:  "crossplane",
-				Image: "ghcr.io/openmcp-project/images/service-provider-crossplane:v0.1.4",
+				Image: serviceProviderImage,
 			},
 		},
 	}
@@ -53,3 +56,13 @@ func initLogging() {
 	}
 	flag.Parse()
 }
+
+func mustPullImage(image string) {
+	klog.Info("Pulling ", image)
+	runner := gexe.New()
+	p := runner.RunProc(fmt.Sprintf("docker pull %s", image))
+	klog.V(4).Info(p.Out())
+	if p.Err() != nil {
+		panic(fmt.Errorf("docker pull %v failed: %w: %s", image, p.Err(), p.Result()))
+	}
+}

pkg/setup/bootstrap.go

@@ -36,11 +36,12 @@ type OpenMCPOperatorSetup struct {
 
 // Bootstrap sets up a the minimum set of components of an openMCP installation
 func (s *OpenMCPSetup) Bootstrap(testenv env.Environment) error {
-	platformClusterName := envconf.RandomName("platform-cluster", 16)
+	platformClusterName := envconf.RandomName("platform-", 16)
 	s.Operator.Namespace = s.Namespace
 	testenv.Setup(createPlatformCluster(platformClusterName)).
 		Setup(envfuncs.CreateNamespace(s.Namespace)).
 		Setup(s.installOpenMCPOperator()).
+		Setup(s.loadServiceProviderImages(platformClusterName)).
 		Setup(s.installClusterProviders()).
 		Setup(s.installServiceProviders()).
 		Setup(s.verifyEnvironment()).
@@ -109,7 +110,6 @@ func (s *OpenMCPSetup) installClusterProviders() env.Func {
 	}
 }
 
-// InstallServiceProvider creates a service provider object on the platform cluster and waits until it is ready
 func (s *OpenMCPSetup) installServiceProviders() env.Func {
 	return func(ctx context.Context, c *envconf.Config) (context.Context, error) {
 		for _, sp := range s.ServiceProviders {
@@ -120,3 +120,24 @@ func (s *OpenMCPSetup) installServiceProviders() env.Func {
 		return ctx, nil
 	}
 }
+
+func (s *OpenMCPSetup) loadServiceProviderImages(platformCluster string) env.Func {
+	funcs := []env.Func{}
+	for _, sp := range s.ServiceProviders {
+		funcs = append(funcs, envfuncs.LoadDockerImageToCluster(platformCluster, sp.Image))
+	}
+	return Compose(funcs...)
+}
+
+// Compose executes multiple env.Funcs in a row
+func Compose(envfuncs ...env.Func) env.Func {
+	return func(ctx context.Context, cfg *envconf.Config) (context.Context, error) {
+		for _, envfunc := range envfuncs {
+			var err error
+			if ctx, err = envfunc(ctx, cfg); err != nil {
+				return ctx, err
+			}
+		}
+		return ctx, nil
+	}
+}