Need the job package to be public

gvallee · Feb 1, 2021 · ddab3fe · ddab3fe
1 parent 9dea2cd
commit ddab3fe
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 11 deletions.
diff --git a/pkg/jm/jm.go b/pkg/jm/jm.go
@@ -1,5 +1,5 @@
 // Copyright (c) 2019, Sylabs Inc. All rights reserved.
-// Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -14,8 +14,8 @@ import (
 	"path/filepath"
 
 	"github.com/gvallee/go_exec/pkg/advexec"
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 	"github.com/gvallee/go_util/pkg/util"
 )
 

diff --git a/pkg/jm/jm_test.go b/pkg/jm/jm_test.go
@@ -9,8 +9,8 @@ package jm
 import (
 	"testing"
 
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 	"github.com/gvallee/go_util/pkg/util"
 )
 

diff --git a/pkg/jm/jobmgr_native.go b/pkg/jm/jobmgr_native.go
@@ -1,4 +1,5 @@
 // Copyright (c) 2019, Sylabs Inc. All rights reserved.
+// Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -11,8 +12,8 @@ import (
 	"strconv"
 
 	"github.com/gvallee/go_exec/pkg/advexec"
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/mpi"
 )
 

diff --git a/pkg/jm/jobmgr_prun.go b/pkg/jm/jobmgr_prun.go
@@ -1,4 +1,5 @@
 // Copyright (c) 2019, Sylabs Inc. All rights reserved.
+// Copyright (c) 2021, NVIDIA CORPORATION. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -11,8 +12,8 @@ import (
 	"os/exec"
 
 	"github.com/gvallee/go_exec/pkg/advexec"
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 )
 
 // Prun is the structure representing the native job manager (i.e., directly use mpirun)

diff --git a/pkg/jm/jobmgr_slurm.go b/pkg/jm/jobmgr_slurm.go
@@ -1,5 +1,5 @@
 // Copyright (c) 2019, Sylabs Inc. All rights reserved.
-// Copyright (c) 2020, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2020-2021, NVIDIA CORPORATION. All rights reserved.
 // This software is licensed under a 3-clause BSD license. Please consult the
 // LICENSE.md file distributed with the sources of this project regarding your
 // rights to use or distribute this software.
@@ -16,9 +16,9 @@ import (
 	"strings"
 
 	"github.com/gvallee/go_exec/pkg/advexec"
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/slurm"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/mpi"
 	"github.com/gvallee/go_util/pkg/util"
 )

diff --git a/pkg/jm/jobmgr_slurm_test.go b/pkg/jm/jobmgr_slurm_test.go
@@ -15,8 +15,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 )
 
 var partition = flag.String("partition", "", "Name of Slurm partition to use to run the test")

diff --git a/internal/pkg/job/job.go → pkg/job/job.go b/internal/pkg/job/job.go → pkg/job/job.go
diff --git a/pkg/launcher/launcher.go b/pkg/launcher/launcher.go
@@ -17,9 +17,9 @@ import (
 
 	"github.com/gvallee/go_exec/pkg/advexec"
 	"github.com/gvallee/go_exec/pkg/results"
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/sys"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/jm"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/mpi"
 )
 

diff --git a/pkg/launcher/launcher_test.go b/pkg/launcher/launcher_test.go
@@ -14,8 +14,8 @@ import (
 	"os/exec"
 	"testing"
 
-	"github.com/gvallee/go_hpc_jobmgr/internal/pkg/job"
 	"github.com/gvallee/go_hpc_jobmgr/pkg/jm"
+	"github.com/gvallee/go_hpc_jobmgr/pkg/job"
 )
 
 var partition = flag.String("partition", "", "Name of Slurm partition to use to run the test")
@@ -42,7 +42,7 @@ func TestSlurmLaunch(t *testing.T) {
 	defer os.RemoveAll(sysCfg.ScratchDir)
 
 	if jobmgr.ID != jm.SlurmID {
-		t.Fatalf("Slurm not available, skipping")
+		t.Skipf("Slurm not available, skipping")
 	}
 
 	res, execRes := Run(&j, nil, &jobmgr, &sysCfg, nil)