fix bug

chriskery · Nov 15, 2023 · 3a89420 · 3a89420
1 parent 2ca8e6f
commit 3a89420
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 1 deletion.
diff --git a/pkg/slurm-agent/slurm.go b/pkg/slurm-agent/slurm.go
@@ -429,7 +429,7 @@ func (ji *JobInfo) fillFromSlurmFields(fields map[string]string) error {
 		case runTime, timeLimit:
 			d, err := ParseDuration(sField)
 			if err != nil {
-				if err == ErrDurationIsUnlimited {
+				if errors.Is(err, ErrDurationIsUnlimited) {
 					continue
 				}
 

diff --git a/pkg/slurm-agent/slurm_test.go b/pkg/slurm-agent/slurm_test.go
@@ -244,6 +244,7 @@ func TestJobInfoFromScontrolResponse(t *testing.T) {
 					BatchHost:  "",
 					NumNodes:   "1-1",
 					ArrayJobID: "192",
+					Reason:     "Resources",
 				},
 				{
 					ID:         "196",
@@ -263,6 +264,7 @@ func TestJobInfoFromScontrolResponse(t *testing.T) {
 					BatchHost:  "vagrant",
 					NumNodes:   "1",
 					ArrayJobID: "192",
+					Reason:     "None",
 				},
 			},
 		},

diff --git a/pkg/slurm-bridge-operator/pod.go b/pkg/slurm-bridge-operator/pod.go
@@ -47,6 +47,7 @@ func (r *SlurmBridgeJobReconciler) newSizeCarPodForSJ(sjb *v1alpha1.SlurmBridgeJ
 			Containers: []corev1.Container{
 				{
 					Name:            sjb.Name,
+					Image:           "useless-image",
 					Resources:       corev1.ResourceRequirements{Requests: resourceList, Limits: resourceList},
 					Command:         []string{sjb.Spec.SbatchScript},
 					SecurityContext: &corev1.SecurityContext{RunAsUser: sjb.Spec.RunAsUser},

diff --git a/pkg/slurm-bridge-operator/slurmbridgejob_controller.go b/pkg/slurm-bridge-operator/slurmbridgejob_controller.go
@@ -410,6 +410,7 @@ func (r *SlurmBridgeJobReconciler) newWorkerPodForSJ(sizecarPod *corev1.Pod, sjb
 		sc := r.getWorkerPodContainerSecurityContext(jobInfo)
 		containers = append(containers, corev1.Container{
 			Name:            jobInfo.Id,
+			Image:           "useless-image",
 			SecurityContext: sc,
 			WorkingDir:      jobInfo.WorkingDir,
 		})