From 725808d638141d3a5c82c629f472b37adbd869ac Mon Sep 17 00:00:00 2001 From: ChristianZaccaria Date: Thu, 6 Mar 2025 15:24:10 +0000 Subject: [PATCH 1/2] Add constant namespaces for RayDashboard tests --- test/e2e/mnist_rayjob_raycluster_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/mnist_rayjob_raycluster_test.go b/test/e2e/mnist_rayjob_raycluster_test.go index 3c24c55d2..9c4c80f9e 100644 --- a/test/e2e/mnist_rayjob_raycluster_test.go +++ b/test/e2e/mnist_rayjob_raycluster_test.go @@ -51,7 +51,7 @@ func runMnistRayJobRayCluster(t *testing.T, accelerator string, numberOfGpus int test := With(t) // Create a namespace - namespace := test.NewTestNamespace() + namespace := test.NewTestNamespace(WithNamespaceName("test-ns-1")) // Create Kueue resources resourceFlavor := CreateKueueResourceFlavor(test, v1beta1.ResourceFlavorSpec{}) @@ -122,7 +122,7 @@ func runMnistRayJobRayClusterAppWrapper(t *testing.T, accelerator string, number test := With(t) // Create a namespace - namespace := test.NewTestNamespace() + namespace := test.NewTestNamespace(WithNamespaceName("test-ns-2")) // Create Kueue resources resourceFlavor := CreateKueueResourceFlavor(test, v1beta1.ResourceFlavorSpec{}) From 0282dd3bbb96b0adba4942c6ea87a2e0fb42956d Mon Sep 17 00:00:00 2001 From: ChristianZaccaria Date: Thu, 6 Mar 2025 17:50:16 +0000 Subject: [PATCH 2/2] Update codeflare-common Go import --- go.mod | 2 +- go.sum | 4 ++-- test/e2e/mnist_rayjob_raycluster_test.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index bcc3e9da7..e0e124fd8 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/openshift/api v0.0.0-20240904015708-69df64132c91 github.com/openshift/client-go v0.0.0-20240904130219-3795e907a202 github.com/project-codeflare/appwrapper v1.0.4 - github.com/project-codeflare/codeflare-common v0.0.0-20250128135036-f501cd31fe8b + github.com/project-codeflare/codeflare-common v0.0.0-20250306164418-eb812487be82 github.com/ray-project/kuberay/ray-operator v1.2.2 go.uber.org/zap v1.27.0 golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 diff --git a/go.sum b/go.sum index 30448652e..943eeeb05 100644 --- a/go.sum +++ b/go.sum @@ -225,8 +225,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/project-codeflare/appwrapper v1.0.4 h1:364zQLX0tsi4LvBBYNKZL7PPbNWPbVU7vK6+/kVV/FQ= github.com/project-codeflare/appwrapper v1.0.4/go.mod h1:A1b6bMFNMX5Btv3ckgeuAHVVZzp1G30pSBe6BE/xJWE= -github.com/project-codeflare/codeflare-common v0.0.0-20250128135036-f501cd31fe8b h1:MOmv/aLx/kcHd7PBErx8XNSTW180s8Slf/uVM0uV4rw= -github.com/project-codeflare/codeflare-common v0.0.0-20250128135036-f501cd31fe8b/go.mod h1:DPSv5khRiRDFUD43SF8da+MrVQTWmxNhuKJmwSLOyO0= +github.com/project-codeflare/codeflare-common v0.0.0-20250306164418-eb812487be82 h1:cL1K2+r1lJVwBkhXiVFr2A9DphnylJmilYDIqg/W62M= +github.com/project-codeflare/codeflare-common v0.0.0-20250306164418-eb812487be82/go.mod h1:DPSv5khRiRDFUD43SF8da+MrVQTWmxNhuKJmwSLOyO0= github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+bR9r+8l63Y= github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= diff --git a/test/e2e/mnist_rayjob_raycluster_test.go b/test/e2e/mnist_rayjob_raycluster_test.go index 9c4c80f9e..cac4b0955 100644 --- a/test/e2e/mnist_rayjob_raycluster_test.go +++ b/test/e2e/mnist_rayjob_raycluster_test.go @@ -50,7 +50,7 @@ func TestMnistRayJobRayClusterGpu(t *testing.T) { func runMnistRayJobRayCluster(t *testing.T, accelerator string, numberOfGpus int) { test := With(t) - // Create a namespace + // Create a static namespace to ensure a consistent Ray Dashboard hostname entry in /etc/hosts before executing the test. namespace := test.NewTestNamespace(WithNamespaceName("test-ns-1")) // Create Kueue resources @@ -121,7 +121,7 @@ func TestMnistRayJobRayClusterAppWrapperGpu(t *testing.T) { func runMnistRayJobRayClusterAppWrapper(t *testing.T, accelerator string, numberOfGpus int) { test := With(t) - // Create a namespace + // Create a static namespace to ensure a consistent Ray Dashboard hostname entry in /etc/hosts before executing the test. namespace := test.NewTestNamespace(WithNamespaceName("test-ns-2")) // Create Kueue resources