Skip to content

Commit ff52bd6

Browse files
fix(ci): re-enable XGBoost E2E test (kubeflow#3323)
* test(e2e): re-enable XGBoost E2E test after runtime image publication Signed-off-by: krishna-kg732 <krishnagupta.kg2k6@gmail.com> * Chore:using test image instead of latest Signed-off-by: krishna-kg732 <krishnagupta.kg2k6@gmail.com> --------- Signed-off-by: krishna-kg732 <krishnagupta.kg2k6@gmail.com>
1 parent 29ae8ce commit ff52bd6

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

.github/workflows/test-e2e.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,7 @@ jobs:
6060
make test-e2e-notebook NOTEBOOK_INPUT=./examples/pytorch/audio-classification/audio-classification.ipynb NOTEBOOK_OUTPUT=./artifacts/notebooks/${{ matrix.kubernetes-version }}_audio-classification.ipynb PAPERMILL_TIMEOUT=1800
6161
make test-e2e-notebook NOTEBOOK_INPUT=./examples/local/local-training-mnist.ipynb NOTEBOOK_OUTPUT=./artifacts/notebooks/${{ matrix.kubernetes-version }}_local-training-mnist.ipynb PAPERMILL_TIMEOUT=1800
6262
make test-e2e-notebook NOTEBOOK_INPUT=./examples/local/local-container-mnist.ipynb NOTEBOOK_OUTPUT=./artifacts/notebooks/${{ matrix.kubernetes-version }}_local-container-mnist.ipynb PAPERMILL_TIMEOUT=1800
63-
#TODO(Krishna-kg732): uncomment once the xgboost-runtime image is published
64-
#make test-e2e-notebook NOTEBOOK_INPUT=./examples/xgboost/distributed-training/xgboost-distributed.ipynb NOTEBOOK_OUTPUT=./artifacts/notebooks/${{ matrix.kubernetes-version }}_xgboost-distributed.ipynb PAPERMILL_TIMEOUT=1800
63+
make test-e2e-notebook NOTEBOOK_INPUT=./examples/xgboost/distributed-training/xgboost-distributed.ipynb NOTEBOOK_OUTPUT=./artifacts/notebooks/${{ matrix.kubernetes-version }}_xgboost-distributed.ipynb PAPERMILL_TIMEOUT=1800
6564
6665
# TODO (andreyvelich): Discuss how we can upload artifacts for multiple Notebooks.
6766
- name: Upload Artifacts to GitHub

hack/e2e-setup-cluster.sh

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,20 @@ print_cluster_info() {
9797

9898
# TODO (andreyvelich): Currently, we print manager logs due to flaky test.
9999
echo "Deploy Kubeflow Trainer runtimes"
100-
kubectl apply --server-side -k manifests/overlays/runtimes || (
100+
E2E_RUNTIMES_DIR="artifacts/e2e/runtimes"
101+
mkdir -p "${E2E_RUNTIMES_DIR}"
102+
XGBOOST_RUNTIME_CI_IMAGE_NAME="ghcr.io/kubeflow/trainer/xgboost-runtime"
103+
cat <<EOF >"${E2E_RUNTIMES_DIR}/kustomization.yaml"
104+
apiVersion: kustomize.config.k8s.io/v1beta1
105+
kind: Kustomization
106+
resources:
107+
- ../../../manifests/overlays/runtimes
108+
images:
109+
- name: "${XGBOOST_RUNTIME_CI_IMAGE_NAME}"
110+
newTag: "${CI_IMAGE_TAG}"
111+
EOF
112+
113+
kubectl apply --server-side -k "${E2E_RUNTIMES_DIR}" || (
101114
kubectl logs -n ${NAMESPACE} -l app.kubernetes.io/name=trainer &&
102115
print_cluster_info &&
103116
exit 1
@@ -122,7 +135,7 @@ kubectl apply --server-side -k manifests/overlays/runtimes || (
122135
# load_image_to_kind ${JAX_RUNTIME_IMAGE}
123136

124137
# Build and load custom runtime images that are not available in public registries.
125-
XGBOOST_RUNTIME_CI_IMAGE="ghcr.io/kubeflow/trainer/xgboost-runtime:${CI_IMAGE_TAG}"
138+
XGBOOST_RUNTIME_CI_IMAGE="${XGBOOST_RUNTIME_CI_IMAGE_NAME}:${CI_IMAGE_TAG}"
126139
echo "Build XGBoost runtime image"
127140
${CONTAINER_RUNTIME} build . -f cmd/runtimes/xgboost/Dockerfile -t ${XGBOOST_RUNTIME_CI_IMAGE}
128141
load_image_to_kind ${XGBOOST_RUNTIME_CI_IMAGE}

test/e2e/e2e_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ var _ = ginkgo.Describe("TrainJob e2e", func() {
247247
ginkgo.When("Creating TrainJob to perform XGBoost workload", func() {
248248
// Verify the `xgboost-distributed` ClusterTrainingRuntime.
249249
ginkgo.It("should create TrainJob with XGBoost runtime reference", func() {
250-
// TODO (krishna-kg732): Remove this skip once the xgboost-runtime image is published to GHCR.
251-
ginkgo.Skip("xgboost-runtime image not yet published to GHCR")
252250
// Create a TrainJob.
253251
trainJob := testingutil.MakeTrainJobWrapper(ns.Name, "e2e-test-xgboost").
254252
RuntimeRef(trainer.SchemeGroupVersion.WithKind(trainer.ClusterTrainingRuntimeKind), xgboostRuntime).

0 commit comments

Comments
 (0)