Skip to content

Commit edbb8af

Browse files
andresllhmholder6
andresllh
authored and
mholder6
committed
Updated images. Commented out tests
Signed-off-by: Mariah Holder <marholde@redhat.com> Tracking progress Signed-off-by: Mariah Holder <marholde@redhat.com>
1 parent 8a60bde commit edbb8af

File tree

6 files changed

+85
-85
lines changed

6 files changed

+85
-85
lines changed

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@ test:
6464
.PHONY: fvt
6565
## Run FVT tests (Requires ModelMesh Serving deployment and GinkGo CLI)
6666
fvt:
67-
ginkgo -v -procs=2 --fail-fast fvt/predictor fvt/scaleToZero fvt/storage fvt/hpa --timeout=50m
67+
ginkgo -v -procs=1 --fail-fast fvt/predictor fvt/scaleToZero fvt/storage fvt/hpa --timeout=50m
6868

6969
fvt-stable:
70-
ginkgo -v -procs=2 --fail-fast fvt/predictor fvt/scaleToZero fvt/storage fvt/hpa --timeout=50m
70+
ginkgo -v -procs=1 --fail-fast fvt/predictor fvt/scaleToZero fvt/storage fvt/hpa --timeout=50m
7171

7272
.PHONY: codegen-fvt
7373
## Regenerate grpc code stubs for FVT

‎fvt/hpa/hpa_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ var _ = Describe("Scaling of runtime deployments with HPA Autoscaler", Ordered,
153153
By("Delete all predictors")
154154
FVTClientInstance.DeleteAllPredictors()
155155
// ensure a stable deploy state
156-
WaitForStableActiveDeployState(10 * time.Second)
156+
WaitForStableActiveDeployState(1000 * time.Second)
157157

158158
By("Check ScaleToZero and No HPA")
159159
expectScaledToZero()

‎fvt/predictor/predictor_test.go‎

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -49,70 +49,70 @@ type FVTPredictor struct {
4949

5050
// Array of all the predictors that need to be tested
5151
var predictorsArray = []FVTPredictor{
52-
{
53-
predictorName: "tf",
54-
predictorFilename: "tf-predictor.yaml",
55-
currentModelPath: "fvt/tensorflow/mnist.savedmodel",
56-
updatedModelPath: "fvt/tensorflow/mnist-dup.savedmodel",
57-
differentPredictorName: "onnx",
58-
differentPredictorFilename: "onnx-predictor.yaml",
59-
},
60-
{
61-
predictorName: "keras",
62-
predictorFilename: "keras-predictor.yaml",
63-
currentModelPath: "fvt/tensorflow/keras-mnist/mnist.h5",
64-
updatedModelPath: "fvt/tensorflow/keras-mnistnew/mnist.h5",
65-
differentPredictorName: "tf",
66-
differentPredictorFilename: "tf-predictor.yaml",
67-
},
68-
{
69-
predictorName: "onnx",
70-
predictorFilename: "onnx-predictor.yaml",
71-
currentModelPath: "fvt/onnx/onnx-mnist",
72-
updatedModelPath: "fvt/onnx/onnx-mnist-new",
73-
differentPredictorName: "pytorch",
74-
differentPredictorFilename: "pytorch-predictor.yaml",
75-
},
76-
{
77-
predictorName: "onnx-withschema",
78-
predictorFilename: "onnx-predictor-withschema.yaml",
79-
currentModelPath: "fvt/onnx/onnx-withschema",
80-
updatedModelPath: "fvt/onnx/onnx-withschema-new",
81-
differentPredictorName: "pytorch",
82-
differentPredictorFilename: "pytorch-predictor.yaml",
83-
},
84-
{
85-
predictorName: "pytorch",
86-
predictorFilename: "pytorch-predictor.yaml",
87-
currentModelPath: "fvt/pytorch/pytorch-cifar",
88-
updatedModelPath: "fvt/pytorch/pytorch-cifar-new",
89-
differentPredictorName: "onnx",
90-
differentPredictorFilename: "onnx-predictor.yaml",
91-
},
92-
{
93-
predictorName: "xgboost",
94-
predictorFilename: "xgboost-predictor.yaml",
95-
currentModelPath: "fvt/xgboost/mushroom",
96-
updatedModelPath: "fvt/xgboost/mushroom-dup",
97-
differentPredictorName: "onnx",
98-
differentPredictorFilename: "onnx-predictor.yaml",
99-
},
100-
{
101-
predictorName: "lightgbm",
102-
predictorFilename: "lightgbm-predictor.yaml",
103-
currentModelPath: "fvt/lightgbm/mushroom",
104-
updatedModelPath: "fvt/lightgbm/mushroom-dup",
105-
differentPredictorName: "onnx",
106-
differentPredictorFilename: "onnx-predictor.yaml",
107-
},
108-
{
109-
predictorName: "openvino",
110-
predictorFilename: "openvino-mnist-predictor.yaml",
111-
currentModelPath: "fvt/openvino/mnist",
112-
updatedModelPath: "fvt/openvino/mnist-dup",
113-
differentPredictorName: "xgboost",
114-
differentPredictorFilename: "xgboost-predictor.yaml",
115-
},
52+
// {
53+
// predictorName: "tf",
54+
// predictorFilename: "tf-predictor.yaml",
55+
// currentModelPath: "fvt/tensorflow/mnist.savedmodel",
56+
// updatedModelPath: "fvt/tensorflow/mnist-dup.savedmodel",
57+
// differentPredictorName: "onnx",
58+
// differentPredictorFilename: "onnx-predictor.yaml",
59+
// },
60+
// {
61+
// predictorName: "keras",
62+
// predictorFilename: "keras-predictor.yaml",
63+
// currentModelPath: "fvt/tensorflow/keras-mnist/mnist.h5",
64+
// updatedModelPath: "fvt/tensorflow/keras-mnistnew/mnist.h5",
65+
// differentPredictorName: "tf",
66+
// differentPredictorFilename: "tf-predictor.yaml",
67+
// },
68+
// {
69+
// predictorName: "onnx",
70+
// predictorFilename: "onnx-predictor.yaml",
71+
// currentModelPath: "fvt/onnx/onnx-mnist",
72+
// updatedModelPath: "fvt/onnx/onnx-mnist-new",
73+
// differentPredictorName: "pytorch",
74+
// differentPredictorFilename: "pytorch-predictor.yaml",
75+
// },
76+
// {
77+
// predictorName: "onnx-withschema",
78+
// predictorFilename: "onnx-predictor-withschema.yaml",
79+
// currentModelPath: "fvt/onnx/onnx-withschema",
80+
// updatedModelPath: "fvt/onnx/onnx-withschema-new",
81+
// differentPredictorName: "pytorch",
82+
// differentPredictorFilename: "pytorch-predictor.yaml",
83+
// },
84+
// {
85+
// predictorName: "pytorch",
86+
// predictorFilename: "pytorch-predictor.yaml",
87+
// currentModelPath: "fvt/pytorch/pytorch-cifar",
88+
// updatedModelPath: "fvt/pytorch/pytorch-cifar-new",
89+
// differentPredictorName: "onnx",
90+
// differentPredictorFilename: "onnx-predictor.yaml",
91+
// },
92+
// {
93+
// predictorName: "xgboost",
94+
// predictorFilename: "xgboost-predictor.yaml",
95+
// currentModelPath: "fvt/xgboost/mushroom",
96+
// updatedModelPath: "fvt/xgboost/mushroom-dup",
97+
// differentPredictorName: "onnx",
98+
// differentPredictorFilename: "onnx-predictor.yaml",
99+
// },
100+
// {
101+
// predictorName: "lightgbm",
102+
// predictorFilename: "lightgbm-predictor.yaml",
103+
// currentModelPath: "fvt/lightgbm/mushroom",
104+
// updatedModelPath: "fvt/lightgbm/mushroom-dup",
105+
// differentPredictorName: "onnx",
106+
// differentPredictorFilename: "onnx-predictor.yaml",
107+
// },
108+
// {
109+
// predictorName: "openvino",
110+
// predictorFilename: "openvino-mnist-predictor.yaml",
111+
// currentModelPath: "fvt/openvino/mnist",
112+
// updatedModelPath: "fvt/openvino/mnist-dup",
113+
// differentPredictorName: "xgboost",
114+
// differentPredictorFilename: "xgboost-predictor.yaml",
115+
// },
116116
{
117117
predictorName: "xgboost-fil",
118118
predictorFilename: "xgboost-fil-predictor.yaml",
@@ -121,14 +121,14 @@ var predictorsArray = []FVTPredictor{
121121
differentPredictorName: "onnx",
122122
differentPredictorFilename: "onnx-predictor.yaml",
123123
},
124-
{
125-
predictorName: "lightgbm-fil",
126-
predictorFilename: "lightgbm-fil-predictor.yaml",
127-
currentModelPath: "fvt/lightgbm/mushroom-fil",
128-
updatedModelPath: "fvt/lightgbm/mushroom-fil-dup",
129-
differentPredictorName: "onnx",
130-
differentPredictorFilename: "onnx-predictor.yaml",
131-
},
124+
// {
125+
// predictorName: "lightgbm-fil",
126+
// predictorFilename: "lightgbm-fil-predictor.yaml",
127+
// currentModelPath: "fvt/lightgbm/mushroom-fil",
128+
// updatedModelPath: "fvt/lightgbm/mushroom-fil-dup",
129+
// differentPredictorName: "onnx",
130+
// differentPredictorFilename: "onnx-predictor.yaml",
131+
// },
132132
// TorchServe test is currently disabled
133133
// {
134134
// predictorName: "pytorch-mar",
@@ -1143,7 +1143,7 @@ var _ = Describe("Inference service", Ordered, func() {
11431143
var _ = Describe("test "+i.name+" isvc", Ordered, func() {
11441144
var isvcName string
11451145

1146-
FIt("should successfully load a model", func() {
1146+
It("should successfully load a model", func() {
11471147
isvcObject := NewIsvcForFVT(i.inferenceServiceFileName)
11481148
isvcName = isvcObject.GetName()
11491149
CreateIsvcAndWaitAndExpectReady(isvcObject, PredictorTimeout)
@@ -1156,9 +1156,9 @@ var _ = Describe("Inference service", Ordered, func() {
11561156
ExpectSuccessfulInference_sklearnMnistSvm(isvcName)
11571157
})
11581158

1159-
//AfterAll(func() {
1160-
// FVTClientInstance.DeleteIsvc(isvcName)
1161-
//})
1159+
AfterAll(func() {
1160+
FVTClientInstance.DeleteIsvc(isvcName)
1161+
})
11621162

11631163
})
11641164
}

‎opendatahub/scripts/deploy_fvt.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ if [[ ! -d $MANIFESTS_DIR/fvt ]] || [[ ${force} == "true" ]];then
9696
cp -R $ODH_MANIFESTS_DIR/${target_modelmesh_dir}/odh-modelmesh-controller/dependencies/* $MANIFESTS_DIR/fvt/.
9797
# Convert imaes to use quay.io image (avoid dockerhub pull limit)
9898
minio_tag=$(grep kserve/modelmesh-minio-dev-examples opendatahub/scripts/manifests/fvt/fvt.yaml |cut -d: -f3)
99-
sed "s+kserve/modelmesh-minio-dev-examples:${minio_tag}+quay.io/jooholee/modelmesh-minio-dev-examples:${minio_tag}+g" -i opendatahub/scripts/manifests/fvt/fvt.yaml
100-
sed "s+kserve/modelmesh-minio-examples:${minio_tag}+quay.io/jooholee/modelmesh-minio-examples:${minio_tag}+g" -i opendatahub/scripts/manifests/fvt/fvt.yaml
99+
sed "s+kserve/modelmesh-minio-dev-examples:${minio_tag}+quay.io/rh-ee-allausas/modelmesh-minio-dev-examples:${minio_tag}+g" -i opendatahub/scripts/manifests/fvt/fvt.yaml
100+
sed "s+kserve/modelmesh-minio-examples:${minio_tag}+quay.io/rh-ee-allausas/modelmesh-minio-examples:${minio_tag}+g" -i opendatahub/scripts/manifests/fvt/fvt.yaml
101101
sed 's+ubuntu+quay.io/fedora/fedora:38+g' -i opendatahub/scripts/manifests/fvt/fvt.yaml
102102
fi
103103

‎opendatahub/scripts/install_odh.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ if [[ ${odhoperator} == "true" ]]; then
117117
done
118118
info ".. Opendatahub operator is ready"
119119
info ".. Creating the DSC in ${ctrlnamespace}"
120-
oc apply -n ${ctrlnamespace} -f "${MANIFESTS_DIR}/dsc.yaml"
120+
oc apply -n ${ctrlnamespace} -f "${MANIFESTS_DIR}/dsc.yaml"
121121
else
122122
info ".. Archiving odh-manifests"
123123
archive_root_folder="/tmp"
@@ -160,7 +160,7 @@ else
160160
info "$(cat ${PARAMS})"
161161

162162
# info "installing namespaced rbac"
163-
kustomize build "${archive_folder}"/config/rbac/namespace-scope | oc apply -n "${ctrlnamespace}" -f -
163+
kustomize build "${archive_folder}"/config/rbac/namespace-scope | oc apply -n modelmesh-serving f -
164164

165165
# we want mm namespaced
166166
kustomize build "${archive_folder}"/config/namespace-runtimes | oc apply -n "${ctrlnamespace}" -f -

‎opendatahub/scripts/manifests/fvt/fvt.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ spec:
112112
value: AKIAIOSFODNN7EXAMPLE
113113
- name: MINIO_SECRET_KEY
114114
value: wJalrXUtnFEMI/K7MDENG/bPxRfiCYEXAMPLEKEY
115-
image: quay.io/jooholee/modelmesh-minio-dev-examples:latest
115+
image: quay.io/rh-ee-allausas/modelmesh-minio-dev-examples:latest
116116
name: minio
117117
---
118118
apiVersion: v1
@@ -178,7 +178,7 @@ spec:
178178
restartPolicy: OnFailure
179179
containers:
180180
- name: "copy-pod"
181-
image: quay.io/jooholee/modelmesh-minio-examples:latest
181+
image: quay.io/rh-ee-allausas/modelmesh-minio-examples:latest
182182
securityContext:
183183
allowPrivilegeEscalation: false
184184
command: ["/bin/sh", "-ex", "-c"]

0 commit comments

Comments
 (0)