Merge branch 'main' into KF-6558-integrate-kfp-schedwf-rock-2.3

canonical · Nov 27, 2024 · b060ebc · b060ebc
2 parents a020838 + 8523e2e
commit b060ebc
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 6 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -179,6 +179,8 @@ jobs:
         run: juju status
         if: failure()
 
+      # Collect debug artefacts only on failure || cancelled as the CI for this repository
+      # in particular struggles with storage limitations.
       - name: Collect charm debug artifacts
         uses: canonical/kubeflow-ci/actions/dump-charm-debug-artifacts@main
-        if: always()
+        if: failure() || cancelled()
diff --git a/charms/kfp-api/metadata.yaml b/charms/kfp-api/metadata.yaml
@@ -15,7 +15,7 @@ resources:
   oci-image:
     type: oci-image
     description: Backing OCI image
-    upstream-source: gcr.io/ml-pipeline/api-server:2.3.0
+    upstream-source: charmedkubeflow/api-server:2.3.0-5e9542c
 requires:
   mysql:
     interface: mysql

diff --git a/charms/kfp-metadata-writer/metadata.yaml b/charms/kfp-metadata-writer/metadata.yaml
@@ -13,7 +13,7 @@ resources:
   oci-image:
     type: oci-image
     description: OCI image for KFP Metadata Writer
-    upstream-source: gcr.io/ml-pipeline/metadata-writer:2.3.0
+    upstream-source: charmedkubeflow/metadata-writer:2.3.0-519bac2
 requires:
   grpc:
     interface: k8s-service

diff --git a/charms/kfp-viz/metadata.yaml b/charms/kfp-viz/metadata.yaml
@@ -11,7 +11,7 @@ resources:
   oci-image:
     type: oci-image
     description: OCI image for ml-pipeline-visualizationserver
-    upstream-source: gcr.io/ml-pipeline/visualization-server:2.3.0
+    upstream-source: charmedkubeflow/visualization-server:2.3.0-a2f7f9e
 provides:
   kfp-viz:
     interface: k8s-service

diff --git a/tests/integration/bundles/kfp_1.8_stable_install.yaml.j2 b/tests/integration/bundles/kfp_1.8_stable_install.yaml.j2
@@ -4,7 +4,6 @@ applications:
   argo-controller:         { charm: ch:argo-controller, channel: 3.3.10/stable, scale: 1, trust: true }
   metacontroller-operator: { charm: ch:metacontroller-operator, channel: 3.0/stable, scale: 1, trust: true }
   minio:                   { charm: ch:minio, channel: ckf-1.8/stable,       scale: 1 }
-  kfp-db:                  { charm: ch:mysql-k8s, channel: 8.0/stable, scale: 1, constraints: mem=2G, trust: true }
   mlmd:                    { charm: ch:mlmd, channel: 1.14/stable, scale: 1 }
   envoy:                   { charm: ch:envoy, channel: 2.0/stable, scale: 1 }
   kubeflow-profiles:       { charm: ch:kubeflow-profiles, channel: 1.8/stable, scale: 1, trust: true }
@@ -22,6 +21,13 @@ applications:
     options:
       default-gateway: kubeflow-gateway
     trust: true
+  kfp-db:
+    charm: mysql-k8s
+    channel: 8.0/stable
+    scale: 1
+    options:
+      profile: testing
+    trust: true
   kubeflow-roles:
     charm: kubeflow-roles
     channel: 1.8/stable

diff --git a/tests/integration/bundles/kfp_latest_edge.yaml.j2 b/tests/integration/bundles/kfp_latest_edge.yaml.j2
@@ -4,7 +4,6 @@ applications:
   argo-controller:         { charm: ch:argo-controller, channel: latest/edge, scale: 1, trust: true }
   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, trust: true }
   mlmd:                    { charm: ch:mlmd, channel: latest/edge, scale: 1, trust: true}
   envoy:                   { charm: ch:envoy, channel: latest/edge, scale: 1 }
   kubeflow-profiles:       { charm: ch:kubeflow-profiles, channel: latest/edge, scale: 1, trust: true }
@@ -22,6 +21,13 @@ applications:
     options:
       default-gateway: kubeflow-gateway
     trust: true
+  kfp-db:
+    charm: mysql-k8s
+    channel: 8.0/stable
+    scale: 1
+    options:
+      profile: testing
+    trust: true
   kubeflow-roles:
     charm: kubeflow-roles
     channel: latest/edge