Harmonize registry ports in test suites

ironcore-dev · Aug 21, 2024 · 227d47d · 227d47d
1 parent 4e0df6a
commit 227d47d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/internal/controller/server_controller_test.go b/internal/controller/server_controller_test.go
@@ -84,7 +84,7 @@ var _ = Describe("Server Controller", func() {
 			HaveField("Status.SKU", "8675309"),
 			HaveField("Status.SerialNumber", "437XR1138R2"),
 			HaveField("Status.IndicatorLED", metalv1alpha1.OffIndicatorLED),
-			HaveField("Status.State", metalv1alpha1.ServerStateInitial),
+			HaveField("Status.State", metalv1alpha1.ServerStateDiscovery),
 			HaveField("Status.PowerState", metalv1alpha1.ServerOffPowerState),
 		))
 		DeferCleanup(k8sClient.Delete, server)

diff --git a/internal/controller/suite_test.go b/internal/controller/suite_test.go
@@ -41,7 +41,7 @@ var (
 	cfg         *rest.Config
 	k8sClient   client.Client
 	testEnv     *envtest.Environment
-	registryURL = "http://localhost:12345"
+	registryURL = "http://localhost:30000"
 )
 
 func TestControllers(t *testing.T) {
@@ -97,7 +97,7 @@ var _ = BeforeSuite(func() {
 	var mgrCtx context.Context
 	mgrCtx, cancel := context.WithCancel(context.Background())
 	DeferCleanup(cancel)
-	registryServer := registry.NewServer(":12345")
+	registryServer := registry.NewServer(":30000")
 	go func() {
 		defer GinkgoRecover()
 		Expect(registryServer.Start(mgrCtx)).To(Succeed(), "failed to start registry server")

diff --git a/internal/controller/testdata/ignition.go b/internal/controller/testdata/ignition.go
@@ -36,7 +36,7 @@ systemd:
         ExecStartPre=-/usr/bin/docker stop metalprobe
         ExecStartPre=-/usr/bin/docker rm metalprobe
         ExecStartPre=/usr/bin/docker pull foo:latest
-        ExecStart=/usr/bin/docker run --network host --privileged --name metalprobe foo:latest --registry-url=http://localhost:12345 --server-uuid=38947555-7742-3448-3784-823347823834
+        ExecStart=/usr/bin/docker run --network host --privileged --name metalprobe foo:latest --registry-url=http://localhost:30000 --server-uuid=38947555-7742-3448-3784-823347823834
         ExecStop=/usr/bin/docker stop metalprobe
         [Install]
         WantedBy=multi-user.target

diff --git a/internal/probe/probe_suite_test.go b/internal/probe/probe_suite_test.go
@@ -19,8 +19,8 @@ var (
 	probeAgent     *probe.Agent
 	registryServer *registry.Server
 
-	registryAddr = ":15432"
-	registryURL  = "http://localhost:15432"
+	registryAddr = ":30001"
+	registryURL  = "http://localhost:30001"
 	systemUUID   = "1234-5678"
 )
 

diff --git a/internal/registry/registry_suite_test.go b/internal/registry/registry_suite_test.go
@@ -16,8 +16,8 @@ import (
 
 var (
 	server         *registry.Server
-	testServerURL  = "http://localhost:54321"
-	testServerAddr = ":54321"
+	testServerURL  = "http://localhost:30002"
+	testServerAddr = ":30002"
 )
 
 func TestRegistry(t *testing.T) {