Fix merlin unitttest

caraml-dev · Dec 11, 2023 · c297b78 · c297b78
1 parent 56bc5cd
commit c297b78
Showing 1 changed file with 13 additions and 39 deletions.
diff --git a/charts/merlin/tests/merlin_config_secret_test.yaml b/charts/merlin/tests/merlin_config_secret_test.yaml
@@ -124,22 +124,10 @@ tests:
           pattern: my-release-merlin-config$
       - matchRegex:
           path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py38:1.0.0-test-release"
+          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:1.0.0-test-release"
       - matchRegex:
           path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py39:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py310:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base-py38:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base-py39:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base-py310:1.0.0-test-release"
+          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:1.0.0-test-release"
       - matchRegex:
           path: stringData.[config.yaml]
           pattern: "ImageName: ghcr.io/caraml-dev/merlin-transformer:1.0.0-test-release"
@@ -164,11 +152,10 @@ tests:
         releasedVersion: v1.0.0-test-release
         overrides:
           ImageBuilderConfig:
-            BaseImages:
-              3.10.*:
-                ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py310:0.0.0-some-other-value
-                DockerfilePath: "python/pyfunc-server/docker/Dockerfile"
-                BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/pull/465"
+            BaseImage:
+              ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-some-other-value
+              DockerfilePath: "python/pyfunc-server/docker/Dockerfile"
+              BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/pull/465"
     asserts:
       - isKind:
           of: Secret
@@ -177,22 +164,10 @@ tests:
           pattern: my-release-merlin-config$
       - matchRegex:
           path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py38:1.0.0-test-release"
+          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-some-other-value"
       - matchRegex:
           path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py39:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py310:0.0.0-some-other-value"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base-py38:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base-py39:1.0.0-test-release"
-      - matchRegex:
-          path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base-py310:1.0.0-test-release"
+          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyspark-base:1.0.0-test-release"
       - matchRegex:
           path: stringData.[config.yaml]
           pattern: "ImageName: ghcr.io/caraml-dev/merlin-transformer:1.0.0-test-release"
@@ -208,11 +183,10 @@ tests:
           tag: "test-tag"
       config:
         ImageBuilderConfig:
-          BaseImages:
-            3.10.*:
-              ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py310:0.0.0-set-from-config
-              DockerfilePath: "python/pyfunc-server/docker/Dockerfile"
-              BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/pull/123"
+          BaseImage:
+            ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-set-from-config
+            DockerfilePath: "python/pyfunc-server/docker/Dockerfile"
+            BuildContextURI: "git://github.com/caraml-dev/merlin.git#refs/pull/123"
     asserts:
       - isKind:
           of: Secret
@@ -221,7 +195,7 @@ tests:
           pattern: my-release-merlin-config$
       - matchRegex:
           path: stringData.[config.yaml]
-          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base-py310:0.0.0-set-from-config"
+          pattern: "ImageName: ghcr.io/caraml-dev/merlin/merlin-pyfunc-base:0.0.0-set-from-config"
       - matchRegex:
           path: stringData.[config.yaml]
           pattern: "BuildContextURI: git://github.com/caraml-dev/merlin.git#refs/pull/123"