Skip to content

Commit 4e1cbe6

Browse files
pablomhpablomh
committed
feat(experiment/run-library.sh): Don't push rpm version to report portal
rh-pre-commit.version: 2.2.0 rh-pre-commit.check-secrets: ENABLED
1 parent 1f7fdba commit 4e1cbe6

File tree

1 file changed

+46
-31
lines changed

1 file changed

+46
-31
lines changed

‎experiment/run-library.sh

Lines changed: 46 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ opts_adhoc=${opts_adhoc:-"$opts"}
2323
logs="$marker"
2424
run_lib_dryrun=false
2525
hammer_opts="-u admin -p changeme"
26-
satellite_version="${satellite_version:-${sat_version}}" # will be determined automatically by run-bench.sh
27-
katello_version="${katello_version:-N/A}" # will be determined automatically by run-bench.sh
2826

2927
# Requirements check
3028
#if ! type bc >/dev/null; then
@@ -139,16 +137,16 @@ function generic_environment_check() {
139137
-m ansible.builtin.shell \
140138
-a "rpm -q katello" \
141139
satellite6
142-
katello_version=$( tail -n 1 $logs/00-info-rpm-q-katello.log ); echo "$katello_version" | grep '^katello-[0-9]\.' # make sure it was detected correctly
140+
katello_rpm="$( tail -n 1 $logs/00-info-rpm-q-katello.log )"; echo "$katello_rpm" | grep '^katello-[0-9]\.' # make sure it was detected correctly
143141

144142
a 00-info-rpm-q-satellite.log \
145143
-m ansible.builtin.shell \
146144
-a "rpm -q satellite || true" \
147145
satellite6
148-
satellite_version=$( tail -n 1 $logs/00-info-rpm-q-satellite.log )
146+
satellite_rpm="$( tail -n 1 $logs/00-info-rpm-q-satellite.log )"
149147

150-
log "katello_version = $katello_version"
151-
log "satellite_version = $satellite_version"
148+
log "katello_version = $katello_rpm"
149+
log "satellite_version = $satellite_rpm"
152150

153151
a 00-check-hammer-ping.log \
154152
-m ansible.builtin.shell \
@@ -199,16 +197,22 @@ function status_data_create() {
199197
sd_start="$( date -u -Iseconds -d @$4 )"
200198
sd_end="$( date -u -Iseconds -d @$5 )"
201199
sd_duration="$(( $( date -d @$5 +%s ) - $( date -d @$4 +%s ) ))"
202-
sd_kat_ver="$6"
203-
sd_kat_ver_short=$( echo "$sd_kat_ver" | sed 's/^katello-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' ) # "katello-3.16.0-0.2.master.el7.noarch" -> "3.16"
204-
sd_sat_ver="$7"
205-
if [[ "${sd_sat_ver}" == 'stream' ]]; then
206-
sd_sat_ver_short=stream
207-
elif [[ "$(echo "${sd_sat_ver}" | awk -F'.' '{print $(NF-2)}')" == 'stream' ]]; then
208-
sd_sat_ver_short=stream
209-
else
210-
sd_sat_ver_short=$( echo "${sd_sat_ver}" | sed 's/^satellite-//' | sed 's/[^0-9.-]//g' | sed 's/^\([0-9]\+\.[0-9]\+\)\..*/\1/' | sed 's/^N\/A$/0.0/' ) # "satellite-6.6.0-1.el7.noarch" -> "6.6"
211-
fi
200+
sd_kat_rpm="$6"
201+
[[ -n $sd_kat_rpm ]] ||
202+
sd_kat_rpm="$( ansible $opts_adhoc \
203+
-m ansible.builtin.shell \
204+
-a 'rpm -q katello' \
205+
satellite6 2>/dev/null |
206+
tail -n 1 )"
207+
sd_kat_ver_short="$( echo $sd_kat_rpm | sed 's#^\(katello-\)\(.*\)\(-.*$\)#\2#g' )" # "katello-3.16.0-0.2.master.el7.noarch" -> "3.16.0"
208+
sd_sat_rpm="$7"
209+
[[ -n $sd_sat_rpm ]] ||
210+
sd_sat_rpm="$( ansible $opts_adhoc \
211+
-m ansible.builtin.shell \
212+
-a 'rpm -q satellite' \
213+
satellite6 2>/dev/null |
214+
tail -n 1 )"
215+
sd_sat_ver_short="$( echo $sd_sat_rpm | sed 's#^\(satellite-\)\(.*\)\(-.*$\)#\2#g' )" # "satellite-6.15.1-1.el8.noarch" -> "6.15.1"
212216
sd_run="$8"
213217
sd_additional="$9"
214218
if [ -n "$STATUS_DATA_FILE" -a -f "$STATUS_DATA_FILE" ]; then
@@ -235,9 +239,9 @@ function status_data_create() {
235239
"id=$sd_run" \
236240
"name=$sd_section/$sd_name" \
237241
"parameters.cli=$( echo "$sd_cli" | sed 's/=/__/g' )" \
238-
"parameters.katello_version=$sd_kat_ver" \
242+
"parameters.katello_version=$sd_kat_rpm" \
239243
"parameters.katello_version-y-stream=$sd_kat_ver_short" \
240-
"parameters.version=$sd_sat_ver" \
244+
"parameters.version=$sd_sat_rpm" \
241245
"parameters.version-y-stream=$sd_sat_ver_short" \
242246
"parameters.run=$sd_run" \
243247
"parameters.hostname=$sd_hostname" \
@@ -308,10 +312,16 @@ function status_data_create() {
308312
###status_data.py --status-data-file $sd_file --info
309313

310314
# Create "results-dashboard-data" data file
315+
if [[ "$sat_version" == 'stream' ]]; then
316+
sd_sat_release=stream
317+
else
318+
sd_sat_release="$( echo $sd_sat_ver_short | awk -F'.' '{print $1"."$2}' )"
319+
fi
320+
sd_sat_ver="$sd_sat_ver_short"
311321
set -x
312322
jq -n \
323+
--arg release ${sd_sat_release} \
313324
--arg version ${sd_sat_ver} \
314-
--arg release ${sd_sat_ver_short} \
315325
--arg date ${sd_start} \
316326
--arg link ${sd_link} \
317327
--arg result_id ${sd_run} \
@@ -343,8 +353,8 @@ function status_data_create() {
343353
# Enhance log file
344354
tmp=$( mktemp )
345355
echo "command: $sd_cli" >>$tmp
346-
echo "satellite version: $sd_sat_ver" >>$tmp
347-
echo "katello version: $sd_kat_ver" >>$tmp
356+
echo "satellite version: $sd_sat_rpm" >>$tmp
357+
echo "katello version: $sd_kat_rpm" >>$tmp
348358
echo "hostname: $sd_hostname" >>$tmp
349359
if [ "$sd_result" != 'ERROR' ]; then
350360
echo "result determination log:" >>$tmp
@@ -380,8 +390,8 @@ function junit_upload() {
380390
# Determine ReportPortal launch name
381391
launch_name="${PARAM_reportportal_launch_name:-default-launch-name}"
382392
if echo "$launch_name" | grep --quiet '%sat_ver%'; then
383-
sat_ver="$( echo "$satellite_version" | sed 's/^satellite-//' | sed 's/^\([0-9]\+\.[0-9]\+\).*/\1/' )"
384-
[ -z "$sat_ver" ] && sat_ver="$( echo "$katello_version" | sed 's/^katello-//' | sed 's/^\([0-9]\+\.[0-9]\+\).*/\1/' )"
393+
sat_ver="$( echo $satellite_rpm | sed 's/^satellite-//' | sed 's/^\([0-9]\+\.[0-9]\+\).*/\1/' )"
394+
[ -z "$sat_ver" ] && sat_ver="$( echo $katello_rpm | sed 's/^katello-//' | sed 's/^\([0-9]\+\.[0-9]\+\).*/\1/' )"
385395
launch_name="$( echo "$launch_name" | sed "s/%sat_ver%/$sat_ver/g" )"
386396
fi
387397
launch_name="$( echo "$launch_name" | sed "s/[^a-zA-Z0-9._-]/_/g" )"
@@ -438,14 +448,15 @@ function c() {
438448
fi
439449
local end=$( date -u +%s )
440450
log "Finish after $(( $end - $start )) seconds with log in $out and exit code $rc"
451+
441452
measurement_add \
442453
"$@" \
443454
"$out" \
444455
"$rc" \
445456
"$start" \
446457
"$end" \
447-
"$katello_version" \
448-
"$satellite_version" \
458+
"$katello_rpm" \
459+
"$satellite_rpm" \
449460
"$marker"
450461
return $rc
451462
}
@@ -463,14 +474,15 @@ function a() {
463474
fi
464475
local end=$( date -u +%s )
465476
log "Finish after $(( $end - $start )) seconds with log in $out and exit code $rc"
477+
466478
measurement_add \
467479
"ansible $opts_adhoc $( _format_opts "$@" )" \
468480
"$out" \
469481
"$rc" \
470482
"$start" \
471483
"$end" \
472-
"$katello_version" \
473-
"$satellite_version" \
484+
"$katello_rpm" \
485+
"$satellite_rpm" \
474486
"$marker"
475487
return $rc
476488
}
@@ -497,14 +509,15 @@ function ap() {
497509
fi
498510
local end=$( date -u +%s )
499511
log "Finish after $(( $end - $start )) seconds with log in $out and exit code $rc"
512+
500513
measurement_add \
501514
"ansible-playbook $opts_adhoc $( _format_opts "$@" )" \
502515
"$out" \
503516
"$rc" \
504517
"$start" \
505518
"$end" \
506-
"$katello_version" \
507-
"$satellite_version" \
519+
"$katello_rpm" \
520+
"$satellite_rpm" \
508521
"$marker"
509522
return $rc
510523
}
@@ -556,14 +569,15 @@ function e() {
556569
local passed=$( grep "^$grepper" $log_report | tail -n 1 | cut -d ' ' -f 6 )
557570
local avg_duration=$( grep "^$grepper" $log_report | tail -n 1 | cut -d ' ' -f 8 )
558571
log "Examined $log for $grepper: $duration / $passed = $avg_duration (ranging from $started_ts to $ended_ts)"
572+
559573
measurement_add \
560574
"experiment/reg-average.py '$grepper' '$log'" \
561575
"$log_report" \
562576
"$rc" \
563577
"$started_ts" \
564578
"$ended_ts" \
565-
"$katello_version" \
566-
"$satellite_version" \
579+
"$katello_rpm" \
580+
"$satellite_rpm" \
567581
"$marker" \
568582
"results.items.duration=$duration results.items.passed=$passed results.items.avg_duration=$avg_duration results.items.report_rc=$rc"
569583
}
@@ -596,6 +610,7 @@ function task_examine() {
596610
duration="$( awk -F'"' '/^results.tasks.duration=/ {printf ("%.0f", $2)}' ${log_report} )"
597611
head_tail_perc="$( awk -F'"' '/^results.tasks.percentage_removed=/ {printf ("%.2f", $2)}' ${log_report} )"
598612
log "Examined task ${task_id} and it has ${head_tail_perc} % of head/tail (ranging from ${started_ts} to ${ended_ts}) and has taken $duration seconds"
613+
599614
measurement_add \
600615
"${command}" \
601616
"${log_report}" \

0 commit comments

Comments
 (0)