Skip to content

Commit f7261de

Browse files
tenzen-ytenzen-y
authored
Change integration test sysytem from KinD Cluster to Minikube Cluster (#1899)
1 parent 2c8758b commit f7261de

File tree

10 files changed

+48
-46
lines changed

10 files changed

+48
-46
lines changed

‎.github/workflows/darts-cifar10-e2e-test.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E Test with darts-cnn-cifar10
22
on:
33
- pull_request
44

5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
58
jobs:
69
e2e:
710
runs-on: ubuntu-20.04
@@ -25,9 +28,8 @@ jobs:
2528
strategy:
2629
fail-fast: false
2730
matrix:
28-
# Detail: https://hub.docker.com/r/kindest/node
2931
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
30-
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
31-
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
32+
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
33+
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
3234
# Comma Delimited
3335
experiments: ["darts-cpu"]

‎.github/workflows/enas-cifar10-e2e-test.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E Test with enas-cnn-cifar10
22
on:
33
- pull_request
44

5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
58
jobs:
69
e2e:
710
runs-on: ubuntu-20.04
@@ -25,9 +28,8 @@ jobs:
2528
strategy:
2629
fail-fast: false
2730
matrix:
28-
# Detail: https://hub.docker.com/r/kindest/node
2931
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
30-
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
31-
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
32+
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
33+
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
3234
# Comma Delimited
3335
experiments: ["enas-cpu"]

‎.github/workflows/katib-ui-e2e-test.yaml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E Test for katib-ui
22
on:
33
- pull_request
44

5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
58
jobs:
69
e2e:
710
runs-on: ubuntu-20.04
@@ -15,16 +18,15 @@ jobs:
1518
with:
1619
kubernetes-version: ${{ matrix.kubernetes-version }}
1720

18-
- name: Set Up KinD Cluster
19-
run: ./test/e2e/v1beta1/scripts/gh-actions/setup-kind.sh true
21+
- name: Set Up Minikube Cluster
22+
run: ./test/e2e/v1beta1/scripts/gh-actions/setup-minikube.sh true
2023

2124
- name: Start Katib
2225
run: ./test/e2e/v1beta1/scripts/gh-actions/setup-katib.sh true false
2326

2427
strategy:
2528
fail-fast: false
2629
matrix:
27-
# Detail: https://hub.docker.com/r/kindest/node
2830
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
29-
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
30-
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
31+
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
32+
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]

‎.github/workflows/mxnet-mnist-e2e-test.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E Test with mxnet-mnist
22
on:
33
- pull_request
44

5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
58
jobs:
69
e2e:
710
runs-on: ubuntu-20.04
@@ -25,10 +28,9 @@ jobs:
2528
strategy:
2629
fail-fast: false
2730
matrix:
28-
# Detail: https://hub.docker.com/r/kindest/node
2931
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
30-
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
31-
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
32+
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
33+
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
3234
# Comma Delimited
3335
experiments:
3436
# suggestion-hyperopt

‎.github/workflows/pytorch-mnist-e2e-test.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E Test with pytorch-mnist
22
on:
33
- pull_request
44

5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
58
jobs:
69
e2e:
710
runs-on: ubuntu-20.04
@@ -26,10 +29,9 @@ jobs:
2629
strategy:
2730
fail-fast: false
2831
matrix:
29-
# Detail: https://hub.docker.com/r/kindest/node
3032
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
31-
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
32-
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
33+
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
34+
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
3335
# Comma Delimited
3436
experiments:
3537
- "file-metrics-collector,pytorchjob-mnist"

‎.github/workflows/template-e2e-test/action.yaml

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# Template for e2e tests.
22

33
inputs:
4-
cluster_name:
5-
required: false
6-
type: string
7-
default: katib-e2e-cluster
84
experiments:
95
required: true
106
type: string
@@ -22,9 +18,9 @@ inputs:
2218
runs:
2319
using: composite
2420
steps:
25-
- name: Set Up KinD Cluster
21+
- name: Set Up Minikube Cluster
2622
shell: bash
27-
run: ./test/e2e/v1beta1/scripts/gh-actions/setup-kind.sh ${{ inputs.katib-ui }} ${{ inputs.trial-images }} ${{ inputs.cluster_name }} ${{ inputs.experiments }}
23+
run: ./test/e2e/v1beta1/scripts/gh-actions/setup-minikube.sh ${{ inputs.katib-ui }} ${{ inputs.trial-images }} ${{ inputs.experiments }}
2824

2925
- name: Set Up Katib
3026
shell: bash

‎.github/workflows/template-setup-e2e-test/action.yaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,21 +4,17 @@ inputs:
44
kubernetes-version:
55
required: true
66
type: string
7-
cluster_name:
8-
required: false
9-
type: string
10-
default: katib-e2e-cluster
117

128
runs:
139
using: composite
1410
steps:
15-
- name: Set Up KinD Cluster
16-
uses: helm/[email protected].0
11+
- name: Set Up Minikube Cluster
12+
uses: manusa/[email protected].0
1713
with:
18-
version: v0.13.0
19-
node_image: kindest/node:${{ inputs.kubernetes-version }}
20-
cluster_name: ${{ inputs.cluster_name }}
21-
wait: 120s
14+
minikube version: "v1.25.2"
15+
kubernetes version: ${{ inputs.kubernetes-version }}
16+
start args: --driver none --wait-timeout=60s
17+
github token: ${{ env.GITHUB_TOKEN }}
2218

2319
- name: Set Up Docker Buildx
2420
uses: docker/setup-buildx-action@v1

‎.github/workflows/tf-mnist-with-summaries-e2e-test.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@ name: E2E Test with tf-mnist-with-summaries
22
on:
33
- pull_request
44

5+
env:
6+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
7+
58
jobs:
69
e2e:
710
runs-on: ubuntu-20.04
@@ -26,9 +29,8 @@ jobs:
2629
strategy:
2730
fail-fast: false
2831
matrix:
29-
# Detail: https://hub.docker.com/r/kindest/node
3032
# TODO (tenzen-y): We need to consider running tests on more kubernetes versions.
31-
# kubernetes-version: ["v1.20.15", "v1.21.12", "v1.22.9", "v1.23.6", "v1.24.1"]
32-
kubernetes-version: ["v1.21.12", "v1.22.9", "v1.23.6"]
33+
# kubernetes-version: ["v1.20.15", "v1.21.13", "v1.22.10", "v1.23.7", "v1.24.1"]
34+
kubernetes-version: ["v1.21.13", "v1.22.10", "v1.23.7"]
3335
# Comma Delimited
3436
experiments: ["tfjob-mnist-with-summaries"]

‎test/e2e/v1beta1/scripts/gh-actions/build-load.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ set -o nounset
2323
cd "$(dirname "$0")"
2424

2525
TRIAL_IMAGES=${1:-""}
26-
CLUSTER_NAME=${2:-""}
27-
EXPERIMENTS=${3:-""}
28-
DEPLOY_KATIB_UI=${4:-false}
26+
EXPERIMENTS=${2:-""}
27+
DEPLOY_KATIB_UI=${3:-false}
2928

3029
REGISTRY="docker.io/kubeflowkatib"
3130
TAG="e2e-test"
@@ -55,8 +54,8 @@ _build_containers() {
5554
_load_kind_cluster() {
5655
CONTAINER_NAME=${1:-"katib-controller"}
5756

58-
echo -e "\nLoading $CONTAINER_NAME image to $CLUSTER_NAME...\n"
59-
kind load docker-image "$REGISTRY/$CONTAINER_NAME:$TAG" --name "$CLUSTER_NAME"
57+
echo -e "\n\nLoading $CONTAINER_NAME image...\n\n"
58+
minikube image load "$REGISTRY/$CONTAINER_NAME:$TAG"
6059
}
6160

6261
_install_tools() {

‎test/e2e/v1beta1/scripts/gh-actions/setup-kind.sh renamed to ‎test/e2e/v1beta1/scripts/gh-actions/setup-minikube.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,12 @@ cd "$(dirname "$0")"
2323

2424
DEPLOY_KATIB_UI=${1:-false}
2525
TRIAL_IMAGES=${2:-""}
26-
CLUSTER_NAME=${3:-"katib-e2e-cluster"}
27-
EXPERIMENTS=${4:-""}
26+
EXPERIMENTS=${3:-""}
2827

29-
echo "Start to setup KinD Kubernetes Cluster"
30-
kubectl wait --for condition=ready --timeout=5m node "$CLUSTER_NAME-control-plane"
28+
echo "Start to setup Minikube Kubernetes Cluster"
3129
kubectl version
3230
kubectl cluster-info
3331
kubectl get nodes
32+
3433
echo "Build and Load container images"
35-
./build-load.sh "$TRIAL_IMAGES" "$CLUSTER_NAME" "$EXPERIMENTS" "$DEPLOY_KATIB_UI"
34+
./build-load.sh "$TRIAL_IMAGES" "$EXPERIMENTS" "$DEPLOY_KATIB_UI"

0 commit comments

Comments
 (0)