Merge branch 'main' into storage_multi_labels

Author: myersCody

koku/api/report/queries.py

@@ -1037,7 +1037,7 @@ def _order_by(self, data, order_fields):
                 field = field[1:]
             if field in numeric_ordering:
                 sorted_data = sorted(
-                    sorted_data, key=lambda entry: (entry[field] is None, entry[field]), reverse=reverse
+                    sorted_data, key=lambda entry: (entry.get(field) is None, entry.get(field)), reverse=reverse
                 )
             elif TAG_PREFIX in field:
                 tag_index = field.index(TAG_PREFIX) + len(TAG_PREFIX)

smoke_test.sh

@@ -8,7 +8,7 @@ COMPONENTS="koku trino"  # specific components to deploy (optional, default: all
 IQE_PLUGINS="cost_management"
 IQE_MARKER_EXPRESSION="cost_smoke"
 IQE_FILTER_EXPRESSION=""
-IQE_CJI_TIMEOUT="5h"
+IQE_CJI_TIMEOUT="6h"
 IQE_PARALLEL_ENABLED="false"
 IQE_ENV_VARS="JOB_NAME=${JOB_NAME},BUILD_NUMBER=${BUILD_NUMBER},SCHEMA_SUFFIX=_${BUILD_NUMBER}"
 
@@ -22,7 +22,7 @@ curl -s $CICD_URL/bootstrap.sh > .cicd_bootstrap.sh && source .cicd_bootstrap.sh
 source ${CICD_ROOT}/_common_deploy_logic.sh
 set -x
 export BONFIRE_NS_REQUESTER="${JOB_NAME}-${BUILD_NUMBER}"
-export NAMESPACE=$(bonfire namespace reserve --duration 6h)
+export NAMESPACE=$(bonfire namespace reserve --duration 6h20m)
 SMOKE_NAMESPACE=$NAMESPACE
 
 oc get secret koku-aws -o yaml -n ephemeral-base | grep -v '^\s*namespace:\s' | oc apply --namespace=${NAMESPACE} -f -