Skip to content
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.

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

tests: retry installing lxd snap #3957

Merged
merged 4 commits into from
Nov 16, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .github/workflows/spread.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true

- name: Download snapcraft snap
uses: actions/download-artifact@v2
Expand Down Expand Up @@ -96,6 +97,7 @@ jobs:
uses: actions/checkout@v2
with:
fetch-depth: 0
submodules: true

- if: steps.decisions.outputs.RUN == 'true'
name: Download snapcraft snap
Expand Down
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "docs"]
path = docs
url = https://github.com/CanonicalLtd/snappy-docs.git
[submodule "tests/spread/tools/snapd-testing-tools"]
path = tests/spread/tools/snapd-testing-tools
url = https://github.com/snapcore/snapd-testing-tools.git
6 changes: 4 additions & 2 deletions spread.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ environment:
DEBIAN_PRIORITY: critical

TOOLS_DIR: /snapcraft/tests/spread/tools
PATH: $PATH:$TOOLS_DIR/snapd-testing-tools/tools/

# Git environment for commits
GIT_AUTHOR_NAME: "Test User"
Expand Down Expand Up @@ -208,8 +209,9 @@ prepare: |
# nicely handle the snap and deb being installed at the same time.
apt-get remove --purge --yes lxd lxd-client
fi
# Install and setup the lxd snap
snap install lxd
# install and setup the lxd snap - use 'retry' to workaround aa-exec issue
# see https://bugs.launchpad.net/snapd/+bug/1870201
retry -n 5 --wait 5 sh -c 'snap install lxd'
# Add the ubuntu user to the lxd group.
adduser ubuntu lxd
lxd init --auto
Expand Down
1 change: 1 addition & 0 deletions tests/spread/tools/snapd-testing-tools
Submodule snapd-testing-tools added at d5cb68