Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update jobset configs #101

Merged
merged 1 commit into from
Aug 17, 2024
Merged

update jobset configs #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/examples/jobset/jobset.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ kubectl apply --server-side -f https://github.com/kubernetes-sigs/jobset/release

Run a jobset with workers:
```shell
./bin/knavigator -workflow ./resources/workflows/k8s/test-jobset.yml
./bin/knavigator -workflow ./resources/workflows/jobset/test-jobset.yaml
```

Run a jobset with a driver and workers:
```shell
./bin/knavigator -workflow ./resources/workflows/k8s/test-jobset-with-driver.yml
./bin/knavigator -workflow ./resources/workflows/jobset/test-jobset-with-driver.yaml
```
4 changes: 2 additions & 2 deletions docs/examples/kueue/kueue.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@ kubectl apply -f charts/overrides/kueue/priority.yaml

Run a kueue job:
```bash
./bin/knavigator -workflow resources/workflows/kueue/test-job.yml -cleanup
./bin/knavigator -workflow resources/workflows/kueue/test-job.yaml -cleanup
```

Run a preemption workflow with kueue:
```bash
./bin/knavigator -workflow resources/workflows/kueue/test-preemption.yml -cleanup
./bin/knavigator -workflow resources/workflows/kueue/test-preemption.yaml -cleanup
```
2 changes: 1 addition & 1 deletion pkg/config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func TestWorkflowPaths(t *testing.T) {
},
{
name: "Case 3: Valid input",
paths: "../../resources/workflows/volcano,../../resources/workflows/k8s/{test-job.yml,test-jobset.yml}",
paths: "../../resources/workflows/volcano,../../resources/workflows/kueue/{test-job.yaml,test-preemption.yaml}",
count: 3,
},
}
Expand Down
0 ...rces/templates/k8s/jobset-with-driver.yml → .../templates/jobset/jobset-with-driver.yaml
View file
Open in desktop
File renamed without changes.
0 resources/templates/k8s/jobset.yml → resources/templates/jobset/jobset.yaml
View file
Open in desktop
File renamed without changes.
10 changes: 5 additions & 5 deletions ...workflows/k8s/test-jobset-with-driver.yml → ...flows/jobset/test-jobset-with-driver.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ tasks:
- id: register
type: RegisterObj
params:
template: "resources/templates/k8s/jobset-with-driver.yml"
template: "resources/templates/jobset/jobset-with-driver.yaml"
nameFormat: "jobset{{._ENUM_}}"
podNameFormat: "{{._NAME_}}-(worker|driver)-[0-9]+-[0-9]+-.+"
podCount: "{{.replicas}}"
podNameFormat: "{{._NAME_}}-(workers|driver)-[0-9]+-[0-9]+-.+"
podCount: "{{.replicas}} * 2"
- id: configure
type: Configure
params:
Expand All @@ -47,10 +47,10 @@ tasks:
cpu: 100m
memory: 512M
gpu: 8
ttl: "10s"
ttl: "20s"
- id: status
type: CheckPod
params:
refTaskId: jobset
status: Running
timeout: 5s
timeout: 10s
6 changes: 3 additions & 3 deletions resources/workflows/k8s/test-jobset.yml → resources/workflows/jobset/test-jobset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ tasks:
- id: register
type: RegisterObj
params:
template: "resources/templates/k8s/jobset.yml"
template: "resources/templates/jobset/jobset.yaml"
nameFormat: "jobset{{._ENUM_}}"
podNameFormat: "{{._NAME_}}-workers-[0-9]+-[0-9]+-.+"
podCount: "{{.replicas}}"
Expand Down Expand Up @@ -47,10 +47,10 @@ tasks:
cpu: 100m
memory: 512M
gpu: 8
ttl: "10s"
ttl: "20s"
- id: status
type: CheckPod
params:
refTaskId: jobset
status: Running
timeout: 5s
timeout: 10s
6 changes: 3 additions & 3 deletions resources/workflows/kueue/test-job.yml → resources/workflows/kueue/test-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,18 @@ tasks:
cpu: 100m
memory: 512M
gpu: 8
ttl: "10s"
ttl: "20s"
- id: status
type: CheckObj
params:
refTaskId: job
state:
status:
active: 3
timeout: 5s
timeout: 10s
- id: status
type: CheckPod
params:
refTaskId: job
status: Running
timeout: 5s
timeout: 10s
0 ...urces/workflows/kueue/test-preemption.yml → ...rces/workflows/kueue/test-preemption.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/ci/test_jobset.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ deploy_kwok
deploy_jobset

# Run knavigator with an example test
${REPO_HOME}/bin/knavigator -workflow ${REPO_HOME}/resources/workflows/k8s/test-jobset.yml -v 4 -cleanup
${REPO_HOME}/bin/knavigator -workflow ${REPO_HOME}/resources/workflows/jobset/test-jobset.yaml -v 4 -cleanup
2 changes: 1 addition & 1 deletion tests/ci/test_kueue.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ deploy_kwok
deploy_kueue

# Run knavigator with an example test
${REPO_HOME}/bin/knavigator -workflow ${REPO_HOME}/resources/workflows/kueue/test-job.yml -v 4 -cleanup
${REPO_HOME}/bin/knavigator -workflow ${REPO_HOME}/resources/workflows/kueue/test-job.yaml -v 4 -cleanup
Loading