[CI] HW-dependent tests: TEST ONLY

Reduced the number of branches to speed up the process Issue: HPCINFRA-2196 Signed-off-by: Viacheslav Login <vlogin@nvidia.com>
Mellanox · May 31, 2024 · 778dda8 · 778dda8
1 parent 8111b3e
commit 778dda8
Show file tree

Hide file tree

Showing 2 changed files with 70 additions and 76 deletions.
diff --git a/.ci/dockerfiles/Dockerfile.ub2204 b/.ci/dockerfiles/Dockerfile.ub2204
@@ -41,9 +41,6 @@ RUN apt-get update && \
         libcap-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /opt/mellanox/rivermax && \
-    curl -o /opt/mellanox/rivermax/rivermax.lic https://urm.nvidia.com/artifactory/sw-rivermax-generic-local/license/rivermax.lic
-
 RUN pip3 install --trusted-host pypi.org --trusted-host pypi.python.org --trusted-host files.pythonhosted.org --upgrade pip && \
     pip3 install wheel && \
     pip3 install cmake conan~=2.0.5
@@ -57,9 +54,6 @@ RUN echo "${_LOGIN} ALL=(ALL) NOPASSWD: ALL\nroot ALL=(ALL) NOPASSWD: ALL" >> /e
     usermod -aG sudo $_LOGIN && \
     chown -R ${_LOGIN} ${_HOME}
 
-# W/A for libvma installation issue under docker environment
-RUN touch /etc/init.d/vma && chmod +x /etc/init.d/vma
-
 ENV MODULEPATH /hpc/local/etc/modulefiles
 SHELL ["/bin/bash"]
 

diff --git a/.ci/matrix_job.yaml b/.ci/matrix_job.yaml
@@ -34,86 +34,86 @@ volumes:
   - {mountPath: /var/home/swx-jenkins, hostPath: /labhome/swx-jenkins}
 
 runs_on_dockers:
-# mofed
-  - {name: 'ub20.04-mofed-x86_64', url: 'harbor.mellanox.com/swx-infra/x86_64/ubuntu20.04/builder:mofed-5.2-2.2.0.0', category: 'base', arch: 'x86_64'}
-  - {name: 'ub20.04-mofed-aarch64', url: 'harbor.mellanox.com/swx-infra/aarch64/ubuntu20.04/builder:mofed-5.2-1.0.4.0', category: 'base', arch: 'aarch64'}
-  - {name: 'ub22.04-mofed-x86_64', url: 'harbor.mellanox.com/hpcx/x86_64/ubuntu22.04/builder:mofed-5.7-0.1.1.0', category: 'base', arch: 'x86_64'}
-  - {name: 'rhel8.6-mofed-x86_64',  url: 'harbor.mellanox.com/hpcx/x86_64/rhel8.6/builder:mofed-5.6-0.4.5.0', category: 'base', arch: 'x86_64'}
-  - {name: 'ub24.04-mofed-x86_64', url: 'harbor.mellanox.com/hpcx/x86_64/ubuntu24.04/builder:mofed-24.04-0.6.6.0', category: 'base', arch: 'x86_64'}
-  - {name: 'ub24.04-mofed-aarch64', url: 'harbor.mellanox.com/hpcx/aarch64/ubuntu24.04/builder:mofed-24.04-0.6.6.0', category: 'base', arch: 'aarch64'}
-  #  - {name: 'oracle8.6-mofed-x86_64',  url: 'harbor.mellanox.com/rivermax/base_oraclelinux8.6:mofed-5.9-0.3.4.0', category: 'base', arch: 'x86_64'}
-# tool
-  - {name: 'toolbox', url: 'harbor.mellanox.com/hpcx/x86_64/rhel8.6/builder:inbox', category: 'tool', arch: 'x86_64'}
-  - {name: 'blackduck', url: 'harbor.mellanox.com/toolbox/ngci-centos:7.9.2009.2', category: 'tool', arch: 'x86_64'}
-  - {name: 'header-check', url: 'harbor.mellanox.com/toolbox/header_check:0.0.14', category: 'tool', arch: 'x86_64', tag: '0.0.14'}
-# static tests
-  - {file: '.ci/dockerfiles/Dockerfile.rhel8.6',
-     arch: 'x86_64',
-     name: 'xlio_static.cppcheck',
-     uri: '$arch/$name',
-     tag: '20240703',
-     build_args: '--no-cache',
-     category: 'tool'
-     }
-  - {file: '.ci/dockerfiles/Dockerfile.rhel8.6',
-     arch: 'x86_64',
-     name: 'xlio_static.csbuild',
-     uri: '$arch/$name',
-     tag: '20240703',
-     build_args: '--no-cache',
-     category: 'tool'
-     }
-  - {file: '.ci/dockerfiles/Dockerfile.rhel8.6',
-     arch: 'x86_64',
-     name: 'xlio_static.tidy',
-     uri: '$arch/$name',
-     tag: '20240703',
-     build_args: '--no-cache',
-     category: 'tool',
-     }
+# # mofed
+#   - {name: 'ub20.04-mofed-x86_64', url: 'harbor.mellanox.com/swx-infra/x86_64/ubuntu20.04/builder:mofed-5.2-2.2.0.0', category: 'base', arch: 'x86_64'}
+#   - {name: 'ub20.04-mofed-aarch64', url: 'harbor.mellanox.com/swx-infra/aarch64/ubuntu20.04/builder:mofed-5.2-1.0.4.0', category: 'base', arch: 'aarch64'}
+#   - {name: 'ub22.04-mofed-x86_64', url: 'harbor.mellanox.com/hpcx/x86_64/ubuntu22.04/builder:mofed-5.7-0.1.1.0', category: 'base', arch: 'x86_64'}
+#   - {name: 'rhel8.6-mofed-x86_64',  url: 'harbor.mellanox.com/hpcx/x86_64/rhel8.6/builder:mofed-5.6-0.4.5.0', category: 'base', arch: 'x86_64'}
+#   - {name: 'ub24.04-mofed-x86_64', url: 'harbor.mellanox.com/hpcx/x86_64/ubuntu24.04/builder:mofed-24.04-0.6.6.0', category: 'base', arch: 'x86_64'}
+#   - {name: 'ub24.04-mofed-aarch64', url: 'harbor.mellanox.com/hpcx/aarch64/ubuntu24.04/builder:mofed-24.04-0.6.6.0', category: 'base', arch: 'aarch64'}
+#   #  - {name: 'oracle8.6-mofed-x86_64',  url: 'harbor.mellanox.com/rivermax/base_oraclelinux8.6:mofed-5.9-0.3.4.0', category: 'base', arch: 'x86_64'}
+# # tool
+#   - {name: 'toolbox', url: 'harbor.mellanox.com/hpcx/x86_64/rhel8.6/builder:inbox', category: 'tool', arch: 'x86_64'}
+#   - {name: 'blackduck', url: 'harbor.mellanox.com/toolbox/ngci-centos:7.9.2009.2', category: 'tool', arch: 'x86_64'}
+#   - {name: 'header-check', url: 'harbor.mellanox.com/toolbox/header_check:0.0.14', category: 'tool', arch: 'x86_64', tag: '0.0.14'}
+# # static tests
+#   - {file: '.ci/dockerfiles/Dockerfile.rhel8.6',
+#      arch: 'x86_64',
+#      name: 'xlio_static.cppcheck',
+#      uri: '$arch/$name',
+#      tag: '20240703',
+#      build_args: '--no-cache',
+#      category: 'tool'
+#      }
+#   - {file: '.ci/dockerfiles/Dockerfile.rhel8.6',
+#      arch: 'x86_64',
+#      name: 'xlio_static.csbuild',
+#      uri: '$arch/$name',
+#      tag: '20240703',
+#      build_args: '--no-cache',
+#      category: 'tool'
+#      }
+#   - {file: '.ci/dockerfiles/Dockerfile.rhel8.6',
+#      arch: 'x86_64',
+#      name: 'xlio_static.tidy',
+#      uri: '$arch/$name',
+#      tag: '20240703',
+#      build_args: '--no-cache',
+#      category: 'tool',
+#      }
   - {file: '.ci/dockerfiles/Dockerfile.ub2204',
      arch: 'x86_64',
      name: 'xlio_tests.gtests',
      uri: '$arch/$name',
      tag: '20242905',
      build_args: '--no-cache',
-     category: 'tool',
-     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
-     limits: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
-     requests: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
+     category: 'base',
+     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p1' }],
+     limits: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p1: 1}',
+     requests: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p1: 1}',
      caps_add: '[ IPC_LOCK, SYS_RESOURCE ]',
      runAsUser: '0',
      runAsGroup: '0'
      }
-  - {file: '.ci/dockerfiles/Dockerfile.ub2204',
-     arch: 'x86_64',
-     name: 'xlio_tests.test',
-     uri: '$arch/$name',
-     tag: '20242905',
-     build_args: '--no-cache',
-     category: 'tool',
-     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
-     limits: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
-     requests: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
-     runAsUser: '0',
-     runAsGroup: '0'
-     }
-  - {file: '.ci/dockerfiles/Dockerfile.ub2204',
-     arch: 'x86_64',
-     name: 'xlio_tests.valgrind',
-     uri: '$arch/$name',
-     tag: '20242905',
-     build_args: '--no-cache',
-     category: 'tool',
-     annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
-     limits: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
-     requests: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
-     runAsUser: '0',
-     runAsGroup: '0'
-     }
-
-runs_on_agents:
-  - {nodeLabel: 'beni09', category: 'base'}
+  # - {file: '.ci/dockerfiles/Dockerfile.ub2204',
+  #    arch: 'x86_64',
+  #    name: 'xlio_tests.test',
+  #    uri: '$arch/$name',
+  #    tag: '20242905',
+  #    build_args: '--no-cache',
+  #    category: 'base',
+  #    annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
+  #    limits: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
+  #    requests: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
+  #    runAsUser: '0',
+  #    runAsGroup: '0'
+  #    }
+  # - {file: '.ci/dockerfiles/Dockerfile.ub2204',
+  #    arch: 'x86_64',
+  #    name: 'xlio_tests.valgrind',
+  #    uri: '$arch/$name',
+  #    tag: '20242905',
+  #    build_args: '--no-cache',
+  #    category: 'base',
+  #    annotations: [{ key: 'k8s.v1.cni.cncf.io/networks', value: 'sriov-cx6dx-p2' }],
+  #    limits: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
+  #    requests: '{memory: 8Gi, cpu: 8000m, mellanox.com/sriov_cx6dx_p2: 1}',
+  #    runAsUser: '0',
+  #    runAsGroup: '0'
+  #    }
+
+# runs_on_agents:
+#   - {nodeLabel: 'beni09', category: 'base'}
 
 matrix:
   axes: