Merge lp://staging/~gary/charms/precise/juju-gui/bug1218888 into lp://staging/~juju-gui/charms/precise/juju-gui/trunk

Proposed by Gary Poster
Status: Merged
Merged at revision: 117
Proposed branch: lp://staging/~gary/charms/precise/juju-gui/bug1218888
Merge into: lp://staging/~juju-gui/charms/precise/juju-gui/trunk
Diff against target: 209 lines (+82/-37)
2 files modified
hooks/utils.py (+7/-3)
tests/test_utils.py (+75/-34)
To merge this branch: bzr merge lp://staging/~gary/charms/precise/juju-gui/bug1218888
Reviewer Review Type Date Requested Status
charmers Pending
Review via email: mp+190971@code.staging.launchpad.net

Description of the change

Add support for xz compression

An xz tarball reduces the size of the gui code by 30 to 40 percent. These changes let the charm use xz tarballs. A very simple change to the gui makefile will follow.

To qa, apply this diff to the gui trunk:

=== modified file 'Makefile'
--- Makefile 2013-10-12 01:30:26 +0000
+++ Makefile 2013-10-14 13:43:10 +0000
@@ -95,7 +95,7 @@
 LAUNCHPAD_API_ROOT=staging
 endif
 RELEASE_NAME=juju-gui-$(RELEASE_VERSION)
-RELEASE_FILE=releases/$(RELEASE_NAME).tgz
+RELEASE_FILE=releases/$(RELEASE_NAME).xz
 RELEASE_SIGNATURE=releases/$(RELEASE_NAME).asc
 NPM_CACHE_VERSION=$(BZR_REVNO)
 NPM_CACHE_FILE=$(CURDIR)/releases/npm-cache-$(NPM_CACHE_VERSION).tgz

Then run ``BRANCH_IS_GOOD=1 make distfile``. Copy over the new release to the charm's releases directory. If you compare the two file sizes in the charm's releases directory, the difference should be dramatic.

$ ls -l
-rw-r--r-- 1 gary gary 5076088 Oct 14 09:44 juju-gui-0.10.1+build.1133.xz
-rw-r--r-- 1 gary gary 44840221 Oct 12 20:15 juju-gui-0.10.1.tgz

You can remove the tgz, and then run juju bootstrap and make deploy in the charm root directory. Once it is deployed, you should be able to log in and see the gui as usual, and you should be able to verify the fact that you are using your custom release if you go to /juju-ui/version.js, where you will see something like "var jujuGuiVersionInfo=['unreleased', '1133'];".

Thank you!

https://codereview.appspot.com/14425057/

To post a comment you must log in.
Revision history for this message
Gary Poster (gary) wrote :

Reviewers: mp+190971_code.launchpad.net,

Message:
Please take a look.

Description:
Add support for xz compression

An xz tarball reduces the size of the gui code by 30 to 40 percent.
These changes let the charm use xz tarballs. A very simple change to
the gui makefile will follow.

To qa, apply this diff to the gui trunk:

=== modified file 'Makefile'
--- Makefile 2013-10-12 01:30:26 +0000
+++ Makefile 2013-10-14 13:43:10 +0000
@@ -95,7 +95,7 @@
  LAUNCHPAD_API_ROOT=staging
  endif
  RELEASE_NAME=juju-gui-$(RELEASE_VERSION)
-RELEASE_FILE=releases/$(RELEASE_NAME).tgz
+RELEASE_FILE=releases/$(RELEASE_NAME).xz
  RELEASE_SIGNATURE=releases/$(RELEASE_NAME).asc
  NPM_CACHE_VERSION=$(BZR_REVNO)
  NPM_CACHE_FILE=$(CURDIR)/releases/npm-cache-$(NPM_CACHE_VERSION).tgz

Then run ``BRANCH_IS_GOOD=1 make distfile``. Copy over the new release
to the charm's releases directory. If you compare the two file sizes in
the charm's releases directory, the difference should be dramatic.

$ ls -l
-rw-r--r-- 1 gary gary 5076088 Oct 14 09:44
juju-gui-0.10.1+build.1133.xz
-rw-r--r-- 1 gary gary 44840221 Oct 12 20:15 juju-gui-0.10.1.tgz

You can remove the tgz, and then run juju bootstrap and make deploy in
the charm root directory. Once it is deployed, you should be able to
log in and see the gui as usual, and you should be able to verify the
fact that you are using your custom release if you go to
/juju-ui/version.js, where you will see something like "var
jujuGuiVersionInfo=['unreleased', '1133'];".

Thank you!

https://code.launchpad.net/~gary/charms/precise/juju-gui/bug1218888/+merge/190971

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/14425057/

Affected files (+84, -37 lines):
   A [revision details]
   M hooks/utils.py
   M tests/test_utils.py

Revision history for this message
Brad Crittenden (bac) wrote :
Revision history for this message
Gary Poster (gary) wrote :

*** Submitted:

Add support for xz compression

An xz tarball reduces the size of the gui code by 30 to 40 percent.
These changes let the charm use xz tarballs. A very simple change to
the gui makefile will follow.

To qa, apply this diff to the gui trunk:

=== modified file 'Makefile'
--- Makefile 2013-10-12 01:30:26 +0000
+++ Makefile 2013-10-14 13:43:10 +0000
@@ -95,7 +95,7 @@
  LAUNCHPAD_API_ROOT=staging
  endif
  RELEASE_NAME=juju-gui-$(RELEASE_VERSION)
-RELEASE_FILE=releases/$(RELEASE_NAME).tgz
+RELEASE_FILE=releases/$(RELEASE_NAME).xz
  RELEASE_SIGNATURE=releases/$(RELEASE_NAME).asc
  NPM_CACHE_VERSION=$(BZR_REVNO)
  NPM_CACHE_FILE=$(CURDIR)/releases/npm-cache-$(NPM_CACHE_VERSION).tgz

Then run ``BRANCH_IS_GOOD=1 make distfile``. Copy over the new release
to the charm's releases directory. If you compare the two file sizes in
the charm's releases directory, the difference should be dramatic.

$ ls -l
-rw-r--r-- 1 gary gary 5076088 Oct 14 09:44
juju-gui-0.10.1+build.1133.xz
-rw-r--r-- 1 gary gary 44840221 Oct 12 20:15 juju-gui-0.10.1.tgz

You can remove the tgz, and then run juju bootstrap and make deploy in
the charm root directory. Once it is deployed, you should be able to
log in and see the gui as usual, and you should be able to verify the
fact that you are using your custom release if you go to
/juju-ui/version.js, where you will see something like "var
jujuGuiVersionInfo=['unreleased', '1133'];".

Thank you!

R=bac
CC=
https://codereview.appspot.com/14425057

https://codereview.appspot.com/14425057/

Revision history for this message
Gary Poster (gary) wrote :

Thank you very much, Brad.

https://codereview.appspot.com/14425057/

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: