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

tools: let environment-setup.sh skip unnecessary steps #2625

Merged
merged 4 commits into from
Jul 16, 2019
Merged

tools: let environment-setup.sh skip unnecessary steps #2625

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
afe8f44
tools: let environment-setup.sh to skip unnecessary steps
clobrano Jul 5, 2019
227a340
Merge branch 'master' into tool-environment-setup-idempotent
sergiusens Jul 5, 2019
8ace9f2
Update according to code review
clobrano Jul 11, 2019
350884e
Merge branch 'master' into tool-environment-setup-idempotent
Jul 15, 2019
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
19 changes: 14 additions & 5 deletions tools/environment-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,16 @@ if ! grep -q '^name: snapcraft$' snap/snapcraft.yaml; then
fi

# Create the container
lxc init ubuntu:16.04 snapcraft-dev
lxc config set snapcraft-dev raw.idmap "both $UID 1000"
lxc start snapcraft-dev
if ! lxc info snapcraft-dev >/dev/null 2>&1; then
lxc init ubuntu:16.04 snapcraft-dev
fi
if ! lxc config get snapcraft-dev raw.idmap | grep -q "both $UID 1000"; then
lxc config set snapcraft-dev raw.idmap "both $UID 1000"
fi

if ! lxc info snapcraft-dev | grep -q "Status: Running"; then
lxc start snapcraft-dev
fi

# Wait for cloud-init before moving on
lxc exec snapcraft-dev -- cloud-init status --wait
Expand Down Expand Up @@ -51,8 +58,10 @@ lxc exec snapcraft-dev -- sudo -iu ubuntu bash -c \
lxc exec snapcraft-dev -- sudo -iu ubuntu pip install --upgrade pip

# Now that /home/ubuntu has been used, add the project
lxc config device add snapcraft-dev snapcraft-project disk \
source="$PWD" path=/home/ubuntu/snapcraft
if ! lxc config device show snapcraft-dev | grep -q snapcraft-project; then
lxc config device add snapcraft-dev snapcraft-project disk \
source="$PWD" path=/home/ubuntu/snapcraft
fi

# Install python dependencies
lxc exec snapcraft-dev -- sudo -iu ubuntu pip install \
Expand Down