Added metadata with performance kpi data upload (#1363)

Author: tisutisu

test/performance/collect-kpi.sh

@@ -16,6 +16,13 @@ NS_PREFIX=${NS_PREFIX:-entanglement}
 
 SBO_METRICS=$(find $METRICS -type f -name 'pod-info.service-binding-operator-*.csv')
 
+SBO_VERSION=$(make operator-version --no-print-directory)
+OPENSHIFT_RELEASE=$(oc version -o yaml | yq e '.openshiftVersion')
+OPENSHIFT_VERSION=$(oc version -o yaml | yq e '.openshiftVersion' | grep -oP '^\d{1,2}.\d{1,2}.\d{1,2}')
+RUN_TYPE=${RUN_TYPE:-default} 
+PULL_NUMBER=${PULL_NUMBER:-n/a} 
+PULL_PULL_SHA=${PULL_PULL_SHA:-n/a}
+
 SCENARIOS="nosb-inv nosb-val sb-inc sb-inv sb-val"
 #SCENARIOS="nosb-val"
 
@@ -52,3 +59,11 @@ for scenario in $SCENARIOS; do
         cat $output >>$kpi_yaml
     done
 done
+
+echo "execution_timestamp: $(date +%F\ %T)" >>$kpi_yaml
+echo "sbo_version: $SBO_VERSION" >>$kpi_yaml
+echo "openshift_version: $OPENSHIFT_VERSION" >>$kpi_yaml
+echo "openshift_release: $OPENSHIFT_RELEASE" >>$kpi_yaml
+echo "run_type: $RUN_TYPE" >>$kpi_yaml
+echo "pull_number: $PULL_NUMBER" >> $kpi_yaml
+echo "commit_id: ${PULL_PULL_SHA}" >> $kpi_yaml

test/performance/upload_data.py

@@ -98,7 +98,16 @@ def read_metric_data(file_name):
     """ Read from the metrics file and construct the document """
     with open(file_name, encoding="utf-8") as file_d:
         content = yaml.load(file_d, Loader=yaml.FullLoader)
-        kpi_data = content['kpi']
+
+    kpi_data = content['kpi']
+    execution_timestamp = content['execution_timestamp']
+    sbo_version = content['sbo_version']
+    openshift_version = content['openshift_version']
+    openshift_release = content['openshift_release']
+    run_type = content['run_type']
+    pull_number = content['pull_number']
+    commit_id = content['commit_id']
+
     for data in kpi_data:
         if data['name'] == 'usage':
             for metric in data['metrics']:
@@ -117,7 +126,14 @@ def read_metric_data(file_name):
             'memory_average_threshold': get_average_threshold_mem(),
             'memory_maximum_threshold': get_maximum_threshold_mem(),
             'cpu_average_threshold': get_average_threshold_cpu(),
-            'cpu_maximum_threshold': get_maximum_threshold_cpu()}
+            'cpu_maximum_threshold': get_maximum_threshold_cpu(),
+            'run_type': run_type,
+            'pull_number': pull_number,
+            'commit_id': commit_id,
+            'execution_timestamp': execution_timestamp,
+            'sbo_version': sbo_version,
+            'openshift_version': openshift_version,
+            'openshift_release': openshift_release}
 
 
 def generate_id():