Skip to content

Commit

Permalink
Merge pull request #230 from simondeziel/images
Browse files Browse the repository at this point in the history
github: prevent accidental usage of `images:` in CI test jobs
  • Loading branch information
tomponline authored Jul 5, 2024
2 parents d42c710 + 116789d commit a40639e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
5 changes: 5 additions & 0 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,11 @@ jobs:
- name: ${{ matrix.test }} (${{ matrix.track }})
run: |
set -eux
# XXX: prevent accidental usage of `images:` in CI test jobs.
# All tests should be done using officially supported images.
echo '127.0.0.1 images.lxd.canonical.com' | sudo tee /etc/hosts
TEST_SCRIPT="$(echo ${{ matrix.test }} | cut -d " " -f 1)"
EXTRA_ARGS="$(echo ${{ matrix.test }} | cut -d " " -f 2- --only-delimited)"
if [ "${TEST_SCRIPT}" = "cluster" ]; then
Expand Down
2 changes: 1 addition & 1 deletion bin/test-image
Original file line number Diff line number Diff line change
Expand Up @@ -270,8 +270,8 @@ done

# Check that cloud variants can be rebooted cleanly.
if [ "${VARIANT}" = "cloud" ]; then
echo "==> Performing post cloud-init reboot test"
for name in ${INSTANCES}; do
echo "==> Performing post cloud-init reboot test"
lxc exec "${name}" -- cloud-init status --wait --long

# If systemd is available, use it to wait for any other job to complete before the restart
Expand Down

0 comments on commit a40639e

Please sign in to comment.