lp://staging/~benji/+junk/sanitize-constraints-and-other-fun
- Get this branch:
- bzr branch lp://staging/~benji/+junk/sanitize-constraints-and-other-fun
Branch information
- Owner:
- Benji York
- Status:
- Development
Recent revisions
- 118. By Francesco Banconi
-
Fix string encoding problem in guiserver.
The Juju API connection was dropped as
result of an error while logging responses
containing non-ascii characters.R=gary.poster
CC=
https://codereview. appspot. com/14772044 - 117. By Gary Poster
-
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.tgzYou 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 jujuGuiVersionI nfo=['unrelease d', '1133'];". Thank you!
R=bac
CC=
https://codereview. appspot. com/14425057 - 115. By Francesco Banconi
-
Introduce local GUI releases.
Implemented the new "local" juju-gui-source option.
By default the GUI release is now retrieved from
the charm itself, so that in the deployment process
the charm can avoid connecting to Launchpad.This should result in the charm being able to be
deployed behind a firewall without the traditional
workarounds. Note that this is not yet demonstrated
and must be QAed in a real firewalled environment.The process tries is like the following:
- if juju-gui-source is "local", the last tarball
in the releases dir is installed;
- if juju-gui-source is a stable or development version,
the charm checks if that version is present in the
local repository before downloading it from Launchpad.
- the rest of the options should still work as usual
(but some QA could help, e.g. deploying from a branch).Also updated the charm documentation and added some
missing tests.Tests: `make unittest` from the branch root
(I am currently running the functional tests).QA (assuming 0.10.1 is the latest GUI release):
- `juju bootstrap --debug`;
- `make deploy`;
- check the logs: no PPAs are used, the local release
is installed;
- `juju set juju-gui juju-gui-source= 0.10.0` ;
- check the logs: the release is downloaded from
Launchpad;
- `juju set juju-gui juju-gui-source= 0.10.1` ;
- check the logs: the charm successfully find
the 0.10.1 release in the local repository and
avoids downloading it from Launchpad.
- keep trying to break the charm in all the ways
you can imagine...Thank you.
R=matthew.scott, gary.poster
CC=
https://codereview. appspot. com/14545044
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)