chore: updates the test bundle definitions and use latest/edge for tests

This commit updates the many bundle defintions in tests/integration/bundles/ to match the latest changes to the repository. At the same time it changes the bundle that is used for running repository level integration tests from 1.7/stable to latest/edge to be able to test the kfp-operators and all other related charms with the latest changes.
canonical · Oct 27, 2023 · 0ccb67f · 0ccb67f
1 parent e15dd68
commit 0ccb67f
Show file tree

Hide file tree

Showing 5 changed files with 200 additions and 7 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -145,7 +145,7 @@ jobs:
           # Run integration tests against the 1.7 generic install bundle definition
           # Using destructive mode because of https://github.com/canonical/charmcraft/issues/1132
           # and https://github.com/canonical/charmcraft/issues/1138
-          sg snap_microk8s -c "tox -e bundle-integration -- --model kubeflow --bundle=./tests/integration/bundles/kfp_1.7_stable_install.yaml.j2 --destructive-mode"
+          sg snap_microk8s -c "tox -e bundle-integration -- --model kubeflow --bundle=./tests/integration/bundles/kfp_latest_edge_install.yaml.j2 --destructive-mode"
 
       - name: Get all
         run: kubectl get all -A

diff --git a/tests/integration/bundles/kfp_1.7_stable_install.yaml.j2 b/tests/integration/bundles/kfp_1.7_stable_install.yaml.j2
@@ -8,6 +8,10 @@ applications:
     charm: argo-server
     channel: 3.3/stable
     scale: 1
+  envoy:
+    charm: envoy
+    channel: 1.12/stable
+    scale: 1
   istio-ingressgateway:
     charm: istio-gateway
     channel: 1.16/stable
@@ -29,6 +33,10 @@ applications:
     options:
       profile: testing
     trust: true
+  mlmd:
+    charm: minio
+    channel: 1.14/stable
+    scale: 1
   minio:
     charm: minio
     channel: ckf-1.7/stable
@@ -46,32 +54,37 @@ applications:
 {%- if local_build == false %}
   kfp-api:
     charm: kfp-api
-    channel: 2.0/stable
+    channel: 2.0-alpha.7-alpha.7/stable
+    scale: 1
+    trust: true
+  kfp-metadata-writer:
+    charm: kfp-metadata-writer
+    channel: 2.0-alpha.7/stable
     scale: 1
     trust: true
   kfp-persistence:
     charm: kfp-persistence
-    channel: 2.0/stable
+    channel: 2.0-alpha.7/stable
     scale: 1
     trust: true
   kfp-schedwf:
     charm: kfp-schedwf
-    channel: 2.0/stable
+    channel: 2.0-alpha.7/stable
     scale: 1
     trust: true
   kfp-ui:
     charm: kfp-ui
-    channel: 2.0/stable
+    channel: 2.0-alpha.7/stable
     scale: 1
     trust: true
   kfp-viewer:
     charm: kfp-viewer
-    channel: 2.0/stable
+    channel: 2.0-alpha.7/stable
     scale: 1
     trust: true
   kfp-viz:
     charm: kfp-viz
-    channel: 2.0/stable
+    channel: 2.0-alpha.7/stable
     scale: 1
     trust: true
 {% else %}
@@ -80,6 +93,11 @@ applications:
     resources: {{ kfp_api_resources }}
     scale: 1
     trust: true
+  kfp-metadata-writer:
+    charm: {{ kfp_metadata_writer }}
+    resources: {{ kfp_metadata_writer_resources }}
+    scale: 1
+    trust: true
   kfp-persistence:
     charm: {{ kfp_persistence }}
     resources: {{ kfp_persistence_resources }}
@@ -119,6 +137,14 @@ relations:
   - minio:object-storage
 - - istio-pilot:ingress
   - kfp-ui:ingress
+- - istio-pilot:ingress
+  - kfp-metadata-writer:ingress
+- - mlmd:grpc
+  - kfp-metadata-writer:grpc
+- - mlmd:grpc
+  - envoy:grpc
+- - istio-pilot:ingress
+  - envoy:ingress
 - - kfp-api:kfp-api
   - kfp-ui:kfp-api
 - - kfp-ui:object-storage

diff --git a/tests/integration/bundles/kfp_1.8_stable_install.yaml.j2 b/tests/integration/bundles/kfp_1.8_stable_install.yaml.j2
@@ -0,0 +1,153 @@
+bundle: kubernetes
+applications:
+  argo-controller:
+    charm: argo-controller
+    channel: 3.3/stable
+    scale: 1
+  argo-server:
+    charm: argo-server
+    channel: 3.3/stable
+    scale: 1
+  envoy:
+    charm: envoy
+    channel: 1.12/stable
+    scale: 1
+  istio-ingressgateway:
+    charm: istio-gateway
+    channel: 1.17/stable
+    scale: 1
+    options:
+      kind: ingress
+    trust: true
+  istio-pilot:
+    charm: istio-pilot
+    channel: 1.17/stable
+    scale: 1
+    options:
+      default-gateway: kubeflow-gateway
+    trust: true
+  kfp-db:
+    charm: mysql-k8s
+    channel: 8.0/stable
+    scale: 1
+    options:
+      profile: testing
+    trust: true
+  mlmd:
+    charm: minio
+    channel: 1.14/stable
+    scale: 1
+  minio:
+    charm: minio
+    channel: ckf-1.8/stable
+    scale: 1
+  kubeflow-profiles:
+    charm: kubeflow-profiles
+    channel: 1.8/stable
+    scale: 1
+    trust: true
+  kubeflow-roles:
+    charm: kubeflow-roles
+    channel: 1.8/stable
+    scale: 1
+    trust: true
+{%- if local_build == false %}
+  kfp-api:
+    charm: kfp-api
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+  kfp-metadata-writer:
+    charm: kfp-metadata-writer
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+  kfp-persistence:
+    charm: kfp-persistence
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+  kfp-schedwf:
+    charm: kfp-schedwf
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+  kfp-ui:
+    charm: kfp-ui
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+  kfp-viewer:
+    charm: kfp-viewer
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+  kfp-viz:
+    charm: kfp-viz
+    channel: 2.0/stable
+    scale: 1
+    trust: true
+{% else %}
+  kfp-api:
+    charm: {{ kfp_api }}
+    resources: {{ kfp_api_resources }}
+    scale: 1
+    trust: true
+  kfp-metadata-writer:
+    charm: {{ kfp_metadata_writer }}
+    resources: {{ kfp_metadata_writer_resources }}
+    scale: 1
+    trust: true
+  kfp-persistence:
+    charm: {{ kfp_persistence }}
+    resources: {{ kfp_persistence_resources }}
+    scale: 1
+    trust: true
+  kfp-schedwf:
+    charm: {{ kfp_schedwf }}
+    resources: {{ kfp_schedwf_resources }}
+    scale: 1
+    trust: true
+  kfp-ui:
+    charm: {{ kfp_ui }}
+    resources: {{ kfp_ui_resources }}
+    scale: 1
+    trust: true
+  kfp-viewer:
+    charm: {{ kfp_viewer }}
+    resources: {{ kfp_viewer_resources }}
+    scale: 1
+    trust: true
+  kfp-viz:
+    charm: {{ kfp_viz }}
+    resources: {{ kfp_viz_resources }}
+    scale: 1
+    trust: true
+{%- endif %}
+relations:
+- - kfp-api:kfp-api
+  - kfp-persistence:kfp-api
+- - kfp-api:kfp-viz
+  - kfp-viz:kfp-viz
+- - istio-pilot:istio-pilot
+  - istio-ingressgateway:istio-pilot
+- - kfp-api:relational-db
+  - kfp-db:database
+- - kfp-api:object-storage
+  - minio:object-storage
+- - istio-pilot:ingress
+  - kfp-ui:ingress
+- - istio-pilot:ingress
+  - kfp-metadata-writer:ingress
+- - mlmd:grpc
+  - kfp-metadata-writer:grpc
+- - mlmd:grpc
+  - envoy:grpc
+- - istio-pilot:ingress
+  - envoy:ingress
+- - kfp-api:kfp-api
+  - kfp-ui:kfp-api
+- - kfp-ui:object-storage
+  - minio:object-storage
+- - argo-controller:object-storage
+  - minio:object-storage
diff --git a/tests/integration/bundles/kfp_latest_edge.yaml.j2 b/tests/integration/bundles/kfp_latest_edge.yaml.j2
@@ -5,8 +5,13 @@ applications:
   metacontroller-operator: { charm: ch:metacontroller-operator, channel: latest/edge, scale: 1, trust: true }
   minio:                   { charm: ch:minio, channel: latest/edge,       scale: 1 }
   kfp-db:                  { charm: ch:mysql-k8s, channel: 8.0/stable, scale: 1, constraints: mem=2G}
+  mlmd:                    { charm: ch:mlmd-operator, channel: latest/edge, scale: 1 }
+  envoy:                   { charm: ch:envoy, channel: latest/edge, scale: 1 }
+  istio-pilot:             { charm: ch:istio-pilot, channel: latest/edge, options: default-gateway=kubeflow-gateway, scale: 1 }
+  istio-ingressgateway:    { charm: ch:istio-gateway, channel: latest/edge, scale: 1, options: kind=ingress, trust: true}
 {%- if local_build == false %}
   kfp-api:                 { charm: ch:kfp-api, channel: latest/edge, scale: 1, trust: true}
+  kfp-metadata-writer:     { charm: ch:kfp-metadata-writer, channel: latest/edge, scale: 1, trust: true}
   kfp-profile-controller:  { charm: ch:kfp-profile-controller, channel: latest/edge, scale: 1, trust: true }
   kfp-persistence:         { charm: ch:kfp-persistence, channel: latest/edge, scale: 1, trust: true }
   kfp-schedwf:             { charm: ch:kfp-schedwf, channel: latest/edge, scale: 1, trust: true}
@@ -19,6 +24,11 @@ applications:
     resources: {{ kfp_api_resources }}
     scale: 1
     trust: true
+  kfp-metadata-writer:
+    charm: {{ kfp_metadata_writer }}
+    resources: {{ kfp_metadata_writer_resources }}
+    scale: 1
+    trust: true
   kfp-persistence:
     charm: {{ kfp_persistence }}
     resources: {{ kfp_persistence_resources }}
@@ -58,3 +68,6 @@ relations:
 - [kfp-api:object-storage, minio:object-storage]
 - [kfp-profile-controller:object-storage, minio:object-storage]
 - [kfp-ui:object-storage, minio:object-storage]
+- [envoy:ingress, istio-pilot: ingress]
+- [envoy:grpc, mlmd:grpc]
+- [kfp-metadata-writer:grpc, mlmd:grpc]
diff --git a/tests/integration/kfp_globals.py b/tests/integration/kfp_globals.py
@@ -10,6 +10,7 @@
 # All charms in the kfp-operators repository, except kfp-profile-controller
 KFP_CHARMS = [
     "kfp-api",
+    "kfp-metadata-writer",
     "kfp-persistence",
     "kfp-schedwf",
     "kfp-ui",