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

Jump to bottom

integration: fix detection of explicit_trust_token API extension #595

Merged
merged 1 commit into from
Jul 11, 2024
Merged

integration: fix detection of explicit_trust_token API extension #595

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions integration/run-integration-tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ fi
# Make sure a client.{crt,key} exist by trying to add a bogus remote
lxc remote add foo 127.0.0.1:1234 2>/dev/null || true

if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then
if ! lxc info | grep -qwF explicit_trust_token; then
lxc config set core.trust_password password
fi
lxc config set core.https_address 127.0.0.1
Expand Down Expand Up @@ -64,7 +64,7 @@ for cert in $(comm -13 "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"); do
done
rm -f "${OLD_TRUST_LIST}" "${NEW_TRUST_LIST}"

if ! lxc query /1.0 | grep -q '"explicit_trust_token"$'; then
if ! lxc info | grep -qwF explicit_trust_token; then
lxc config unset core.trust_password || true
fi
lxc config unset core.https_address || true