feat: restrict jhack to dev preset only

Author: jnsgruk

internal/config/presets.go

@@ -35,7 +35,6 @@ var defaultPackages []string = []string{
 // defaultSnaps is the set of snaps installed for all presets.
 var defaultSnaps map[string]SnapConfig = map[string]SnapConfig{
 	"charmcraft": {Channel: "latest/stable"},
-	"jhack":      {Channel: "latest/stable", Connections: []string{"jhack:dot-local-share-juju"}},
 	"jq":         {Channel: "latest/stable"},
 	"yq":         {Channel: "latest/stable"},
 }
@@ -134,6 +133,7 @@ var devPreset *Config = &Config{
 		Snaps: MergeMaps(defaultSnaps, map[string]SnapConfig{
 			"rockcraft": {Channel: "latest/stable"},
 			"snapcraft": {Channel: "latest/stable"},
+			"jhack":     {Channel: "latest/stable", Connections: []string{"jhack:dot-local-share-juju"}},
 		}),
 	},
 }

tests/preset-k8s/task.yaml

@@ -8,13 +8,10 @@ execute: |
   "$SPREAD_PATH"/concierge --trace prepare -p k8s
 
   # Check that relevant snaps are installed
-  for s in juju k8s kubectl jq yq charmcraft rockcraft jhack; do
+  for s in juju k8s kubectl jq yq charmcraft rockcraft; do
     snap list "$s" | MATCH $s
   done
 
-  # Check jhack got it's interface connected
-  snap connections jhack | MATCH "personal-files  jhack:dot-local-share-juju  :personal-files  manual"
-
   # Check the relevant debs are installed
   command -v pip | MATCH /usr/bin/pip
   python3 -m venv -h | head -n1 | grep -q -e "usage: venv"

tests/preset-machine/task.yaml

@@ -8,13 +8,10 @@ execute: |
   "$SPREAD_PATH"/concierge --trace prepare -p machine
 
   # Check that relevant snaps are installed
-  for s in juju lxd jq yq charmcraft snapcraft jhack; do
+  for s in juju lxd jq yq charmcraft snapcraft; do
     snap list "$s" | MATCH $s
   done
 
-  # Check jhack got it's interface connected
-  snap connections jhack | MATCH "personal-files  jhack:dot-local-share-juju  :personal-files  manual"
-
   # Check the relevant debs are installed
   command -v pip | MATCH /usr/bin/pip
   python3 -m venv -h | head -n1 | grep -q -e "usage: venv"

tests/preset-microk8s/task.yaml

@@ -8,13 +8,10 @@ execute: |
   "$SPREAD_PATH"/concierge --trace prepare -p microk8s
 
   # Check that relevant snaps are installed
-  for s in juju microk8s kubectl jq yq charmcraft rockcraft jhack; do
+  for s in juju microk8s kubectl jq yq charmcraft rockcraft; do
     snap list "$s" | MATCH $s
   done
 
-  # Check jhack got it's interface connected
-  snap connections jhack | MATCH "personal-files  jhack:dot-local-share-juju  :personal-files  manual"
-
   # Check the relevant debs are installed
   command -v pip | MATCH /usr/bin/pip
   python3 -m venv -h | head -n1 | grep -q -e "usage: venv"