-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
timer: make jobs-status file world readable
When running collect-logs as non-root, we might fail trying to collect the jobs-status information. Since there is no private date in this file, we are making it world readable now. Fixes: #2601
- Loading branch information
1 parent
1356cf8
commit 46e11e6
Showing
3 changed files
with
65 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
#!/bin/bash | ||
set -e | ||
|
||
series=$1 | ||
install_from=$2 # either path to a .deb, or 'staging', or 'proposed' | ||
|
||
name=$series-dev | ||
|
||
function cleanup { | ||
lxc delete $name --force | ||
} | ||
|
||
function on_err { | ||
echo -e "Test Failed" | ||
cleanup | ||
exit 1 | ||
} | ||
trap on_err ERR | ||
|
||
|
||
lxc launch ubuntu-daily:$series $name | ||
sleep 5 | ||
|
||
# Install latest ubuntu-advantage-tools | ||
lxc exec $name -- apt-get update > /dev/null | ||
lxc exec $name -- apt-get install -y ubuntu-advantage-tools > /dev/null | ||
echo -e "\n* Latest u-a-t is installed" | ||
echo "###########################################" | ||
lxc exec $name -- apt-cache policy ubuntu-advantage-tools | ||
echo -e "###########################################\n" | ||
|
||
echo -e "\n* Create jobs-status file" | ||
echo "###########################################" | ||
lxc exec $name -- python3 /usr/lib/ubuntu-advantage/timer.py | ||
lxc exec $name -- ls -la /var/lib/ubuntu-advantage/jobs-status.json | ||
echo -e "###########################################\n" | ||
|
||
|
||
# Upgrade u-a-t to new version | ||
# ---------------------------------------------------------------- | ||
if [ $install_from == 'staging' ]; then | ||
lxc exec $name -- sudo add-apt-repository ppa:ua-client/staging -y > /dev/null | ||
lxc exec $name -- apt-get update > /dev/null | ||
lxc exec $name -- apt-get install ubuntu-advantage-tools -y > /dev/null | ||
elif [ $install_from == 'proposed' ]; then | ||
lxc exec $name -- sh -c "echo \"deb http://archive.ubuntu.com/ubuntu $series-proposed main\" | tee /etc/apt/sources.list.d/proposed.list" | ||
lxc exec $name -- apt-get update > /dev/null | ||
lxc exec $name -- apt-get install ubuntu-advantage-tools -y > /dev/null | ||
else | ||
lxc file push $install_from $name/new-ua.deb | ||
lxc exec $name -- dpkg -i /new-ua.deb > /dev/null | ||
fi | ||
# ---------------------------------------------------------------- | ||
|
||
echo -e "\n* re-create jobs-status file and notice that is now world-readable" | ||
echo "###########################################" | ||
lxc exec $name -- python3 /usr/lib/ubuntu-advantage/timer.py | ||
lxc exec $name -- ls -la /var/lib/ubuntu-advantage/jobs-status.json | ||
echo -e "###########################################\n" | ||
|
||
cleanup |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters