Merge branch 'main' of github.com:canonical/mysql-k8s-operator into f…

…eature/dpe-2653-profile-limit-option # Conflicts: # lib/charms/mysql/v0/mysql.py # poetry.lock # src/charm.py
canonical · Oct 16, 2023 · 1a4bd63 · 1a4bd63
2 parents 19cd008 + e414ad9
commit 1a4bd63
Show file tree

Hide file tree

Showing 23 changed files with 1,958 additions and 233 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -85,26 +85,26 @@ jobs:
       fail-fast: false
       matrix:
         groups: ${{ fromJSON(needs.gh-hosted-collect-integration-tests.outputs.groups) }}
-        juju-snap-channel:  ["2.9/stable", "3.1/candidate"]
+        juju-snap-channel:  ["2.9/stable", "3.1/stable"]
         include:
-          - juju-snap-channel: "3.1/candidate"
+          - juju-snap-channel: "3.1/stable"
             agent-version: "3.1.6"
             libjuju-version:  "3.2.2"
           - juju-snap-channel: "2.9/stable"
-            agent-version: "2.9.44"
+            agent-version: "2.9.45"
             libjuju-version:  "2.9.44.1"
         exclude:
           # Disabling HA tests, as long as we want to have a limited pipeline on Juju3
-          - juju-snap-channel: "3.1/candidate"
+          - juju-snap-channel: "3.1/stable"
             groups:
               job_name: "high_availability/test_replication.py | group 1"
-          - juju-snap-channel: "3.1/candidate"
+          - juju-snap-channel: "3.1/stable"
             groups:
               job_name: "high_availability/test_self_healing.py | group 1"
-          - juju-snap-channel: "3.1/candidate"
+          - juju-snap-channel: "3.1/stable"
             groups:
               job_name: "high_availability/test_upgrade.py | group 1"
-          - juju-snap-channel: "3.1/candidate"
+          - juju-snap-channel: "3.1/stable"
             groups:
               job_name: "high_availability/test_upgrade_from_stable.py | group 1"
     name: ${{ matrix.juju-snap-channel }} - (GH hosted) ${{ matrix.groups.job_name }}
@@ -130,7 +130,7 @@ jobs:
           bootstrap-options: "--agent-version ${{ matrix.agent-version }}"
           juju-channel: ${{ matrix.juju-snap-channel }}
       - name: Update python-libjuju version
-        if: ${{ matrix.libjuju-version != '2.9.44.1' }}
+        if: ${{ matrix.libjuju-version == '2.9.44.1' }}
         run: poetry add --lock --group integration juju@'${{ matrix.libjuju-version }}'
       - name: Download packed charm(s)
         uses: actions/download-artifact@v3

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -43,6 +43,12 @@ tox run -e unit          # unit tests
 tox run -e integration   # integration tests
 tox                      # runs 'lint' and 'unit' environments
 ```
+Tests by default are using Juju 3. In case tests are to be run against Juju 3, the following
+environment variable should be defined with a valid `juju` Python library version:
+
+```
+export LIBJUJU_VERSION_SPECIFIER=2.9.44.1
+```
 
 ## Build charm
 

diff --git a/charmcraft.yaml b/charmcraft.yaml
@@ -24,4 +24,6 @@ parts:
       - pkg-config
       - rustc
       - cargo
+    prime:
+      - scripts
-Original file line number
+Diff line change
@@ Expand Up / @@ -24,4 +24,6 @@ parts: @@
           - pkg-config
           - rustc
           - cargo
+        prime:
+          - scripts