From bdaf03002ae36dbf6f42ce12142e064622395f7f Mon Sep 17 00:00:00 2001 From: Viacheslav Login Date: Fri, 6 Sep 2024 09:32:56 +0300 Subject: [PATCH] [CI] Header check: upgrade version to NGCI 5.0.3-82 We've been requested to upgrade the header checker tool (Copyright check tool) to latest version. issue: HPCINFRA-2575 Signed-off-by: Viacheslav Login --- .ci/matrix_job.yaml | 4 +++- contrib/jenkins_tests/copyright-check-map.yaml | 2 +- contrib/jenkins_tests/copyrights.sh | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.ci/matrix_job.yaml b/.ci/matrix_job.yaml index 414b2a1bf..6152c4d10 100644 --- a/.ci/matrix_job.yaml +++ b/.ci/matrix_job.yaml @@ -17,6 +17,7 @@ kubernetes: credentials: - {credentialsId: '925b0900-e273-4042-bc7c-facaefae0727', usernameVariable: 'XLIO_COV_USER', passwordVariable: 'XLIO_COV_PASSWORD'} + - {credentialsId: 'fb735938-fa1c-4b61-b568-a7c153b4fe74', usernameVariable: 'MELLANOX_GH_USER', passwordVariable: 'MELLANOX_GH_TOKEN'} volumes: - {mountPath: /hpc/local/bin, hostPath: /hpc/local/bin} @@ -155,7 +156,8 @@ steps: - name: Copyrights enable: ${do_copyrights} - run: env WORKSPACE=$PWD COMPILE_DOCA=false COMPILE_DPCP=false ./contrib/jenkins_tests/copyrights.sh + credentialsId: 'fb735938-fa1c-4b61-b568-a7c153b4fe74' + run: env WORKSPACE=$PWD COMPILE_DOCA=false COMPILE_DPCP=false GITHUB_TOKEN=$MELLANOX_GH_TOKEN ./contrib/jenkins_tests/copyrights.sh containerSelector: - "{name: 'header-check', category: 'tool', variant: 1}" agentSelector: diff --git a/contrib/jenkins_tests/copyright-check-map.yaml b/contrib/jenkins_tests/copyright-check-map.yaml index 16f6b441b..81b58cfb2 100644 --- a/contrib/jenkins_tests/copyright-check-map.yaml +++ b/contrib/jenkins_tests/copyright-check-map.yaml @@ -35,7 +35,7 @@ general: - ".*src/core/config_parser.*" - ".*src/core/config_scanner\\.c" -nbu-open-source: +bsd: include: - ".*" exclude: diff --git a/contrib/jenkins_tests/copyrights.sh b/contrib/jenkins_tests/copyrights.sh index 2ebb0db5f..20dc40bbf 100755 --- a/contrib/jenkins_tests/copyrights.sh +++ b/contrib/jenkins_tests/copyrights.sh @@ -12,7 +12,12 @@ if [ ! -d "$WORKSPACE" ]; then exit 1 fi -cpp_files=' "extensions": [".c", ".cc", ".cpp", "c++", ".h", ".hpp", ".cs", ".l", ".y"],' +if [[ -z $GITHUB_TOKEN ]]; then + echo "ERROR: GITHUB_TOKEN variable is empty" + exit 1 +fi + +cpp_files=' "extensions": [".c", ".cc", ".cpp", "c++", ".h", ".hpp", ".cs", ".inl", ".l", ".y"],' sed -i "s/.*\"extensions\": \[\"\.c\".*/$cpp_files/g" /opt/nvidia/ProjectConfig/header-types.json cat /opt/nvidia/ProjectConfig/header-types.json