Merge ~barryprice/charm-test/+git/charm-test:master into charm-test:master

Proposed by Barry Price
Status: Merged
Approved by: Tom Haddon
Approved revision: c00f173cf85d3b991a792f3db198cd3dee1b6ce3
Merged at revision: f2fc607abec769d7d1ccc143e0882e37a243e2ee
Proposed branch: ~barryprice/charm-test/+git/charm-test:master
Merge into: charm-test:master
Diff against target: 24 lines (+3/-3)
1 file modified
charm-test (+3/-3)
Reviewer Review Type Date Requested Status
Tom Haddon Approve
Review via email: mp+345063@code.launchpad.net

Commit message

Drop unneeded priviliged flag, use apt-get rather than apt

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

LGTM

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision f2fc607abec769d7d1ccc143e0882e37a243e2ee

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
diff --git a/charm-test b/charm-test
index a7f09be..e290ccb 100755
--- a/charm-test
+++ b/charm-test
@@ -66,7 +66,7 @@ function recreate_lxc() {
66 lxc delete --force ${CONTAINER_NAME}66 lxc delete --force ${CONTAINER_NAME}
67 fi67 fi
68 set -e68 set -e
69 lxc launch ubuntu:16.04 ${CONTAINER_NAME} -c security.privileged=true69 lxc launch ubuntu:16.04 ${CONTAINER_NAME}
70 # We shouldn't need to just wait here, but there doesn't appear to be an70 # We shouldn't need to just wait here, but there doesn't appear to be an
71 # lxc wait command.71 # lxc wait command.
72 log_info "Sleeping for 20 seconds while LXC comes up with networking"72 log_info "Sleeping for 20 seconds while LXC comes up with networking"
@@ -75,8 +75,8 @@ function recreate_lxc() {
75 lxc_run_as_ubuntu "mkdir -p /home/ubuntu/charmsrc"75 lxc_run_as_ubuntu "mkdir -p /home/ubuntu/charmsrc"
76 tar cf - . | lxc exec ${CONTAINER_NAME} -- tar xvf - -C /home/ubuntu/charmsrc76 tar cf - . | lxc exec ${CONTAINER_NAME} -- tar xvf - -C /home/ubuntu/charmsrc
77 # Install test dependencies.77 # Install test dependencies.
78 lxc_run "apt update"78 lxc_run "apt-get update"
79 lxc_run "apt install make"79 lxc_run "apt-get install make"
80 lxc_run_as_ubuntu "make -C /home/ubuntu/charmsrc testdeps"80 lxc_run_as_ubuntu "make -C /home/ubuntu/charmsrc testdeps"
81 # Build the charm inside the LXC.81 # Build the charm inside the LXC.
82 lxc_run_as_ubuntu "make -C /home/ubuntu/charmsrc charmbuild BUILDDEST=/home/ubuntu/charmbuilt"82 lxc_run_as_ubuntu "make -C /home/ubuntu/charmsrc charmbuild BUILDDEST=/home/ubuntu/charmbuilt"

Subscribers

People subscribed via source and target branches