Skip to content

Commit 9015a5a

Browse files
committed
Some cleanup.
1 parent 07e512d commit 9015a5a

File tree

2 files changed

+6
-39
lines changed

2 files changed

+6
-39
lines changed

scripts/lib/common.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,10 +225,7 @@ preflight_test() {
225225
validate_tools kubectl python3 || return 1
226226
validate_cluster || return 1
227227
;;
228-
observability)
229-
validate_tools kubectl python3 || return 1
230-
validate_cluster || return 1
231-
;;
228+
232229
*)
233230
log_error "Unknown test type: $test_type"
234231
return 1

scripts/test.sh

Lines changed: 5 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -76,13 +76,11 @@ ENVIRONMENT VARIABLES:
7676
EXAMPLES:
7777
$(basename "$0") # Run all tests
7878
$(basename "$0") helm # Run only Helm tests
79-
$(basename "$0") integration # Run only integration tests
80-
$(basename "$0") observability # Run only observability tests
79+
$(basename "$0") integration # Run only integration tests (includes observability)
8180
$(basename "$0") check-deps # Check dependencies only
8281
$(basename "$0") check-deployment # Check deployment status only
8382
$(basename "$0") all --debug # Run all tests with debug output
8483
$(basename "$0") integration --debug # Run integration tests with enhanced logging
85-
$(basename "$0") observability --debug # Run observability tests with debug output
8684
$(basename "$0") --help # Show this help
8785
8886
EOF
@@ -92,7 +90,7 @@ EOF
9290
parse_args() {
9391
while [[ $# -gt 0 ]]; do
9492
case $1 in
95-
helm|integration|observability|all|check-deps|check-deployment)
93+
helm|integration|all|check-deps|check-deployment)
9694
COMMAND="$1"; shift ;;
9795
--debug)
9896
DEBUG_MODE=true; shift ;;
@@ -121,10 +119,6 @@ check_integration_dependencies() {
121119
preflight_test "integration" || exit 1
122120
}
123121

124-
# Check dependencies for observability tests
125-
check_observability_dependencies() {
126-
preflight_test "observability" || exit 1
127-
}
128122

129123

130124
# Install Python test dependencies
@@ -354,24 +348,6 @@ run_integration_tests() {
354348
log_info "✅ Integration tests completed"
355349
}
356350

357-
# Run observability checks (simplified helper)
358-
run_observability_checks() {
359-
log_info "Checking monitoring stack status..."
360-
361-
# Check for monitoring components (required for autoscaling)
362-
kubectl get pods -n "$NAMESPACE" | grep -E "(prometheus|grafana|metrics-server)" || {
363-
log_error "No monitoring components found - required for autoscaling"
364-
return 1
365-
}
366-
367-
# Check HPA resources
368-
kubectl get hpa -n "$NAMESPACE" || {
369-
log_error "No HPA resources found - autoscaling not configured"
370-
return 1
371-
}
372-
373-
return 0
374-
}
375351

376352

377353
# Main function
@@ -383,12 +359,10 @@ main() {
383359
COMMAND="all"
384360
fi
385361

386-
log_info "eoAPI Test Suite - Command: $COMMAND | Debug: $DEBUG_MODE | Release: $RELEASE_NAME"
387-
388362
if [ "$DEBUG_MODE" = true ]; then
389-
log_info "Starting eoAPI test suite (DEBUG MODE) - Command: $COMMAND"
363+
log_info "eoAPI Test Suite (DEBUG) - Command: $COMMAND | Release: $RELEASE_NAME"
390364
else
391-
log_info "Starting eoAPI test suite - Command: $COMMAND"
365+
log_info "eoAPI Test Suite - Command: $COMMAND | Release: $RELEASE_NAME"
392366
fi
393367

394368
# Run tests based on command
@@ -471,11 +445,7 @@ main() {
471445
rm -f /tmp/eoapi-port-forward-pids
472446
fi
473447

474-
if [ "$DEBUG_MODE" = true ]; then
475-
log_info "eoAPI test suite complete (DEBUG MODE)!"
476-
else
477-
log_info "eoAPI test suite complete!"
478-
fi
448+
log_info "✅ Test suite complete"
479449
}
480450

481451
# Run main function

0 commit comments

Comments
 (0)