From e90eb63f28c9abc39c9a4a40dee277ae21896790 Mon Sep 17 00:00:00 2001
From: Carl Csaposs <carl.csaposs@canonical.com>
Date: Mon, 27 May 2024 12:22:36 +0000
Subject: [PATCH] compatible(integration_test_charm.yaml): Add support for
 arm64 on microk8s (#177)

arch constraint needs to be set on lxd and microk8s models, not just lxd
models
---
 .github/workflows/integration_test_charm.yaml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/integration_test_charm.yaml b/.github/workflows/integration_test_charm.yaml
index d0f9a97b..25cb66cf 100644
--- a/.github/workflows/integration_test_charm.yaml
+++ b/.github/workflows/integration_test_charm.yaml
@@ -301,17 +301,13 @@ jobs:
         run: |
           mkdir -p ~/.local/share/juju  # Workaround for juju 3 strict snap
           sg '${{ steps.parse-cloud.outputs.group }}' -c "juju bootstrap '${{ inputs.cloud }}' '${{ steps.parse-versions.outputs.agent_bootstrap_option }}'"
-      - name: Set up environment
-        run: |
           juju model-defaults logging-config='<root>=INFO; unit=DEBUG'
           juju add-model test
+          # Unable to set constraint on all models because of Juju bug:
+          # https://bugs.launchpad.net/juju/+bug/2065050
+          juju set-model-constraints arch='${{ inputs.architecture }}'
           pipx install tox
           pipx install poetry
-      - name: Add architecture model constraint
-        if: ${{ inputs.cloud == 'lxd' }}
-        # Unable to set constraint on all models because of Juju bug:
-        # https://bugs.launchpad.net/juju/+bug/2065050
-        run: juju set-model-constraints arch='${{ inputs.architecture }}'
       - name: Update python-libjuju version
         if: ${{ inputs.libjuju-version-constraint }}
         run: poetry add --lock --group integration juju@'${{ inputs.libjuju-version-constraint }}'