diff --git a/spread.yaml b/spread.yaml index 0bc27741a..dc83ac276 100644 --- a/spread.yaml +++ b/spread.yaml @@ -137,16 +137,10 @@ prepare: | sed -i -E '/^Components:/ { /(^| )universe( |$)/! s/$/ universe/ }' "$ubuntu_sources" fi fi - - tempfile="$(mktemp)" - if ! apt-get update > "$tempfile" 2>&1; then - cat "$tempfile" - exit 1 - fi fi - tests.pkgs install snapd - tests.pkgs install unzip + # tests.pkgs install runs apt-get update, so install both packages in one call. + tests.pkgs install snapd unzip snap wait system seed.loaded diff --git a/tests/spread/dependencies/strict-dependencies/task.yaml b/tests/spread/dependencies/strict-dependencies/task.yaml index d488a525b..ffbed3227 100644 --- a/tests/spread/dependencies/strict-dependencies/task.yaml +++ b/tests/spread/dependencies/strict-dependencies/task.yaml @@ -1,8 +1,5 @@ summary: ensure that a charm with strict dependencies can build. -prepare: | - tests.pkgs install unzip - restore: | pushd charm charmcraft clean diff --git a/tests/spread/hooks/configure/task.yaml b/tests/spread/hooks/configure/task.yaml index 62451137f..506e0eb54 100644 --- a/tests/spread/hooks/configure/task.yaml +++ b/tests/spread/hooks/configure/task.yaml @@ -7,7 +7,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm restore: | diff --git a/tests/spread/hooks/remove/task.yaml b/tests/spread/hooks/remove/task.yaml index cdbaef6bc..fdf33f72c 100644 --- a/tests/spread/hooks/remove/task.yaml +++ b/tests/spread/hooks/remove/task.yaml @@ -7,7 +7,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm restore: | diff --git a/tests/spread/smoketests/different-dependencies/task.yaml b/tests/spread/smoketests/different-dependencies/task.yaml index 26c518c7d..47d6e6173 100644 --- a/tests/spread/smoketests/different-dependencies/task.yaml +++ b/tests/spread/smoketests/different-dependencies/task.yaml @@ -4,7 +4,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip snap install --devmode --channel=v4/stable yq charmcraft init --project-dir=charm cd charm diff --git a/tests/spread/smoketests/metafiles-bad-yaml-unenforced/task.yaml b/tests/spread/smoketests/metafiles-bad-yaml-unenforced/task.yaml index 600075872..053a35e7d 100644 --- a/tests/spread/smoketests/metafiles-bad-yaml-unenforced/task.yaml +++ b/tests/spread/smoketests/metafiles-bad-yaml-unenforced/task.yaml @@ -6,7 +6,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm rm -f charm/metadata.yaml rm -f charm/config.yaml diff --git a/tests/spread/smoketests/metafiles-multiple-yaml/task.yaml b/tests/spread/smoketests/metafiles-multiple-yaml/task.yaml index 242ef316f..29c5bcc88 100644 --- a/tests/spread/smoketests/metafiles-multiple-yaml/task.yaml +++ b/tests/spread/smoketests/metafiles-multiple-yaml/task.yaml @@ -6,7 +6,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm rm -f charm/metadata.yaml rm -f charm/config.yaml diff --git a/tests/spread/smoketests/metafiles-unified-charmcraft-yaml/task.yaml b/tests/spread/smoketests/metafiles-unified-charmcraft-yaml/task.yaml index 43bb9fec1..e1e54de31 100644 --- a/tests/spread/smoketests/metafiles-unified-charmcraft-yaml/task.yaml +++ b/tests/spread/smoketests/metafiles-unified-charmcraft-yaml/task.yaml @@ -4,7 +4,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm rm -f charm/metadata.yaml rm -f charm/config.yaml diff --git a/tests/spread/smoketests/parallel-build/task.yaml b/tests/spread/smoketests/parallel-build/task.yaml index 8eb2e2078..9ceb39c5e 100644 --- a/tests/spread/smoketests/parallel-build/task.yaml +++ b/tests/spread/smoketests/parallel-build/task.yaml @@ -7,7 +7,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm1 charmcraft init --project-dir=charm2 charmcraft init --project-dir=charm3 diff --git a/tests/spread/smoketests/pinned-dependencies/task.yaml b/tests/spread/smoketests/pinned-dependencies/task.yaml index 8098bdc5a..d0374d153 100644 --- a/tests/spread/smoketests/pinned-dependencies/task.yaml +++ b/tests/spread/smoketests/pinned-dependencies/task.yaml @@ -4,7 +4,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip restore: | charmcraft clean diff --git a/tests/spread/smoketests/remote-build/task.yaml b/tests/spread/smoketests/remote-build/task.yaml index 6ebc098c1..80a4527ed 100644 --- a/tests/spread/smoketests/remote-build/task.yaml +++ b/tests/spread/smoketests/remote-build/task.yaml @@ -13,7 +13,6 @@ include: - tests/ prepare: | - tests.pkgs install unzip charmcraft init --project-dir=charm # Workaround for https://github.com/canonical/craft-application/issues/248