Skip to content

Commit 4816d9d

Browse files
sutaakaropenshift-merge-robot
sutaakar
authored and
openshift-merge-robot
committed
Update tests to the latest CodeFlare operator version
1 parent 93b07be commit 4816d9d

File tree

3 files changed

+54
-24
lines changed

3 files changed

+54
-24
lines changed

‎tests/go.mod‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/opendatahub-io/distributed-workloads/tests/new-tests
22

33
require (
4-
github.com/onsi/gomega v1.27.6
4+
github.com/onsi/gomega v1.27.8
55
github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec
6-
github.com/project-codeflare/codeflare-operator v0.0.7-0.20230727155844-a82274750112
7-
github.com/ray-project/kuberay/ray-operator v0.0.0-20230614221720-085c29d40fa9
6+
github.com/project-codeflare/codeflare-operator v0.1.1-0.20230817124305-be0dd48b43b4
7+
github.com/ray-project/kuberay/ray-operator v0.0.0-20230807232553-238cb4e945b6
88
k8s.io/api v0.27.2
99
k8s.io/apimachinery v0.27.2
1010
)
@@ -30,21 +30,20 @@ require (
3030
github.com/modern-go/reflect2 v1.0.2 // indirect
3131
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3232
github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a // indirect
33-
github.com/project-codeflare/multi-cluster-app-dispatcher v1.32.0 // indirect
33+
github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.0 // indirect
3434
github.com/spf13/pflag v1.0.5 // indirect
3535
github.com/stretchr/testify v1.8.4 // indirect
36-
golang.org/x/net v0.10.0 // indirect
36+
golang.org/x/net v0.12.0 // indirect
3737
golang.org/x/oauth2 v0.7.0 // indirect
3838
golang.org/x/sys v0.10.0 // indirect
39-
golang.org/x/term v0.8.0 // indirect
39+
golang.org/x/term v0.10.0 // indirect
4040
golang.org/x/text v0.11.0 // indirect
4141
golang.org/x/time v0.3.0 // indirect
4242
google.golang.org/appengine v1.6.7 // indirect
4343
google.golang.org/protobuf v1.30.0 // indirect
4444
gopkg.in/inf.v0 v0.9.1 // indirect
4545
gopkg.in/yaml.v2 v2.4.0 // indirect
4646
gopkg.in/yaml.v3 v3.0.1 // indirect
47-
k8s.io/apiextensions-apiserver v0.26.1 // indirect
4847
k8s.io/client-go v0.27.1 // indirect
4948
k8s.io/klog/v2 v2.100.1 // indirect
5049
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect

‎tests/go.sum‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -78,22 +78,22 @@ github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjY
7878
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
7979
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
8080
github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
81-
github.com/onsi/ginkgo/v2 v2.9.2 h1:BA2GMJOtfGAfagzYtrAlufIP0lq6QERkFmHLMLPwFSU=
82-
github.com/onsi/gomega v1.27.6 h1:ENqfyGeS5AX/rlXDd/ETokDz93u0YufY1Pgxuy/PvWE=
83-
github.com/onsi/gomega v1.27.6/go.mod h1:PIQNjfQwkP3aQAH7lf7j87O/5FiNr+ZR8+ipb+qQlhg=
81+
github.com/onsi/ginkgo/v2 v2.11.0 h1:WgqUCUt/lT6yXoQ8Wef0fsNn5cAuMK7+KT9UFRz2tcU=
82+
github.com/onsi/gomega v1.27.8 h1:gegWiwZjBsf2DgiSbf5hpokZ98JVDMcWkUiigk6/KXc=
83+
github.com/onsi/gomega v1.27.8/go.mod h1:2J8vzI/s+2shY9XHRApDkdgPo1TKT7P2u6fXeJKFnNQ=
8484
github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec h1:rdkrEAVD8MeBimjIKkZ+wGm+TkTfG2eDEHUuAjAWkEg=
8585
github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec/go.mod h1:yimSGmjsI+XF1mr+AKBs2//fSXIOhhetHGbMlBEfXbs=
8686
github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a h1:ZKewwwEIURDnufm2oBd9rRvSp45BtRzPPrsUIFtm4V8=
8787
github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a/go.mod h1:EjhPQjEm8HM3GThz5ywNGLEec1P1IjTn08kwzdvupvA=
8888
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
8989
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
90-
github.com/project-codeflare/codeflare-operator v0.0.7-0.20230727155844-a82274750112 h1:009J5DYmfTytsSAif30VBjgeD3ShlIlgI95FC2biwb8=
91-
github.com/project-codeflare/codeflare-operator v0.0.7-0.20230727155844-a82274750112/go.mod h1:vctYasz25RWh/gxUCLLHHiWJnb4VGohEQqksUdaACoU=
92-
github.com/project-codeflare/multi-cluster-app-dispatcher v1.32.0 h1:17lwqvxcWBTi9245lVZgJPvksGwAGA58s8dl7PzpbyE=
93-
github.com/project-codeflare/multi-cluster-app-dispatcher v1.32.0/go.mod h1:fmbU5LuV1Z2Sbu1FCEoVuw8qxDFcalXvkPyMfGZHHTc=
90+
github.com/project-codeflare/codeflare-operator v0.1.1-0.20230817124305-be0dd48b43b4 h1:zEkjcrKhY3XC3TNGWFg6QlFZuC2BWfRufAvv+xrVFb8=
91+
github.com/project-codeflare/codeflare-operator v0.1.1-0.20230817124305-be0dd48b43b4/go.mod h1:BtKefU7oi9bb9M2flQXERqjX3KNTVe9uWkD0C2wdHjM=
92+
github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.0 h1:6a+MnxcFSlheC7RIPGg3s/QCt5+7dD8mJKwdpST7i70=
93+
github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.0/go.mod h1:0J0BDSaIN5lvlmgw+32FcMqe8SflXHtHByUbHmPl4w8=
9494
github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
95-
github.com/ray-project/kuberay/ray-operator v0.0.0-20230614221720-085c29d40fa9 h1:qIThU9GGqEay/y78y4Y9e1FVfrdkH5MFnT0zEJ9yh0A=
96-
github.com/ray-project/kuberay/ray-operator v0.0.0-20230614221720-085c29d40fa9/go.mod h1:2auArgwD9dXXJz1oc7SqQ4U/rHdpwnrBwG98kr8OWXA=
95+
github.com/ray-project/kuberay/ray-operator v0.0.0-20230807232553-238cb4e945b6 h1:0O9dKI7eCPJIzJD/HfzbQgACq4GTr4j+VpwjdS7Qv0w=
96+
github.com/ray-project/kuberay/ray-operator v0.0.0-20230807232553-238cb4e945b6/go.mod h1:hqphTv0O5l6hHf4/OtEn4ie/OHPoVydLograwaK5cHI=
9797
github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ=
9898
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
9999
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@@ -128,8 +128,8 @@ golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR
128128
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
129129
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
130130
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
131-
golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M=
132-
golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
131+
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
132+
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
133133
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
134134
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
135135
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
@@ -144,8 +144,8 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
144144
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
145145
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
146146
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
147-
golang.org/x/term v0.8.0 h1:n5xxQn2i3PC0yLAbjTpNT85q/Kgzcr2gIoX9OrJUols=
148-
golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
147+
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
148+
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
149149
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
150150
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
151151
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -161,7 +161,7 @@ golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBn
161161
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
162162
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
163163
golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
164-
golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4=
164+
golang.org/x/tools v0.9.3 h1:Gn1I8+64MsuTb/HpH+LmQtNas23LhUVr3rYZ0eKuaMM=
165165
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
166166
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
167167
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -208,8 +208,6 @@ honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWh
208208
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
209209
k8s.io/api v0.27.2 h1:+H17AJpUMvl+clT+BPnKf0E3ksMAzoBBg7CntpSuADo=
210210
k8s.io/api v0.27.2/go.mod h1:ENmbocXfBT2ADujUXcBhHV55RIT31IIEvkntP6vZKS4=
211-
k8s.io/apiextensions-apiserver v0.26.1 h1:cB8h1SRk6e/+i3NOrQgSFij1B2S0Y0wDoNl66bn8RMI=
212-
k8s.io/apiextensions-apiserver v0.26.1/go.mod h1:AptjOSXDGuE0JICx/Em15PaoO7buLwTs0dGleIHixSM=
213211
k8s.io/apimachinery v0.27.2 h1:vBjGaKKieaIreI+oQwELalVG4d8f3YAMNpWLzDXkxeg=
214212
k8s.io/apimachinery v0.27.2/go.mod h1:XNfZ6xklnMCOGGFNqXG7bUrQCoR04dh/E7FprV6pb+E=
215213
k8s.io/client-go v0.27.1 h1:oXsfhW/qncM1wDmWBIuDzRHNS2tLhK3BZv512Nc59W8=

‎tests/integration/ray_test.go‎

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,40 @@ func TestRayCluster(t *testing.T) {
7979
test.T().Logf("Created RayJob %s/%s successfully", rayJob.Namespace, rayJob.Name)
8080

8181
// Retrieving the job logs once it has completed or timed out
82-
defer support.WriteRayJobLogs(test, rayJob.Namespace, rayJob.Name)
82+
// Create a route to expose the Ray cluster API
83+
dashboardRoute := &routev1.Route{
84+
TypeMeta: metav1.TypeMeta{
85+
APIVersion: routev1.SchemeGroupVersion.String(),
86+
Kind: "Route",
87+
},
88+
ObjectMeta: metav1.ObjectMeta{
89+
Name: "ray",
90+
Namespace: namespace.Name,
91+
},
92+
Spec: routev1.RouteSpec{
93+
To: routev1.RouteTargetReference{
94+
Name: "raycluster-head-svc",
95+
},
96+
Port: &routev1.RoutePort{
97+
TargetPort: intstr.FromString("dashboard"),
98+
},
99+
},
100+
}
101+
_, err = test.Client().Route().RouteV1().Routes(namespace.Name).Create(test.Ctx(), dashboardRoute, metav1.CreateOptions{})
102+
test.Expect(err).NotTo(HaveOccurred())
103+
test.T().Logf("Created Route %s/%s successfully", dashboardRoute.Namespace, dashboardRoute.Name)
104+
105+
test.T().Logf("Waiting for Route %s/%s to be available", dashboardRoute.Namespace, dashboardRoute.Name)
106+
test.Eventually(support.Route(test, dashboardRoute.Namespace, dashboardRoute.Name), support.TestTimeoutLong).
107+
Should(WithTransform(support.ConditionStatus(routev1.RouteAdmitted), Equal(corev1.ConditionTrue)))
108+
109+
// Retrieve dashboard hostname
110+
dashboard, err := test.Client().Route().RouteV1().Routes(namespace.Name).Get(test.Ctx(), dashboardRoute.Name, metav1.GetOptions{})
111+
test.Expect(err).NotTo(HaveOccurred())
112+
dashboardHostname := dashboard.Status.Ingress[0].Host
113+
114+
rayClient := support.NewRayClusterClient(url.URL{Scheme: "http", Host: dashboardHostname})
115+
defer support.WriteRayJobAPILogs(test, rayClient, support.GetRayJobId(test, rayJob.Namespace, rayJob.Name))
83116

84117
test.T().Logf("Waiting for RayJob %s/%s to complete", rayJob.Namespace, rayJob.Name)
85118
test.Eventually(support.RayJob(test, rayJob.Namespace, rayJob.Name), support.TestTimeoutLong).

0 commit comments

Comments
 (0)