Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add defaults for load-test-customer-data script #5468

Merged
merged 2 commits into from
Jan 27, 2025
Merged

add defaults for load-test-customer-data script #5468

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
13655ab
add default for S3_BUCKET_NAME_OCP_INGRESS
maskarb Jan 27, 2025
3bae223
add default for S3_ENDPOINT
maskarb Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions dev/scripts/load_test_customer_data.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ export OS

export S3_ACCESS_KEY="${S3_ACCESS_KEY}"
export S3_SECRET_KEY="${S3_SECRET}"
export S3_BUCKET_NAME="${S3_BUCKET_NAME_OCP_INGRESS}"
export S3_BUCKET_NAME="${S3_BUCKET_NAME_OCP_INGRESS-koku-bucket}"
export MINIO_UPLOAD="${S3_ENDPOINT-http://localhost:9000}"


log-info "Calculating dates..."
Expand Down Expand Up @@ -306,8 +307,8 @@ build_aws_data() {
log-info "Building OpenShift on ${_source_name} report data..."
local _ocp_payload
_ocp_payload="$(uuidgen | awk '{print tolower($0)}' | tr -d '-')"
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_aws/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-1 --minio-upload "${S3_ENDPOINT}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp_on_aws/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-1 --minio-upload "${S3_ENDPOINT}" --payload-name "$_ocp_payload"
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_aws/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-1 --minio-upload "${MINIO_UPLOAD}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp_on_aws/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-1 --minio-upload "${MINIO_UPLOAD}" --payload-name "$_ocp_payload"
trigger_ocp_ingest "$_ocp_ingest_name" "$_ocp_payload"
nise_report aws --static-report-file "$YAML_PATH/ocp_on_aws/rendered_aws_static_data.yml" --aws-s3-report-name None --aws-s3-bucket-name "$NISE_DATA_PATH/local_providers/aws_local"

Expand Down Expand Up @@ -342,8 +343,8 @@ build_azure_data() {
log-info "Building OpenShift on ${_source_name} report data..."
local _ocp_payload
_ocp_payload="$(uuidgen | awk '{print tolower($0)}' | tr -d '-')"
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_azure/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-2 --minio-upload "${S3_ENDPOINT}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp_on_azure/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-2 --minio-upload "${S3_ENDPOINT}" --payload-name "$_ocp_payload"
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_azure/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-2 --minio-upload "${MINIO_UPLOAD}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp_on_azure/rendered_ocp_static_data.yml" --ocp-cluster-id my-ocp-cluster-2 --minio-upload "${MINIO_UPLOAD}" --payload-name "$_ocp_payload"
trigger_ocp_ingest "$_ocp_ingest_name" "$_ocp_payload"
nise_report azure --static-report-file "$YAML_PATH/ocp_on_azure/rendered_azure_static_data.yml" --azure-container-name "$NISE_DATA_PATH/local_providers/azure_local" --azure-report-name azure-report
nise_report azure --static-report-file "$YAML_PATH/rendered_azure_v2.yml" --azure-container-name "$NISE_DATA_PATH/local_providers/azure_local" --azure-report-name azure-report-v2 --resource-group
Expand Down Expand Up @@ -388,10 +389,10 @@ build_gcp_data() {
log-info "Triggering OCP ingest for $_ocp_ingest_name with new payload $_ocp_payload"

if [[ "$i" -eq 0 ]]; then
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_gcp/rendered_ocp_static_replicate_pvc.yml" --ocp-cluster-id test-ocp-gcp-cluster-duplicate --minio-upload "${S3_ENDPOINT}" --daily-reports --payload-name "$_ocp_payload"
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_gcp/rendered_ocp_static_replicate_pvc.yml" --ocp-cluster-id test-ocp-gcp-cluster-duplicate --minio-upload "${MINIO_UPLOAD}" --daily-reports --payload-name "$_ocp_payload"
elif [[ "$i" -eq 1 ]]; then
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_gcp/rendered_ocp_static_data.yml" --ocp-cluster-id test-ocp-gcp-cluster --minio-upload "${S3_ENDPOINT}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp_on_gcp/rendered_ocp_static_data.yml" --ocp-cluster-id test-ocp-gcp-cluster --minio-upload "${S3_ENDPOINT}" --payload-name "$_ocp_payload"
nise_report ocp --static-report-file "$YAML_PATH/ocp_on_gcp/rendered_ocp_static_data.yml" --ocp-cluster-id test-ocp-gcp-cluster --minio-upload "${MINIO_UPLOAD}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp_on_gcp/rendered_ocp_static_data.yml" --ocp-cluster-id test-ocp-gcp-cluster --minio-upload "${MINIO_UPLOAD}" --payload-name "$_ocp_payload"
fi
trigger_ocp_ingest "$_ocp_ingest_name" "$_ocp_payload"
done
Expand Down Expand Up @@ -422,8 +423,8 @@ build_onprem_data() {
render_yaml_files "${_yaml_files[@]}"

log-info "Building OpenShift on ${_source_name} report data..."
nise_report ocp --static-report-file "$YAML_PATH/ocp/rendered_ocp_on_premise.yml" --ocp-cluster-id my-ocp-cluster-3 --minio-upload "${S3_ENDPOINT}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp/rendered_ocp_on_premise.yml" --ocp-cluster-id my-ocp-cluster-3 --minio-upload "${S3_ENDPOINT}" --payload-name "$_ocp_payload"
nise_report ocp --static-report-file "$YAML_PATH/ocp/rendered_ocp_on_premise.yml" --ocp-cluster-id my-ocp-cluster-3 --minio-upload "${MINIO_UPLOAD}" --daily-reports --payload-name "$_ocp_payload"
# nise_report ocp --static-report-file "$YAML_PATH/ocp/rendered_ocp_on_premise.yml" --ocp-cluster-id my-ocp-cluster-3 --minio-upload "${MINIO_UPLOAD}" --payload-name "$_ocp_payload"

log-info "Cleanup ${_source_name} rendered YAML files..."
cleanup_rendered_files "${_rendered_yaml_files[@]}"
Expand Down