Merge branch 'main' into KF-5539-pin-integration-tests-deps-in-main

canonical · Apr 25, 2024 · 5c96961 · 5c96961
2 parents 36fb66d + 6f73604
commit 5c96961
Show file tree

Hide file tree

Showing 19 changed files with 652 additions and 100 deletions.
diff --git a/.github/workflows/integrate.yaml b/.github/workflows/integrate.yaml
@@ -141,10 +141,7 @@ jobs:
         run: |
           # Requires the model to be called kubeflow due to kfp-viewer
           juju add-model kubeflow
-          # 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-${{ matrix.sdk }} -- --model kubeflow --bundle=./tests/integration/bundles/kfp_latest_edge.yaml.j2 --destructive-mode"
+          sg snap_microk8s -c "tox -e bundle-integration-${{ matrix.sdk }} -- --model kubeflow --bundle=./tests/integration/bundles/kfp_latest_edge.yaml.j2"
 
       - name: Get all
         run: kubectl get all -A

diff --git a/charms/kfp-api/charmcraft.yaml b/charms/kfp-api/charmcraft.yaml
@@ -11,3 +11,7 @@ bases:
 parts:
   charm:
     charm-python-packages: [setuptools, pip]  # Fixes install of some packages
+    # Install jinja2 (a dependency of charmed-kubeflow-chisme) from binary to avoid build-time issues
+    # See https://github.com/canonical/bundle-kubeflow/issues/883
+    # Remove when https://github.com/canonical/charmcraft/issues/1664 is fixed
+    charm-binary-python-packages: [jinja2]
diff --git a/charms/kfp-metadata-writer/charmcraft.yaml b/charms/kfp-metadata-writer/charmcraft.yaml
@@ -1,6 +1,7 @@
-# Learn more about charmcraft.yaml configuration at:
-# https://juju.is/docs/sdk/charmcraft-config
-type: "charm"
+# Copyright 2024 Canonical Ltd.
+# See LICENSE file for licensing details.
+
+type: charm
 bases:
   - build-on:
     - name: "ubuntu"
@@ -10,4 +11,12 @@ bases:
       channel: "20.04"
 parts:
   charm:
+    # These build-packages are defined here because pydantic needs them
+    # at build time. As long as pydantic is listed in requirements.in, this
+    # list cannot be removed/changed.
+    build-packages: [cargo, rustc, pkg-config, libffi-dev, libssl-dev]
     charm-python-packages: [setuptools, pip]  # Fixes install of some packages
+    # Install jinja2 (a dependency of charmed-kubeflow-chisme) from binary to avoid build-time issues
+    # See https://github.com/canonical/bundle-kubeflow/issues/883
+    # Remove when https://github.com/canonical/charmcraft/issues/1664 is fixed
+    charm-binary-python-packages: [jinja2]