From f831e338925131d59b080463851ab47170a9c86f Mon Sep 17 00:00:00 2001
From: Peter Mikus <peter.mikus@icloud.com>
Date: Wed, 24 Sep 2025 09:49:21 +0200
Subject: [PATCH] ci(gha): Sync changes

Signed-off-by: Peter Mikus <peter.mikus@icloud.com>
Change-Id: Ibe73b6759f03121f53e5c0bb62d6dfb6bed085c2
---
 .ci/setup_executor_env.sh                    | 29 ----------------------------
 .github/workflows/gerrit-csit-tox-verify.yml |  2 +-
 2 files changed, 1 insertion(+), 30 deletions(-)

diff --git a/.ci/setup_executor_env.sh b/.ci/setup_executor_env.sh
index 649a50b8bd..ba29381270 100755
--- a/.ci/setup_executor_env.sh
+++ b/.ci/setup_executor_env.sh
@@ -41,7 +41,6 @@ GITHUB_WORKFLOW="${GITHUB_WORKFLOW:-Unknown}"
 GITHUB_RUN_ID="${GITHUB_RUN_ID:-Unknown}"
 
 # Toggle envs (can be overridden from workflow)
-: "${PERF_PROBE:=1}"            # 1 to collect perf snapshots
 : "${VERBOSE_PACKAGES:=1}"      # 1 to list installed OS packages
 : "${VERBOSE_PY:=1}"            # 1 to list python packages
 : "${CCACHE_MAXSIZE:=20G}"      # Max ccache size
@@ -60,33 +59,6 @@ print_runner_attrs() {
   echo "Runner Hostname: $(hostname)"
 }
 
-collect_perf_snapshots() {
-  [ "${PERF_PROBE}" = "1" ] || { echo "PERF_PROBE disabled"; return 0; }
-  log_line
-  echo "Collecting lightweight performance snapshots"
-  perf_trials=2
-  perf_interval=1
-  # Determine SYSSTAT path (retain legacy logic)
-  if [ "${OS_ID}" = "ubuntu" ] || [ "${OS_ID}" = "debian" ]; then
-    SYSSTAT_PATH="/var/log/sysstat"
-  elif [ "${OS_ID}" = "centos" ]; then
-    if [ "${OS_VERSION_ID}" = "7" ]; then
-      SYSSTAT_PATH="/var/log/sa/sa02"
-    else
-      SYSSTAT_PATH="/var/log/sa"
-    fi
-  else
-    SYSSTAT_PATH="/var/log"
-  fi
-  echo "Virtual memory stat"; vmstat ${perf_interval} ${perf_trials} 2>/dev/null || echo "vmstat not available"
-  echo "CPU time breakdowns per CPU"; mpstat -P ALL ${perf_interval} ${perf_trials} 2>/dev/null || echo "mpstat not available"
-  echo "Per-process summary"; pidstat ${perf_interval} ${perf_trials} 2>/dev/null || echo "pidstat not available"
-  echo "Block device stats"; iostat -xz ${perf_interval} ${perf_trials} 2>/dev/null || echo "iostat not available"
-  echo "Memory utilization"; free -m 2>/dev/null || echo "free not available"
-  echo "Network interface throughput"; sar -n DEV -o "${SYSSTAT_PATH}" ${perf_interval} ${perf_trials} 2>/dev/null || echo "sar not available"
-  echo "TCP metrics"; sar -n TCP,ETCP -o "${SYSSTAT_PATH}" ${perf_interval} ${perf_trials} 2>/dev/null || echo "sar not available"
-}
-
 show_os_packages() {
   [ "${VERBOSE_PACKAGES}" = "1" ] || { echo "Skipping OS package list (VERBOSE_PACKAGES=0)"; return 0; }
   log_line
@@ -169,7 +141,6 @@ show_github_env() {
 
 # Execution sequence
 print_runner_attrs
-collect_perf_snapshots
 show_os_packages
 show_python_packages
 show_downloads_cache
diff --git a/.github/workflows/gerrit-csit-tox-verify.yml b/.github/workflows/gerrit-csit-tox-verify.yml
index 1538465304..5ccca6faba 100644
--- a/.github/workflows/gerrit-csit-tox-verify.yml
+++ b/.github/workflows/gerrit-csit-tox-verify.yml
@@ -54,7 +54,7 @@ concurrency:
 
 jobs:
   csit-verify-tox:
-    name: ${{ github.job }}-${{ matrix.os }}-${{ matrix.executor_arch }}
+    name: csit-verify-tox-${{ matrix.os }}-${{ matrix.executor_arch }}
     runs-on:
       - self-hosted
       - nomad
-- 
2.16.6