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.

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

Ensure lxd is installed before attempting snap refresh #930

Merged
merged 6 commits into from
Jan 7, 2025
Merged

Ensure lxd is installed before attempting snap refresh #930

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9e40468
Ensure lxd is installed before attempting snap refresh
bschimke95 Jan 7, 2025
c11e31e
use newgrp instead of sg
bschimke95 Jan 7, 2025
70d7677
Debug
bschimke95 Jan 7, 2025
25528b3
use sudo --user
bschimke95 Jan 7, 2025
7e73125
typo
bschimke95 Jan 7, 2025
c2f6dad
use sudo --user everywhere
bschimke95 Jan 7, 2025
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
12 changes: 10 additions & 2 deletions .github/actions/install-lxd/action.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,21 @@ runs:
- name: Install lxd snap
shell: bash
run: |
sudo snap refresh lxd --channel ${{ inputs.channel }}
if ! snap list lxd &> /dev/null; then
echo "Installing lxd snap"
sudo snap install lxd --channel ${{ inputs.channel }}
else
echo "lxd snap found, refreshing to specified channel"
sudo snap refresh lxd --channel ${{ inputs.channel }}
fi
- name: Initialize lxd
shell: bash
run: |
sudo lxd init --auto
sudo usermod --append --groups lxd $USER
sg lxd -c 'lxc version'
# `newgrp` does not work in GitHub Actions; use `sudo --user` instead
# See https://github.com/actions/runner-images/issues/9932#issuecomment-2573170305
sudo --user "$USER" --preserve-env --preserve-env=PATH -- env -- lxc version
# Docker sets iptables rules that interfere with LXD.
# https://documentation.ubuntu.com/lxd/en/latest/howto/network_bridge_firewalld/#prevent-connectivity-issues-with-lxd-and-docker
- name: Apply Docker iptables workaround
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-snap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
out_snap=k8s.snap
fi

sg lxd -c 'snapcraft --use-lxd'
sudo --user "$USER" --preserve-env --preserve-env=PATH -- env -- snapcraft --use-lxd
mv k8s_*.snap $out_snap

echo "snap-artifact=$out_snap" >> "$GITHUB_OUTPUT"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-tests.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
TEST_STRICT_INTERFACE_CHANNELS: "recent 6 strict"
TEST_MIRROR_LIST: '[{"name": "ghcr.io", "port": 5000, "remote": "https://ghcr.io", "username": "${{ github.actor }}", "password": "${{ secrets.GITHUB_TOKEN }}"}, {"name": "docker.io", "port": 5001, "remote": "https://registry-1.docker.io", "username": "", "password": ""}, {"name": "rocks.canonical.com", "port": 5002, "remote": "https://rocks.canonical.com/cdk"}]'
run: |
cd tests/integration && sg lxd -c "tox -e integration -- --tags ${{ inputs.test-tags }}"
cd tests/integration && sudo --user "$USER" --preserve-env --preserve-env=PATH -- env -- tox -e integration -- --tags ${{ inputs.test-tags }}
- name: Prepare inspection reports
if: failure()
run: |
Expand Down
Loading