Skip to content

Commit 7100c8e

Browse files
roehrich-hperoehrich-hpe
authored
Merge pull request #105 from NearNodeFlash/api-dws-v1alpha3
Api dws v1alpha3
2 parents 93c4ccb + ac24f94 commit 7100c8e

8 files changed

Lines changed: 89 additions & 89 deletions

File tree

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.22.0
55
toolchain go1.22.5
66

77
require (
8-
github.com/DataWorkflowServices/dws v0.0.1-0.20250219193729-7e8e8fb274cc
8+
github.com/DataWorkflowServices/dws v0.0.1-0.20250220163524-4a80681e97d6
99
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250219194350-45aad5cbbe17
1010
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250219193635-3e6c6b39d0e0 // indirect
11-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250219195921-c95d3e1f4847
11+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250220201045-00c477f87270
1212
github.com/onsi/ginkgo/v2 v2.22.2
1313
github.com/onsi/gomega v1.36.2
1414
go.openly.dev/pointy v1.3.0

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
github.com/DataWorkflowServices/dws v0.0.1-0.20250219193729-7e8e8fb274cc h1:ZgS/KQEaPDpC4r6Aoe5QUHDORolmWu/pOh/uaL+Vtc0=
2-
github.com/DataWorkflowServices/dws v0.0.1-0.20250219193729-7e8e8fb274cc/go.mod h1:i9v4K2d64a9uyd9ZazOJ85RWzVQjIgHWXkLo895KDAE=
1+
github.com/DataWorkflowServices/dws v0.0.1-0.20250220163524-4a80681e97d6 h1:ZW5Rbr4GHaOZ133F/ejp5DC2OVYIHaLULNeop3SKg1o=
2+
github.com/DataWorkflowServices/dws v0.0.1-0.20250220163524-4a80681e97d6/go.mod h1:i9v4K2d64a9uyd9ZazOJ85RWzVQjIgHWXkLo895KDAE=
33
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250219194350-45aad5cbbe17 h1:xYLLW3fMEKauujqkmspeWoyWhEEu+capOKUPePo4IuU=
44
github.com/NearNodeFlash/lustre-fs-operator v0.0.1-0.20250219194350-45aad5cbbe17/go.mod h1:H9GBWOmFp9BGGBWDVZk0pvPWzL6jUKkieVsIIoPlzMs=
55
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250219193635-3e6c6b39d0e0 h1:5arAC1ZW6QRZsv4Sowhno3EeYtFTnYc/4Ody08shDDY=
66
github.com/NearNodeFlash/nnf-ec v0.0.1-0.20250219193635-3e6c6b39d0e0/go.mod h1:lx13ustzE/+39fLECky+CFKkAV8GYlX9eaI6IGmHQkY=
7-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250219195921-c95d3e1f4847 h1:516z10h+aC5axNwKgcuCVwMnBuIKq8eciEwGZY8a3T4=
8-
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250219195921-c95d3e1f4847/go.mod h1:i2qbqovQgHOTYwvrwf6tUA0ZTEt00AlrjB1Bu1/Ew8M=
7+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250220201045-00c477f87270 h1:I2GRlsBRlhQnSZ44lcSDPkH0V973SKuHx5oizaeSpFQ=
8+
github.com/NearNodeFlash/nnf-sos v0.0.1-0.20250220201045-00c477f87270/go.mod h1:rhBz5IYcLu4Tx48icqMJPLmPSaR14AYLD5MjNJoMRqQ=
99
github.com/benbjohnson/clock v1.1.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
1010
github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
1111
github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=

‎int_test.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Hewlett Packard Enterprise Development LP
2+
* Copyright 2023-2025 Hewlett Packard Enterprise Development LP
33
* Other additional copyright holders may be indicated within.
44
*
55
* The entirety of this work is licensed under the Apache License,
@@ -28,7 +28,7 @@ import (
2828
. "github.com/onsi/gomega"
2929
"go.openly.dev/pointy"
3030

31-
dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
31+
dwsv1alpha3 "github.com/DataWorkflowServices/dws/api/v1alpha3"
3232
)
3333

3434
var (
@@ -41,9 +41,9 @@ var (
4141
highTimeout = "5m"
4242

4343
// Which states use the high timeout
44-
highTimeoutStates = []dwsv1alpha2.WorkflowState{
45-
dwsv1alpha2.StateSetup,
46-
dwsv1alpha2.StateTeardown,
44+
highTimeoutStates = []dwsv1alpha3.WorkflowState{
45+
dwsv1alpha3.StateSetup,
46+
dwsv1alpha3.StateTeardown,
4747
}
4848
)
4949

@@ -143,17 +143,17 @@ var tests = []*T{
143143
"#DW container name=prerun-timeout-mpi profile=example-mpi-prerun-timeout").
144144
WithPermissions(1050, 1051).WithLabels("mpi", "timeout").
145145
WithContainerProfile("example-mpi", &ContainerProfileOptions{PrerunTimeoutSeconds: pointy.Int(1), NoStorage: true}).
146-
ExpectError(dwsv1alpha2.StatePreRun),
146+
ExpectError(dwsv1alpha3.StatePreRun),
147147
MakeTest("PostRun timeout on MPI containers",
148148
"#DW container name=postrun-timeout-mpi profile=example-mpi-postrun-timeout").
149149
WithPermissions(1050, 1051).WithLabels("mpi", "timeout").
150150
WithContainerProfile("example-mpi-webserver", &ContainerProfileOptions{PostrunTimeoutSeconds: pointy.Int(1), NoStorage: true}).
151-
ExpectError(dwsv1alpha2.StatePostRun),
151+
ExpectError(dwsv1alpha3.StatePostRun),
152152
MakeTest("Non-zero exit on MPI containers",
153153
"#DW container name=mpi-container-fail profile=example-mpi-fail-noretry").
154154
WithPermissions(1050, 1051).WithLabels("mpi", "fail").
155155
WithContainerProfile("example-mpi-fail", &ContainerProfileOptions{RetryLimit: pointy.Int(0)}).
156-
ExpectError(dwsv1alpha2.StatePostRun),
156+
ExpectError(dwsv1alpha3.StatePostRun),
157157

158158
// Containers - Non-MPI
159159
MakeTest("GFS2 with Containers",
@@ -175,27 +175,27 @@ var tests = []*T{
175175
"#DW container name=prerun-timeout profile=example-prerun-timeout").
176176
WithPermissions(1050, 1051).WithLabels("non-mpi", "timeout").
177177
WithContainerProfile("example-forever", &ContainerProfileOptions{PrerunTimeoutSeconds: pointy.Int(1), NoStorage: true}).
178-
ExpectError(dwsv1alpha2.StatePreRun),
178+
ExpectError(dwsv1alpha3.StatePreRun),
179179
MakeTest("PostRun timeout on non-MPI containers",
180180
"#DW container name=postrun-timeout profile=example-postrun-timeout").
181181
WithPermissions(1050, 1051).WithLabels("non-mpi", "timeout").
182182
WithContainerProfile("example-forever", &ContainerProfileOptions{PostrunTimeoutSeconds: pointy.Int(1), NoStorage: true}).
183-
ExpectError(dwsv1alpha2.StatePostRun),
183+
ExpectError(dwsv1alpha3.StatePostRun),
184184
MakeTest("Non-zero exit on non-MPI containers",
185185
"#DW container name=container-fail profile=example-fail-noretry").
186186
WithPermissions(1050, 1051).WithLabels("non-mpi", "fail").
187187
WithContainerProfile("example-fail", &ContainerProfileOptions{RetryLimit: pointy.Int(0)}).
188-
ExpectError(dwsv1alpha2.StatePostRun),
188+
ExpectError(dwsv1alpha3.StatePostRun),
189189

190190
// Containers - Unsupported Filesystems. These should fail as xfs/raw filesystems are not supported for containers.
191191
MakeTest("XFS with Containers",
192192
"#DW jobdw type=xfs name=xfs-with-containers capacity=100GB",
193193
"#DW container name=xfs-with-containers profile=example-success DW_JOB_foo_local_storage=xfs-with-containers").
194-
ExpectError(dwsv1alpha2.StateProposal).WithLabels("unsupported-fs"),
194+
ExpectError(dwsv1alpha3.StateProposal).WithLabels("unsupported-fs"),
195195
MakeTest("Raw with Containers",
196196
"#DW jobdw type=raw name=raw-with-containers capacity=100GB",
197197
"#DW container name=raw-with-containers profile=example-success DW_JOB_foo_local_storage=raw-with-containers").
198-
ExpectError(dwsv1alpha2.StateProposal).WithLabels("unsupported-fs"),
198+
ExpectError(dwsv1alpha3.StateProposal).WithLabels("unsupported-fs"),
199199

200200
// Containers - Multiple Storages
201201
MakeTest("GFS2 and Lustre with Containers",
@@ -250,7 +250,7 @@ var _ = Describe("NNF Integration Test", func() {
250250
// TODO: Ginkgo's `--fail-fast` option still seems to execute DeferCleanup() calls
251251
// See if this is by design or if we might need to move this to an AfterEach()
252252
if !context.SpecReport().Failed() {
253-
t.AdvanceStateAndWaitForReady(ctx, k8sClient, workflow, dwsv1alpha2.StateTeardown)
253+
t.AdvanceStateAndWaitForReady(ctx, k8sClient, workflow, dwsv1alpha3.StateTeardown)
254254

255255
Expect(k8sClient.Delete(ctx, workflow)).To(Succeed())
256256
}

‎internal/internal.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2023 Hewlett Packard Enterprise Development LP
2+
* Copyright 2023-2025 Hewlett Packard Enterprise Development LP
33
* Other additional copyright holders may be indicated within.
44
*
55
* The entirety of this work is licensed under the Apache License,
@@ -29,7 +29,7 @@ import (
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/util/intstr"
3131

32-
dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
32+
dwsv1alpha3 "github.com/DataWorkflowServices/dws/api/v1alpha3"
3333
"github.com/DataWorkflowServices/dws/utils/dwdparse"
3434
)
3535

@@ -68,7 +68,7 @@ type T struct {
6868
decorators []interface{}
6969

7070
// Workflow defines the DWS Workflow resource that is the target of the test.
71-
workflow *dwsv1alpha2.Workflow
71+
workflow *dwsv1alpha3.Workflow
7272

7373
// User Id to use for the workflow
7474
userId int
@@ -84,7 +84,7 @@ type T struct {
8484
helperPods []*corev1.Pod
8585

8686
// Compute nodes that were assigned to the test. This is determined at test runtime.
87-
computes *dwsv1alpha2.Computes
87+
computes *dwsv1alpha3.Computes
8888
}
8989

9090
func MakeTest(name string, directives ...string) *T {
@@ -118,13 +118,13 @@ func MakeTest(name string, directives ...string) *T {
118118
t.directives = []string{}
119119
}
120120

121-
t.workflow = &dwsv1alpha2.Workflow{
121+
t.workflow = &dwsv1alpha3.Workflow{
122122
ObjectMeta: metav1.ObjectMeta{
123123
Name: t.WorkflowName(),
124124
Namespace: corev1.NamespaceDefault,
125125
},
126-
Spec: dwsv1alpha2.WorkflowSpec{
127-
DesiredState: dwsv1alpha2.StateProposal,
126+
Spec: dwsv1alpha3.WorkflowSpec{
127+
DesiredState: dwsv1alpha3.StateProposal,
128128
DWDirectives: t.WorkflowDirectives(),
129129
JobID: intstr.FromInt(GinkgoParallelProcess()),
130130
WLMID: strconv.Itoa(GinkgoParallelProcess()),
@@ -145,7 +145,7 @@ func (t *T) WorkflowDirectives() []string {
145145
return t.directives
146146
}
147147

148-
func (t *T) Workflow() *dwsv1alpha2.Workflow {
148+
func (t *T) Workflow() *dwsv1alpha3.Workflow {
149149
return t.workflow
150150
}
151151

‎internal/options.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import (
3535
corev1 "k8s.io/api/core/v1"
3636
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3737

38-
dwsv1alpha2 "github.com/DataWorkflowServices/dws/api/v1alpha2"
38+
dwsv1alpha3 "github.com/DataWorkflowServices/dws/api/v1alpha3"
3939
lusv1alpha1 "github.com/NearNodeFlash/lustre-fs-operator/api/v1alpha1"
4040
nnfv1alpha6 "github.com/NearNodeFlash/nnf-sos/api/v1alpha6"
4141

@@ -57,7 +57,7 @@ type TOptions struct {
5757
hardwareRequired bool
5858
lowTimeout time.Duration
5959
highTimeout time.Duration
60-
highTimeoutStates []dwsv1alpha2.WorkflowState
60+
highTimeoutStates []dwsv1alpha3.WorkflowState
6161
useExternalComputes bool
6262
}
6363

@@ -67,21 +67,21 @@ func (o *TOptions) hasComplexOptions() bool {
6767
}
6868

6969
type TStopAfter struct {
70-
state dwsv1alpha2.WorkflowState
70+
state dwsv1alpha3.WorkflowState
7171
}
7272

7373
// Stop after lets you stop a test after a given state is reached
74-
func (t *T) StopAfter(state dwsv1alpha2.WorkflowState) *T {
74+
func (t *T) StopAfter(state dwsv1alpha3.WorkflowState) *T {
7575
t.options.stopAfter = &TStopAfter{state: state}
7676
return t
7777
}
7878

7979
type TExpectError struct {
80-
state dwsv1alpha2.WorkflowState
80+
state dwsv1alpha3.WorkflowState
8181
}
8282

8383
// Expect an error at the designed state; Proceed to teardown
84-
func (t *T) ExpectError(state dwsv1alpha2.WorkflowState) *T {
84+
func (t *T) ExpectError(state dwsv1alpha3.WorkflowState) *T {
8585
t.options.expectError = &TExpectError{state: state}
8686
t.options.stopAfter = &TStopAfter{state: state}
8787
return t.WithLabels("error")

0 commit comments

Comments
 (0)