Skip to content

test: speed up spread test runtime by removing redundant package setup #2774

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lengau wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

test: speed up spread test runtime by removing redundant package setup #2774

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c80f275
Speed up spread suite package setup
lengau Jul 11, 2026
d5a6034
Remove redundant unzip setup in spread tasks
lengau Jul 11, 2026
77960e5
Apply suggestion from @lengau
lengau Jul 11, 2026
74163f4
Merge branch 'main' into work/speed-up-spread
lengau Jul 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions spread.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 0 additions & 3 deletions tests/spread/dependencies/strict-dependencies/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
summary: ensure that a charm with strict dependencies can build.

prepare: |
tests.pkgs install unzip

restore: |
pushd charm
charmcraft clean
Expand Down
1 change: 0 additions & 1 deletion tests/spread/hooks/configure/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ include:
- tests/

prepare: |
tests.pkgs install unzip
charmcraft init --project-dir=charm

restore: |
Expand Down
1 change: 0 additions & 1 deletion tests/spread/hooks/remove/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ include:
- tests/

prepare: |
tests.pkgs install unzip
charmcraft init --project-dir=charm

restore: |
Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/different-dependencies/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/metafiles-bad-yaml-unenforced/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/metafiles-multiple-yaml/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/metafiles-unified-charmcraft-yaml/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/parallel-build/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/pinned-dependencies/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ include:
- tests/

prepare: |
tests.pkgs install unzip
restore: |
charmcraft clean

Expand Down
1 change: 0 additions & 1 deletion tests/spread/smoketests/remote-build/task.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading