containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #17458 from cevich/fix_benchmarks_env 

Cirrus: Omit functions in env. file
This commit is contained in:
OpenShift Merge Robot 2023-02-16 11:04:36 -05:00 committed by GitHub
parent 6f40253ed5 45fb353f46
commit 5d78547ec2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/cirrus/lib.sh
View File

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