update jobset configs

Signed-off-by: Dmitry Shmulevich <[email protected]>
NVIDIA · Aug 17, 2024 · cd85c38 · cd85c38
1 parent 320d1ec
commit cd85c38
Show file tree

Hide file tree

Showing 11 changed files with 18 additions and 18 deletions.
diff --git a/docs/examples/jobset/jobset.md b/docs/examples/jobset/jobset.md
@@ -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
 ```
diff --git a/docs/examples/kueue/kueue.md b/docs/examples/kueue/kueue.md
@@ -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
 ```
diff --git a/pkg/config/config_test.go b/pkg/config/config_test.go
@@ -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,
 		},
 	}

diff --git a/...rces/templates/k8s/jobset-with-driver.yml → .../templates/jobset/jobset-with-driver.yaml b/...rces/templates/k8s/jobset-with-driver.yml → .../templates/jobset/jobset-with-driver.yaml
diff --git a/resources/templates/k8s/jobset.yml → resources/templates/jobset/jobset.yaml b/resources/templates/k8s/jobset.yml → resources/templates/jobset/jobset.yaml
diff --git a/...workflows/k8s/test-jobset-with-driver.yml → ...flows/jobset/test-jobset-with-driver.yaml b/...workflows/k8s/test-jobset-with-driver.yml → ...flows/jobset/test-jobset-with-driver.yaml
@@ -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:
@@ -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
diff --git a/resources/workflows/k8s/test-jobset.yml → resources/workflows/jobset/test-jobset.yaml b/resources/workflows/k8s/test-jobset.yml → resources/workflows/jobset/test-jobset.yaml
@@ -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}}"
@@ -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
diff --git a/resources/workflows/kueue/test-job.yml → resources/workflows/kueue/test-job.yaml b/resources/workflows/kueue/test-job.yml → resources/workflows/kueue/test-job.yaml
@@ -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
diff --git a/...urces/workflows/kueue/test-preemption.yml → ...rces/workflows/kueue/test-preemption.yaml b/...urces/workflows/kueue/test-preemption.yml → ...rces/workflows/kueue/test-preemption.yaml
diff --git a/tests/ci/test_jobset.sh b/tests/ci/test_jobset.sh
@@ -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
diff --git a/tests/ci/test_kueue.sh b/tests/ci/test_kueue.sh
@@ -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