Merge lp:~gnuoy/charms/precise/daisy-retracer/add-upgrade-charm into lp:~daisy-pluckers/charms/precise/daisy-retracer/trunk

[Liam Young]

[lp:~gnuoy/charms/precise/daisy-retracer/add-upgrade-charm]

30. By Liam Young on 2013-05-03

Variables used by templates need to be exported

[Evan (ev)]

This looks good. I'm just going to change upgrade-charm to cd in a subshell, in case we add code later that has expectations about $(pwd).

review: Approve

[Evan (ev)]

Landed as r29, fixed up as r30.

=== modified file 'config.yaml'
--- config.yaml	2013-05-03 00:27:01 +0000
+++ config.yaml	2013-05-03 14:12:24 +0000
@@ -86,6 +86,16 @@
       type: string
       default: 'i386 amd64 armhf'
       description: Space separated list of architectures for which to process reports.
+  daisy_code_dirs:
+      type: int
+      default: 3
+      description: |
+        How many old copies of daisy code to retain (candidates for backouts)
+  apport_code_dirs:
+      type: int
+      default: 3
+      description: |
+        How many old copies of apport code to retain (candidates for backouts)
   repository:
       type: string
       default: 'ppa:daisy-pluckers/daisy-seeds'
 
=== modified file 'hooks/common'
--- hooks/common	2013-05-03 00:27:01 +0000
+++ hooks/common	2013-05-03 14:12:24 +0000
@@ -16,6 +16,8 @@
 APPORT_LOCATION="$DEPLOY_ROOT/apport"
 CACHE_DIR="$DEPLOY_ROOT/cache"
 VAR_DIR="$DEPLOY_ROOT/var"
+DAISY_CODE_DIRS="$(config-get daisy_code_dirs)"
+APPORT_CODE_DIRS="$(config-get apport_code_dirs)"
 
 save_setting () {
     key="$1"
@@ -62,3 +64,36 @@
 
     done
 }
+
+deploy_code () {
+    local tarball="$1"
+    local codedir="$2"
+    local codedir_count="$3"
+    local codename=$(basename "$codedir") 
+    local coderoot=$(dirname "$codedir") 
+    local tmpdir=$(mktemp -d --tmpdir="${coderoot}")
+    tar -C ${tmpdir} -xf ${tarball}
+    local coderevno=$(bzr revno ${tmpdir})
+    if [[ -d "${coderoot}/${codename}-${coderevno}" ]]; then
+        juju-log "${coderevno} of ${codename} already deployed"
+        rm -rf ${tmpdir}
+    else
+        juju-log "Deploying ${coderevno} of ${codename}"
+        chown -R $USER_CODE_OWNER:$USER_CODE_RUNNER "${tmpdir}"
+        mv "${tmpdir}" "${coderoot}/${codename}-${coderevno}"
+        [ -d "${coderoot}/${codename}" ] && rm -rf "${coderoot}/${codename}"
+        ln -s "${coderoot}/${codename}-${coderevno}" "${coderoot}/${codename}"
+        remove_old_codedirs $codedir_count "${coderoot}/${codename}-*"
+    fi
+}
+
+remove_old_codedirs () {
+    local codedir_count="$1"
+    local codedir_regex="$2"
+    local current_code_dirs=$(ls -d ${codedir_regex} | wc -l)
+    if [[ $current_code_dirs -gt $codedir_count ]]; then
+        juju-log "More than $codedir_count found, deleting:"
+        juju-log "$(ls -td ${codedir_regex} | tail -n +$(($codedir_count+1)))"
+        ls -1rd ${codedir_regex} | tail -n +$(($codedir_count+1)) | xargs rm -rf
+    fi
+}
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2013-05-03 00:39:11 +0000
+++ hooks/config-changed	2013-05-03 14:12:24 +0000
@@ -35,6 +35,7 @@
     #sed -i "s|cassandra_hosts =.*|cassandra_hosts = []|" $LOCAL_CONFIG_PATH
 
 for x in templates/*.cron.tmpl; do
+    export CODE_LOCATION DEPLOY_ROOT DUPLICATE_DB LOCAL_CONFIG_LOCATION USER_CODE_RUNNER VAR_DIR
     n="$(echo "$(basename $x)" | sed 's/.cron.tmpl//')"
     cheetah fill --env -p $x >/etc/cron.d/$n
 done
 
=== modified file 'hooks/install'
--- hooks/install	2013-05-03 00:27:01 +0000
+++ hooks/install	2013-05-03 14:12:24 +0000
@@ -33,11 +33,7 @@
 
 # Unpack tarred Daisy code
 charm_dir="$(pwd)"
-tarball="$charm_dir/files/daisy.tgz"
-
-if [ -f "$tarball" ]; then
-    tar -C "$CODE_LOCATION" -xvf "$tarball"
-fi
+deploy_code "$charm_dir/files/daisy.tgz" $CODE_LOCATION $DAISY_CODE_DIRS
 
 if [ ! -e "$LOCAL_CONFIG_PATH" ]; then
     cp "$CODE_LOCATION/daisy/configuration.py" "$LOCAL_CONFIG_PATH"
@@ -45,10 +41,8 @@
 
 # Unpack tarred Apport snapshot
 apport="$charm_dir/files/apport.tgz"
-
 if [ -f "$apport" ]; then
-    tar -C "$APPORT_LOCATION" -xvf "$apport"
-
+    deploy_code "$apport" $APPORT_LOCATION $APPORT_CODE_DIRS
     # set up the apt/dpkg Apport packaging backend; setup.py build would need more
     # dependencies
     cd "$APPORT_LOCATION"
 
=== modified file 'hooks/upgrade-charm'
--- hooks/upgrade-charm	2013-03-22 02:15:05 +0000
+++ hooks/upgrade-charm	2013-05-03 14:12:24 +0000
@@ -1,8 +1,17 @@
 #!/bin/bash
-set -e
-
+set -eux
 home=$(dirname $0)
-juju-log "Upgrading charm by running install hook again."
-$home/install
-juju-log "Finishing charm upgrade by reconfiguring."
+
+. hooks/common
+charm_dir="$(pwd)"
+deploy_code "$charm_dir/files/daisy.tgz" $CODE_LOCATION $DAISY_CODE_DIRS
+
+apport="$charm_dir/files/apport.tgz"
+if [ -f "$apport" ]; then
+    deploy_code "$apport" $APPORT_LOCATION $APPORT_CODE_DIRS
+    cd "$APPORT_LOCATION"
+    rm -f apport/packaging_impl.py
+    ln -s ../backends/packaging-apt-dpkg.py apport/packaging_impl.py
+fi
 $home/config-changed
+retracer_restart