Testing test CI steps on Blossom k8s

Signed-off-by: NirWolfer <[email protected]>

Author: NirWolfer

.ci/matrix_job.yaml

@@ -107,14 +107,13 @@ runs_on_dockers:
       tag: '20250219',
       build_args: '--no-cache --target test',
       category: 'tests',
-      annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1' }],
-      limits: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p1: 1}',
-      requests: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p1: 1}',
+      annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1' }, { key: 'nvidia.com/node_type', value: 'builder'}],
+      limits: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, nvidia.com/sriov-cx6-p1: 1}',
+      requests: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, nvidia.com/sriov-cx6-p1: 1}',
       caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
+      nodeSelector: 'nvidia.com/node_type: builder',
       runAsUser: '0',
-      runAsGroup: '0',
-      cloud: swx-k8s-spray,
-      namespace: xlio-ci
+      runAsGroup: '0'
     }
   - {
      file: '.ci/dockerfiles/Dockerfile.ubuntu22.04',
@@ -124,32 +123,29 @@ runs_on_dockers:
      tag: '20250219',
      build_args: '--no-cache --target vg',
      category: 'tool',
-     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
-     limits: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p2: 1}',
-     requests: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p2: 1}',
+     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6-p1' }, { key: 'nvidia.com/node_type', value: 'builder'}],
+     limits: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, nvidia.com/sriov-cx6-p1: 1}',
+     requests: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, nvidia.com/sriov-cx6-p1: 1}',
      caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
+     nodeSelector: 'nvidia.com/node_type: builder',
      runAsUser: '0',
-     runAsGroup: '0',
-     cloud: swx-k8s-spray,
-     namespace: xlio-ci
-    }
-  - {
-     file: '.ci/dockerfiles/Dockerfile.ubuntu22.04',
-     arch: 'x86_64',
-     name: 'gtest',
-     uri: 'xlio/$arch/ubuntu22.04/$name',
-     tag: '20250219',
-     build_args: '--no-cache --target gtest',
-     category: 'tests',
-     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1@net1,sriov-cx6dx-p2@net2' }],
-     limits: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, mellanox.com/sriov_cx6dx_p1: 1, mellanox.com/sriov_cx6dx_p2: 1}',
-     requests: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, mellanox.com/sriov_cx6dx_p1: 1, mellanox.com/sriov_cx6dx_p2: 1}',
-     caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
-     runAsUser: '0',
-     runAsGroup: '0',
-     cloud: swx-k8s-spray,
-     namespace: xlio-ci
+     runAsGroup: '0'
     }
+  # - {
+  #    file: '.ci/dockerfiles/Dockerfile.ubuntu22.04',
+  #    arch: 'x86_64',
+  #    name: 'gtest',
+  #    uri: 'xlio/$arch/ubuntu22.04/$name',
+  #    tag: '20250219',
+  #    build_args: '--no-cache --target gtest',
+  #    category: 'tests',
+  #    annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1@net1,sriov-cx6dx-p2@net2' }],
+  #    limits: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, nvidia.com/sriov_cx6dx_p1: 1, nvidia.com/sriov_cx6dx_p2: 1}',
+  #    requests: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, nvidia.com/sriov_cx6dx_p1: 1, nvidia.com/sriov_cx6dx_p2: 1}',
+  #    caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
+  #    runAsUser: '0',
+  #    runAsGroup: '0'
+  #   }
 
 matrix:
   axes:

contrib/jenkins_tests/gtest.sh

@@ -146,6 +146,4 @@ done
 
 echo "[${0##*/}]..................exit code = $rc"
 
-sleep 180000
-
 exit $rc