Merge remote-tracking branch 'upstream/main'

Author: CFSNM

tests/common/support/client.go

@@ -27,6 +27,7 @@ import (
 	_ "k8s.io/client-go/plugin/pkg/client/auth"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
+	jobsetclient "sigs.k8s.io/jobset/client-go/clientset/versioned"
 	kueueclient "sigs.k8s.io/kueue/client-go/clientset/versioned"
 
 	imagev1 "github.com/openshift/client-go/image/clientset/versioned"
@@ -40,6 +41,7 @@ type Client interface {
 	Core() kubernetes.Interface
 	Trainer() trainerclient.Interface
 	Kubeflow() kubeflowclient.Interface
+	JobSet() jobsetclient.Interface
 	Kueue() kueueclient.Interface
 	Machine() machinev1.Interface
 	Route() routev1.Interface
@@ -53,6 +55,7 @@ type testClient struct {
 	core     kubernetes.Interface
 	trainer  trainerclient.Interface
 	kubeflow kubeflowclient.Interface
+	jobset   jobsetclient.Interface
 	kueue    kueueclient.Interface
 	machine  machinev1.Interface
 	route    routev1.Interface
@@ -76,6 +79,10 @@ func (t *testClient) Kubeflow() kubeflowclient.Interface {
 	return t.kubeflow
 }
 
+func (t *testClient) JobSet() jobsetclient.Interface {
+	return t.jobset
+}
+
 func (t *testClient) Kueue() kueueclient.Interface {
 	return t.kueue
 }
@@ -131,6 +138,11 @@ func newTestClient(cfg *rest.Config) (Client, *rest.Config, error) {
 		return nil, nil, err
 	}
 
+	jobsetClient, err := jobsetclient.NewForConfig(cfg)
+	if err != nil {
+		return nil, nil, err
+	}
+
 	kueueClient, err := kueueclient.NewForConfig(cfg)
 	if err != nil {
 		return nil, nil, err
@@ -170,6 +182,7 @@ func newTestClient(cfg *rest.Config) (Client, *rest.Config, error) {
 		core:     kubeClient,
 		trainer:  trainerClient,
 		kubeflow: kubeflowClient,
+		jobset:   jobsetClient,
 		kueue:    kueueClient,
 		machine:  machineClient,
 		route:    routeClient,

tests/common/support/jobs.go

@@ -0,0 +1,53 @@
+/*
+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
+
+import (
+	"strings"
+
+	batchv1 "k8s.io/api/batch/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+)
+
+func GetJobByNamePattern(test Test, namespace, pattern string) (*batchv1.Job, error) {
+	test.T().Helper()
+
+	jobs, err := test.Client().Core().BatchV1().Jobs(namespace).List(test.Ctx(), metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	for i := range jobs.Items {
+		job := &jobs.Items[i]
+		if strings.Contains(job.Name, pattern) {
+			return job, nil
+		}
+	}
+
+	return nil, nil
+}
+
+func GetAllJobs(test Test, namespace string) ([]batchv1.Job, error) {
+	test.T().Helper()
+
+	jobs, err := test.Client().Core().BatchV1().Jobs(namespace).List(test.Ctx(), metav1.ListOptions{})
+	if err != nil {
+		return nil, err
+	}
+
+	return jobs.Items, nil
+}

tests/common/support/jobset.go

@@ -0,0 +1,81 @@
+/*
+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
+
+import (
+	"github.com/onsi/gomega"
+
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	jobsetv1alpha2 "sigs.k8s.io/jobset/api/jobset/v1alpha2"
+)
+
+func JobSets(t Test, namespace string) func(g gomega.Gomega) []*jobsetv1alpha2.JobSet {
+	return func(g gomega.Gomega) []*jobsetv1alpha2.JobSet {
+		jobsets, err := t.Client().JobSet().JobsetV1alpha2().JobSets(namespace).List(t.Ctx(), metav1.ListOptions{})
+		g.Expect(err).NotTo(gomega.HaveOccurred())
+
+		jobsetsp := []*jobsetv1alpha2.JobSet{}
+		for _, v := range jobsets.Items {
+			jobsetsp = append(jobsetsp, &v)
+		}
+
+		return jobsetsp
+	}
+}
+
+func SingleJobSet(t Test, namespace string) func(g gomega.Gomega) *jobsetv1alpha2.JobSet {
+	return func(g gomega.Gomega) *jobsetv1alpha2.JobSet {
+		jobsets := JobSets(t, namespace)(g)
+		g.Expect(jobsets).To(gomega.HaveLen(1))
+		return jobsets[0]
+	}
+}
+
+func JobSetReplicatedJobsCount(jobset *jobsetv1alpha2.JobSet) int {
+	if jobset == nil {
+		return 0
+	}
+	return len(jobset.Spec.ReplicatedJobs)
+}
+
+func JobSetCondition(jobset *jobsetv1alpha2.JobSet, conditionType jobsetv1alpha2.JobSetConditionType) metav1.ConditionStatus {
+	if jobset == nil {
+		return metav1.ConditionUnknown
+	}
+	for _, condition := range jobset.Status.Conditions {
+		if string(condition.Type) == string(conditionType) {
+			return condition.Status
+		}
+	}
+	return metav1.ConditionUnknown
+}
+
+func JobSetConditionFailed(jobset *jobsetv1alpha2.JobSet) metav1.ConditionStatus {
+	return JobSetCondition(jobset, jobsetv1alpha2.JobSetFailed)
+}
+
+func JobSetFailureMessage(jobset *jobsetv1alpha2.JobSet) string {
+	if jobset == nil {
+		return ""
+	}
+	for _, condition := range jobset.Status.Conditions {
+		if string(condition.Type) == string(jobsetv1alpha2.JobSetFailed) && condition.Status == metav1.ConditionTrue {
+			return condition.Message
+		}
+	}
+	return ""
+}