Merge branch 'main' into master

Author: dgruber

Dockerfile

@@ -29,7 +29,7 @@ COPY autoinstall.template /opt/helpers/
 COPY installer.sh /opt/helpers/
 COPY entrypoint.sh /entrypoint.sh
 
-ARG GOLANG_VERSION=1.23.5
+ARG GOLANG_VERSION=1.23.6
 
 RUN apt-get update && \
     apt-get install -y curl wget git gcc make vim libhwloc-dev hwloc software-properties-common man-db  && \

Makefile

@@ -21,7 +21,7 @@
 # This Makefile is used for development and testing purposes only.
 
 IMAGE_NAME = $(shell basename $(CURDIR))
-IMAGE_TAG = V901_TAG
+IMAGE_TAG = V902_TAG
 CONTAINER_NAME = $(IMAGE_NAME)
 
 .PHONY: build

pkg/qacct/v9.0/file_test.go

@@ -25,34 +25,35 @@ var _ = Describe("File", func() {
 
 		It("returns a channel that emits JobDetail objects for 10 jobs", func() {
 
+			jobDetailsChan, err := qacct.WatchFile(context.Background(),
+				qacct.GetDefaultQacctFile(), 0)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(jobDetailsChan).NotTo(BeNil())
+
 			qs, err := qsub.NewCommandLineQSub(qsub.CommandLineQSubConfig{})
 			Expect(err).NotTo(HaveOccurred())
 
 			jobIDs := make([]int, 10)
 			for i := 0; i < 10; i++ {
-				jobID, _, err := qs.Submit(context.Background(), qsub.JobOptions{
-					Command:     "echo",
-					CommandArgs: []string{fmt.Sprintf("job %d", i+1)},
-					Binary:      qsub.ToPtr(true),
-				})
+				jobID, _, err := qs.Submit(context.Background(),
+					qsub.JobOptions{
+						Command:     "/bin/bash",
+						CommandArgs: []string{"-c", fmt.Sprintf("echo job %d; sleep 0", i+1)},
+						Binary:      qsub.ToPtr(true),
+					})
 				Expect(err).NotTo(HaveOccurred())
 				log.Printf("jobID: %d", jobID)
 				jobIDs[i] = int(jobID)
 			}
 
-			jobDetailsChan, err := qacct.WatchFile(context.Background(),
-				qacct.GetDefaultQacctFile(), 0)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(jobDetailsChan).NotTo(BeNil())
-
 			receivedJobs := make(map[int]bool)
 			Eventually(func() bool {
 				select {
 				case jd := <-jobDetailsChan:
 					log.Printf("job: %+v", jd.JobNumber)
 					// check if jobID is in the jobIDs list
 					if slices.Contains(jobIDs, int(jd.JobNumber)) {
-						Expect(jd.SubmitCommandLine).To(ContainSubstring("echo 'job"))
+						Expect(jd.SubmitCommandLine).To(ContainSubstring("bash"))
 						Expect(jd.JobUsage.Usage.Memory).To(BeNumerically(">=", 0))
 						receivedJobs[int(jd.JobNumber)] = true
 					}

pkg/qstat/v9.0/parser_test.go

@@ -516,6 +516,7 @@ test.q@master                  BIP   0/0/10         0.55     lx-amd64
 
 			Expect(full[1].QueueName).To(Equal("test.q@master"))
 			Expect(full[1].Jobs).To(HaveLen(0))
+
 		})
 
 	})

pkg/qstat/v9.0/qstat.go

@@ -45,7 +45,9 @@ type QStat interface {
 	ShowFullOutputWithResources(resourceAttributes string) ([]JobInfo, error)
 	// qstat -g c
 	DisplayClusterQueueSummary() ([]ClusterQueueSummary, error)
+	// qstat -g d shows all job array tasks individually
 	DisplayAllJobArrayTasks() ([]JobArrayTask, error)
+	// qstat -g p shows all parallel job tasks individually
 	DisplayAllParallelJobTasks() ([]ParallelJobTask, error)
 	// qstat -help
 	ShowHelp() (string, error)