From 7b51feb7c0376da6a653bc6c591ef91507bbeda0 Mon Sep 17 00:00:00 2001 From: Gal Noam Date: Mon, 10 Jun 2024 17:40:32 +0300 Subject: [PATCH] Revert "issue: HPCINFRA-1798 switch Style step to clang-16 based container" This reverts commit f91349210f3aec12577b0f9f1f3d1315b92d8d6a. Signed-off-by: Gal Noam --- .ci/matrix_job.yaml | 2 +- contrib/jenkins_tests/style.sh | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.ci/matrix_job.yaml b/.ci/matrix_job.yaml index faa93bdd4..72c6ad729 100644 --- a/.ci/matrix_job.yaml +++ b/.ci/matrix_job.yaml @@ -190,7 +190,7 @@ steps: - name: Style enable: ${do_style} containerSelector: - - "{name: 'xlio_static.tidy', category: 'tool', variant: 1}" + - "{name: 'toolbox', category: 'tool'}" agentSelector: - "{nodeLabel: 'skip-agent'}" run: | diff --git a/contrib/jenkins_tests/style.sh b/contrib/jenkins_tests/style.sh index 6789a6f9f..90fd026f1 100755 --- a/contrib/jenkins_tests/style.sh +++ b/contrib/jenkins_tests/style.sh @@ -4,6 +4,8 @@ source $(dirname $0)/globals.sh echo "Checking for codying style ..." +do_module "dev/clang-9.0.1" + cd $WORKSPACE rm -rf $style_dir @@ -64,6 +66,8 @@ else fi rc=$(($rc+$nerrors)) +module unload "dev/clang-9.0.1" + do_archive "${style_dir}/*.diff" echo "[${0##*/}]..................exit code = $rc"