use 2.x/stable charmcraft channel

charmed-kubernetes · Sep 4, 2024 · cd36d0e · cd36d0e
1 parent 40a46bd
commit cd36d0e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/.charmcraft-channel b/.charmcraft-channel
@@ -1 +1,5 @@
+<<<<<<< HEAD
 2.x/stable
+=======
+2.x/stable
+>>>>>>> 5c1f3ec (use 2.x/stable charmcraft channel)
diff --git a/.github/workflows/vsphere-integration.yaml b/.github/workflows/vsphere-integration.yaml
@@ -21,6 +21,7 @@ jobs:
         with:
           provider: vsphere
           credentials-yaml: ${{ secrets.CREDENTIALS_YAML }}
+          charmcraft-channel: ${{ steps.charmcraft.outputs.channel }}
           clouds-yaml: ${{ secrets.CLOUDS_YAML }}
           bootstrap-constraints: "arch=amd64 cores=2 mem=4G"
           bootstrap-options: "${{ secrets.JAMMY_BOOTSTRAP_OPTIONS }} --model-default datastore=vsanDatastore --model-default primary-network=VLAN_2763 --config caas-image-repo=rocks.canonical.com/cdk/jujusolutions"