Skip to content

Commit 18cb753

Browse files
committed
Testing test CI steps on Blossom k8s
Signed-off-by: NirWolfer <[email protected]>
1 parent a773a22 commit 18cb753

File tree

2 files changed

+26
-31
lines changed

2 files changed

+26
-31
lines changed

.ci/matrix_job.yaml

Lines changed: 26 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,15 @@ runs_on_dockers:
107107
tag: '20250219',
108108
build_args: '--no-cache --target test',
109109
category: 'tests',
110-
annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1' }],
111-
limits: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p1: 1}',
112-
requests: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p1: 1}',
110+
annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6-p1' }],
111+
limits: '{memory: 10Gi, cpu: 10000m, nvidia.com/sriov-cx6-p1: 1}',
112+
requests: '{memory: 10Gi, cpu: 10000m, nvidia.com/sriov-cx6-p1: 1}',
113113
caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
114+
nodeSelector: 'nvidia.com/node_type: builder',
114115
runAsUser: '0',
115-
runAsGroup: '0',
116-
cloud: swx-k8s-spray,
117-
namespace: xlio-ci
116+
runAsGroup: '0'
118117
}
118+
# hugepages-2Mi: 10Gi,
119119
- {
120120
file: '.ci/dockerfiles/Dockerfile.ubuntu22.04',
121121
arch: 'x86_64',
@@ -124,32 +124,29 @@ runs_on_dockers:
124124
tag: '20250219',
125125
build_args: '--no-cache --target vg',
126126
category: 'tool',
127-
annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
128-
limits: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p2: 1}',
129-
requests: '{memory: 10Gi, cpu: 10000m, hugepages-2Mi: 10Gi, mellanox.com/sriov_cx6dx_p2: 1}',
127+
annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6-p1' }],
128+
limits: '{memory: 10Gi, cpu: 10000m, nvidia.com/sriov-cx6-p1: 1}',
129+
requests: '{memory: 10Gi, cpu: 10000m, nvidia.com/sriov-cx6-p1: 1}',
130130
caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
131+
nodeSelector: 'nvidia.com/node_type: builder',
131132
runAsUser: '0',
132-
runAsGroup: '0',
133-
cloud: swx-k8s-spray,
134-
namespace: xlio-ci
135-
}
136-
- {
137-
file: '.ci/dockerfiles/Dockerfile.ubuntu22.04',
138-
arch: 'x86_64',
139-
name: 'gtest',
140-
uri: 'xlio/$arch/ubuntu22.04/$name',
141-
tag: '20250219',
142-
build_args: '--no-cache --target gtest',
143-
category: 'tests',
144-
annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1@net1,sriov-cx6dx-p2@net2' }],
145-
limits: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, mellanox.com/sriov_cx6dx_p1: 1, mellanox.com/sriov_cx6dx_p2: 1}',
146-
requests: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, mellanox.com/sriov_cx6dx_p1: 1, mellanox.com/sriov_cx6dx_p2: 1}',
147-
caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
148-
runAsUser: '0',
149-
runAsGroup: '0',
150-
cloud: swx-k8s-spray,
151-
namespace: xlio-ci
133+
runAsGroup: '0'
152134
}
135+
# - {
136+
# file: '.ci/dockerfiles/Dockerfile.ubuntu22.04',
137+
# arch: 'x86_64',
138+
# name: 'gtest',
139+
# uri: 'xlio/$arch/ubuntu22.04/$name',
140+
# tag: '20250219',
141+
# build_args: '--no-cache --target gtest',
142+
# category: 'tests',
143+
# annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1@net1,sriov-cx6dx-p2@net2' }],
144+
# limits: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, nvidia.com/sriov_cx6dx_p1: 1, nvidia.com/sriov_cx6dx_p2: 1}',
145+
# requests: '{memory: 12Gi, cpu: 10000m, hugepages-2Mi: 8Gi, nvidia.com/sriov_cx6dx_p1: 1, nvidia.com/sriov_cx6dx_p2: 1}',
146+
# caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
147+
# runAsUser: '0',
148+
# runAsGroup: '0'
149+
# }
153150

154151
matrix:
155152
axes:

contrib/jenkins_tests/gtest.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,4 @@ done
146146

147147
echo "[${0##*/}]..................exit code = $rc"
148148

149-
sleep 180000
150-
151149
exit $rc

0 commit comments

Comments
 (0)