Merge remote-tracking branch 'upstream/main'

Author: CFSNM

README.md

@@ -18,15 +18,15 @@
 
 ### Common environment variables
 
-* `CODEFLARE_TEST_OUTPUT_DIR` - Output directory for test logs
-* `CODEFLARE_TEST_TIMEOUT_SHORT` - Timeout duration for short tasks
-* `CODEFLARE_TEST_TIMEOUT_MEDIUM` - Timeout duration for medium tasks
-* `CODEFLARE_TEST_TIMEOUT_LONG` - Timeout duration for long tasks
-* `CODEFLARE_TEST_RAY_IMAGE` (Optional) - Ray image used for raycluster configuration 
+* `TEST_OUTPUT_DIR` - Output directory for test logs
+* `TEST_TIMEOUT_SHORT` - Timeout duration for short tasks
+* `TEST_TIMEOUT_MEDIUM` - Timeout duration for medium tasks
+* `TEST_TIMEOUT_LONG` - Timeout duration for long tasks
+* `TEST_RAY_IMAGE` (Optional) - Ray image used for raycluster configuration
 * `MINIO_CLI_IMAGE` (Optional) - Minio CLI image used for uploading/downloading data from/into s3 bucket
 * `TEST_TIER` (Optional) - Specifies test tier to run, skipping tests which don't belong to specified test tier. Supported test tiers: Smoke, Sanity, Tier1, Tier2, Tier3, Pre-Upgrade and Post-Upgrade.
 
-    NOTE: `quay.io/modh/ray:2.35.0-py311-cu121` is the default image used for creating a RayCluster resource. If you have your own custom ray image which suits your purposes, specify it in `CODEFLARE_TEST_RAY_IMAGE` environment variable.
+    NOTE: `quay.io/modh/ray:2.35.0-py311-cu121` is the default image used for creating a RayCluster resource. If you have your own custom ray image which suits your purposes, specify it in `TEST_RAY_IMAGE` environment variable.
 
 ### Environment variables for fms-hf-tuning test suite
 

go.mod

@@ -6,8 +6,9 @@ require (
 	github.com/kubeflow/training-operator v1.7.0
 	github.com/matoous/go-nanoid/v2 v2.1.0
 	github.com/onsi/gomega v1.32.0
+	github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec
+	github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a
 	github.com/project-codeflare/appwrapper v0.8.0
-	github.com/project-codeflare/codeflare-common v0.0.0-20250317102908-1c124db97844
 	github.com/prometheus/client_golang v1.20.4
 	github.com/prometheus/common v0.57.0
 	github.com/ray-project/kuberay/ray-operator v1.1.1
@@ -18,9 +19,7 @@ require (
 )
 
 require (
-	github.com/aymerick/douceur v0.2.0 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.2.1 // indirect
 	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
@@ -31,29 +30,22 @@ require (
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/swag v0.22.4 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
-	github.com/golang/glog v1.0.0 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.1 // indirect
-	github.com/gorilla/css v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/jpillora/backoff v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/klauspost/compress v1.17.9 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
-	github.com/microcosm-cc/bluemonday v1.0.18 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
-	github.com/openshift-online/ocm-sdk-go v0.1.368 // indirect
-	github.com/openshift/api v0.0.0-20230718161610-2a3e8b481cec // indirect
-	github.com/openshift/client-go v0.0.0-20230718165156-6014fb98e86a // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/prometheus/client_model v0.6.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect

go.sum

@@ -20,7 +20,7 @@ import (
 	"os"
 	"slices"
 
-	. "github.com/project-codeflare/codeflare-common/support"
+	. "github.com/opendatahub-io/distributed-workloads/tests/common/support"
 )
 
 const (

tests/common/environment.go

@@ -22,13 +22,14 @@ import (
 	"strings"
 
 	gomega "github.com/onsi/gomega"
-	. "github.com/project-codeflare/codeflare-common/support"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/yaml"
+
+	. "github.com/opendatahub-io/distributed-workloads/tests/common/support"
 )
 
 const (

tests/common/notebook.go

@@ -0,0 +1,34 @@
+/*
+Copyright 2025.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package support
+
+var (
+	AMD    = Accelerator{Type: "gpu", ResourceLabel: "amd.com/gpu"}
+	CPU    = Accelerator{Type: "cpu"}
+	NVIDIA = Accelerator{Type: "gpu", ResourceLabel: "nvidia.com/gpu", PrometheusGpuUtilizationLabel: "DCGM_FI_DEV_GPU_UTIL"}
+)
+
+type Accelerator struct {
+	Type                          string
+	ResourceLabel                 string
+	PrometheusGpuUtilizationLabel string
+}
+
+// Method to check if the accelerator is a GPU
+func (a Accelerator) IsGpu() bool {
+	return a != CPU
+}

tests/common/support/accelerator.go

@@ -0,0 +1,40 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package support
+
+import (
+	"github.com/onsi/gomega"
+
+	authenticationv1 "k8s.io/api/authentication/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func CreateToken(t Test, namespace string, serviceAccount *corev1.ServiceAccount) string {
+	t.T().Helper()
+
+	treq := &authenticationv1.TokenRequest{
+		Spec: authenticationv1.TokenRequestSpec{
+			ExpirationSeconds: Ptr(int64(3600)),
+		},
+	}
+	treq, err := t.Client().Core().CoreV1().ServiceAccounts(namespace).CreateToken(t.Ctx(), serviceAccount.Name, treq, metav1.CreateOptions{})
+	t.Expect(err).NotTo(gomega.HaveOccurred())
+	t.T().Logf("Created TokenRequest %s/%s successfully", treq.Namespace, treq.Name)
+
+	return treq.Status.Token
+}

tests/common/support/authentication.go

@@ -0,0 +1,55 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package support
+
+import (
+	"github.com/onsi/gomega"
+
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func Job(t Test, namespace, name string) func(g gomega.Gomega) *batchv1.Job {
+	return func(g gomega.Gomega) *batchv1.Job {
+		job, err := t.Client().Core().BatchV1().Jobs(namespace).Get(t.Ctx(), name, metav1.GetOptions{})
+		g.Expect(err).NotTo(gomega.HaveOccurred())
+		return job
+	}
+}
+
+func GetJob(t Test, namespace, name string) *batchv1.Job {
+	t.T().Helper()
+	return Job(t, namespace, name)(t)
+}
+
+func JobConditionCompleted(job *batchv1.Job) corev1.ConditionStatus {
+	return JobCondition(job, batchv1.JobComplete)
+}
+
+func JobConditionFailed(job *batchv1.Job) corev1.ConditionStatus {
+	return JobCondition(job, batchv1.JobFailed)
+}
+
+func JobCondition(job *batchv1.Job, conditionType batchv1.JobConditionType) corev1.ConditionStatus {
+	for _, condition := range job.Status.Conditions {
+		if condition.Type == conditionType {
+			return condition.Status
+		}
+	}
+	return corev1.ConditionUnknown
+}

tests/common/support/batch.go

@@ -0,0 +1,47 @@
+/*
+Copyright 2023.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package support
+
+import (
+	"testing"
+
+	"github.com/onsi/gomega"
+
+	batchv1 "k8s.io/api/batch/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func TestGetJob(t *testing.T) {
+
+	test := NewTest(t)
+
+	Job := &batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "my-job-1",
+			Namespace: "my-namespace",
+		},
+	}
+
+	test.client.Core().BatchV1().Jobs("my-namespace").Create(test.ctx, Job, metav1.CreateOptions{})
+
+	// Call the Job function using the fake client
+	jobs := GetJob(test, "my-namespace", "my-job-1")
+
+	test.Expect(jobs.Name).To(gomega.Equal("my-job-1"))
+	test.Expect(jobs.Namespace).To(gomega.Equal("my-namespace"))
+
+}