Skip to content

Commit 96c7e55

Browse files
authored
new targets for nightly (#977)
Signed-off-by: Mohammed Abdi <mohammed.munir.abdi@ibm.com>
1 parent 2c80fef commit 96c7e55

File tree

2 files changed

+75
-7
lines changed

2 files changed

+75
-7
lines changed

Makefile

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -257,13 +257,6 @@ test-e2e-full: ## Run full e2e test suite
257257
echo "=========================================="; \
258258
exit $$TEST_EXIT_CODE
259259

260-
# Stub for llm-d nightly reusable workflows (test_target=test-llm-d-nightly)
261-
# No-op; temporarily satisfies nightly CI make invocation
262-
# TODO: add nightly guide tests here
263-
.PHONY: test-llm-d-nightly
264-
test-llm-d-nightly:
265-
@:
266-
267260
# Convenience targets for local e2e testing
268261

269262
# Convenience target that deploys infra + runs smoke tests.
@@ -301,6 +294,24 @@ test-benchmark: manifests generate fmt vet ## Run benchmark tests (scale-up-late
301294
.PHONY: test-benchmark-with-setup
302295
test-benchmark-with-setup: deploy-e2e-infra test-benchmark
303296

297+
# Stub for llm-d nightly reusable workflows (test_target=nightly-test-llm-d)
298+
# No-op; temporarily satisfies nightly CI make invocation
299+
# TODO: add nightly guide tests here
300+
.PHONY: nightly-test-llm-d
301+
nightly-test-llm-d: ## Nightly CI: noop; use as test_target instead of empty string
302+
@:
303+
304+
# Shared script: deploy/lib/llm_d_nightly_install.sh
305+
# Canonical target for llm-d-infra nightly reusables: ENVIRONMENT=openshift|kubernetes
306+
.PHONY: nightly-deploy-wva-guide
307+
nightly-deploy-wva-guide: ## Nightly: full WVA+llm-d stack from job env (WVA_NS <- WVA_NAMESPACE or CONTROLLER_NAMESPACE)
308+
@export WVA_NS="$${WVA_NS:-$${WVA_NAMESPACE:-$${CONTROLLER_NAMESPACE:-}}}"; \
309+
if [ "$${ENVIRONMENT:-}" = openshift ]; then \
310+
LLM_D_NIGHTLY_PLATFORM=openshift bash "$(CURDIR)/deploy/lib/llm_d_nightly_install.sh" "$(CURDIR)"; \
311+
else \
312+
LLM_D_NIGHTLY_PLATFORM=cks bash "$(CURDIR)/deploy/lib/llm_d_nightly_install.sh" "$(CURDIR)"; \
313+
fi
314+
304315
.PHONY: lint
305316
lint: golangci-lint ## Run golangci-lint linter
306317
$(GOLANGCI_LINT) run
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
#!/usr/bin/env bash
2+
# Shared deploy path for llm-d-infra nightly reusables (CKS + OpenShift).
3+
# Invoked via: make nightly-deploy-wva-guide (sets LLM_D_NIGHTLY_PLATFORM=cks|openshift).
4+
set -euo pipefail
5+
6+
ROOT="${1:-.}"
7+
cd "$ROOT"
8+
9+
PLATFORM="${LLM_D_NIGHTLY_PLATFORM:?LLM_D_NIGHTLY_PLATFORM must be cks or openshift}"
10+
if [[ "$PLATFORM" != cks && "$PLATFORM" != openshift ]]; then
11+
echo "LLM_D_NIGHTLY_PLATFORM must be cks or openshift (got: $PLATFORM)" >&2
12+
exit 1
13+
fi
14+
15+
if [[ -n "${GITHUB_WORKSPACE:-}" && ! -d llm-d && -d "$GITHUB_WORKSPACE/guides" ]]; then
16+
ln -sfn "$GITHUB_WORKSPACE" llm-d
17+
echo "Symlinked $ROOT/llm-d -> $GITHUB_WORKSPACE"
18+
fi
19+
20+
if [[ "$PLATFORM" == cks ]]; then
21+
for f in deploy/lib/deploy_prometheus_kube_stack.sh deploy/kubernetes/install.sh; do
22+
if [[ -f "$f" ]] && grep -q 'helm upgrade --install kube-prometheus-stack' "$f" && ! grep -q 'nodeExporter.enabled=false' "$f"; then
23+
perl -pi -e 's/helm upgrade --install kube-prometheus-stack/helm upgrade --install kube-prometheus-stack --set nodeExporter.enabled=false/g' "$f"
24+
echo "Patched $f: nodeExporter.enabled=false (CKS nightly)"
25+
fi
26+
done
27+
fi
28+
29+
export INSTALL_GATEWAY_CTRLPLANE="${INSTALL_GATEWAY_CTRLPLANE:-false}"
30+
export BENCHMARK_MODE="${BENCHMARK_MODE:-false}"
31+
export E2E_TESTS_ENABLED="${E2E_TESTS_ENABLED:-true}"
32+
export NAMESPACE_SCOPED="${NAMESPACE_SCOPED:-false}"
33+
export DEPLOY_WVA="${DEPLOY_WVA:-true}"
34+
export DEPLOY_PROMETHEUS="${DEPLOY_PROMETHEUS:-true}"
35+
export DEPLOY_PROMETHEUS_ADAPTER="${DEPLOY_PROMETHEUS_ADAPTER:-true}"
36+
export DEPLOY_VA="${DEPLOY_VA:-false}"
37+
export DEPLOY_HPA="${DEPLOY_HPA:-false}"
38+
export SCALER_BACKEND="${SCALER_BACKEND:-keda}"
39+
export ENABLE_SCALE_TO_ZERO="${ENABLE_SCALE_TO_ZERO:-true}"
40+
export POOL_GROUP="${POOL_GROUP:-inference.networking.k8s.io}"
41+
42+
if [[ "$PLATFORM" == openshift ]]; then
43+
export MONITORING_NAMESPACE="${MONITORING_NAMESPACE:-openshift-user-workload-monitoring}"
44+
export WVA_METRICS_SECURE="${WVA_METRICS_SECURE:-false}"
45+
export ENVIRONMENT=openshift
46+
./deploy/install.sh \
47+
--model "${MODEL_ID:-unsloth/Meta-Llama-3.1-8B}" \
48+
--accelerator "${ACCELERATOR_TYPE:-H100}" \
49+
--release-name "${WVA_RELEASE_NAME:-workload-variant-autoscaler}" \
50+
--environment openshift
51+
else
52+
export ENVIRONMENT=kubernetes
53+
./deploy/install.sh \
54+
--model "${MODEL_ID:-unsloth/Meta-Llama-3.1-8B}" \
55+
--accelerator "${ACCELERATOR_TYPE:-H100}" \
56+
--release-name "${WVA_RELEASE_NAME:-workload-variant-autoscaler}"
57+
fi

0 commit comments

Comments
 (0)