Merge pull request #17458 from cevich/fix_benchmarks_env

Cirrus: Omit functions in env. file

contrib/cirrus/lib.sh

@@ -328,25 +328,30 @@ remove_packaged_podman_files() {
 # Execute make localbenchmarks in $CIRRUS_WORKING_DIR/data
 # for preserving as a task artifact.
 localbenchmarks() {
-    local datadir
+    local datadir envnames envname
     req_env_vars DISTRO_NV PODBIN_NAME PRIV_NAME TEST_ENVIRON TEST_FLAVOR
     req_env_vars VM_IMAGE_NAME EC2_INST_TYPE
 
     datadir=$CIRRUS_WORKING_DIR/data
     mkdir -p $datadir
 
+    envnames=$(passthrough_envars | sort);
     (
       echo "# Env. var basis for benchmarks benchmarks."
-      printenv | grep -Ev "$SECRET_ENV_RE" | sort
+      for envname in $envnames; do
+        printf "$envname=%q\n" "${!envname}"
+      done
 
       echo "# Machine details for data-comparison sake, not actual env. vars."
       # Checked above in req_env_vars
       # shellcheck disable=SC2154
       echo "\
+BENCH_ENV_VER=1
 CPUTOTAL=$(grep -ce '^processor' /proc/cpuinfo)
-INST_TYPE=$EC2_INST_TYPE  # one day may include other cloud's VM types.
-MEMTOTAL=$(awk -F: '$1 == "MemTotal" { print $2 }' </proc/meminfo | sed -e "s/^ *//")
-UNAME_RM=$(uname -r -m)
+INST_TYPE=$EC2_INST_TYPE
+MEMTOTALKB=$(awk -F: '$1 == "MemTotal" { print $2 }' </proc/meminfo | sed -e "s/^ *//" | cut -d ' ' -f 1)
+UNAME_R=$(uname -r)
+UNAME_M=$(uname -m)
 "
     ) > $datadir/benchmarks.env
     make localbenchmarks | tee $datadir/benchmarks.raw