Skip to content

Commit 134026b

Browse files
authored
improvements in test cluster creation (#40)
* improvements in test cluster creation * only pre-pull small images
1 parent 22ecc73 commit 134026b

File tree

4 files changed

+59
-11836
lines changed

4 files changed

+59
-11836
lines changed

hack/deploy-kueue.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ KUEUE_VERSION=v0.6.0
1818

1919
export ROOT_DIR="$(dirname "$(dirname "$(readlink -fn "$0")")")"
2020

21-
echo "Deploying Kueue version $KUEUE_VERSION"
21+
echo "Downloading and patching Kueue ${KUEUE_VERSION} manifests"
22+
wget https://github.com/kubernetes-sigs/kueue/releases/download/${KUEUE_VERSION}/manifests.yaml -O $ROOT_DIR/hack/kueue/kueue-manifest.yaml
23+
patch -p 0 $ROOT_DIR/hack/kueue/kueue-manifest.yaml < $ROOT_DIR/hack/kueue/patch-01-v0.6.0.txt
2224

23-
kubectl apply --server-side -f $ROOT_DIR/hack/kueue/kueue-manifests-${KUEUE_VERSION}.yaml
25+
echo "Deploying Kueue version $KUEUE_VERSION"
26+
kubectl apply --server-side -f $ROOT_DIR/hack/kueue/kueue-manifest.yaml
2427

2528
# Sleep until the kueue manager is running
2629
echo "Waiting for pods in the kueue-system namespace to become ready"
@@ -30,6 +33,8 @@ do
3033
done
3134
echo ""
3235

36+
rm -f $ROOT_DIR/hack/kueue/kueue-manifest.yaml
37+
3338
# Define a default local queue in the default namespace
3439
echo "Attempting to define default local queue"
3540

hack/e2e-util.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,15 @@ export KIND_OPT=${KIND_OPT:=" --config ${ROOT_DIR}/hack/kind-config.yaml"}
1919
export KA_BIN=_output/bin
2020
export WAIT_TIME="20s"
2121
export KUTTL_VERSION=0.15.0
22-
export KUBEFLOW_VERSION=v1.7.0
2322
export CERTMANAGER_VERSION=v1.13.3
23+
export KUBEFLOW_VERSION=v1.7.0
2424
DUMP_LOGS="true"
2525

26-
# These are images used by the e2e tests.
26+
# These are small images used by the e2e tests.
2727
# Pull and kind load to avoid long delays during testing
2828
export IMAGE_ECHOSERVER="quay.io/project-codeflare/echo-server:1.0"
2929
export IMAGE_BUSY_BOX_LATEST="quay.io/project-codeflare/busybox:latest"
30+
export IMAGE_ALPINE_310="docker.io/alpine:3.10"
3031

3132
function update_test_host {
3233

@@ -114,7 +115,7 @@ function check_prerequisites {
114115
}
115116

116117
function pull_images {
117-
for image in ${IMAGE_ECHOSERVER} ${IMAGE_BUSY_BOX_LATEST}
118+
for image in ${IMAGE_ECHOSERVER} ${IMAGE_BUSY_BOX_LATEST} ${IMAGE_ALPINE_310}
118119
do
119120
docker pull $image
120121
if [ $? -ne 0 ]
@@ -137,7 +138,7 @@ function kind_up_cluster {
137138
fi
138139
CLUSTER_STARTED="true"
139140

140-
for image in ${IMAGE_ECHOSERVER} ${IMAGE_BUSY_BOX_LATEST}
141+
for image in ${IMAGE_ECHOSERVER} ${IMAGE_BUSY_BOX_LATEST} ${IMAGE_ALPINE_310}
141142
do
142143
kind load docker-image ${image} ${CLUSTER_CONTEXT}
143144
if [ $? -ne 0 ]

0 commit comments

Comments
 (0)