Merge lp://qastaging/~bac/juju-quickstart/packaging-tweaks into lp://qastaging/juju-quickstart

Proposed by Brad Crittenden
Status: Merged
Merged at revision: 78
Proposed branch: lp://qastaging/~bac/juju-quickstart/packaging-tweaks
Merge into: lp://qastaging/juju-quickstart
Diff against target: 83 lines (+32/-7)
1 file modified
HACKING.rst (+32/-7)
To merge this branch: bzr merge lp://qastaging/~bac/juju-quickstart/packaging-tweaks
Reviewer Review Type Date Requested Status
Juju GUI Hackers Pending
Review via email: mp+222790@code.qastaging.launchpad.net

Description of the change

Update HACKING doc.

Reference the two different packaging recipes for trusty and beyond and for
the pre-trusty series.

The packaging branches are now two separate series:
lp:juju-quickstart/packaging and lp:juju-quickstart/packaging-pre-trusty.
Referencing them in the recipes is cleaner than using bare branch names.

Also add a QA step for environments.yaml generation.

https://codereview.appspot.com/103310043/

To post a comment you must log in.
Revision history for this message
Brad Crittenden (bac) wrote :
Download full text (3.2 KiB)

Reviewers: mp+222790_code.launchpad.net,

Message:
Please take a look.

Description:
Update HACKING doc.

Reference the two different packaging recipes for trusty and beyond and
for
the pre-trusty series.

The packaging branches are now two separate series:
lp:juju-quickstart/packaging and
lp:juju-quickstart/packaging-pre-trusty.
Referencing them in the recipes is cleaner than using bare branch names.

https://code.launchpad.net/~bac/juju-quickstart/packaging-tweaks/+merge/222790

(do not edit description out of merge proposal)

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

Affected files (+15, -6 lines):
   M HACKING.rst
   A [revision details]

Index: HACKING.rst
=== modified file 'HACKING.rst'
--- HACKING.rst 2014-06-10 17:37:55 +0000
+++ HACKING.rst 2014-06-11 12:36:39 +0000
@@ -77,7 +77,7 @@
  ~~~~~~~~~~~~~~

  The general steps for manual QA (until we get a continuous integration set
up
-with functional tests) should be run on trusty and saucy.
+with functional tests) should be run on trusty and saucy.

  * Ensure juju-quickstart is installed from the juju-gui/quickstart-beta
PPA.::

@@ -113,8 +113,8 @@
  series before trusty and trusty and later. Consequently, there are two
  packaging branches and two build recipes. The two packaging branches are:

-* lp:~juju-gui/juju-quickstart/packaging-trunk, and
-* lp:~juju-gui/juju-quickstart/packaging-pre-trusty
+* lp:juju-quickstart/packaging, and
+* lp:juju-quickstart/packaging-pre-trusty

  For the following instructions we'll use the -trunk version but the
procedure
  is the same for the -pre-trusty branch.
@@ -122,8 +122,8 @@
  The packaging repository (including the ``debian`` directory) can be
checked
  out from lp:~juju-gui/juju-quickstart/packaging-trunk, e.g.::

- $ bzr branch lp:~juju-gui/juju-quickstart/packaging-trunk/
packaging-trunk
- $ cd packaging-trunk
+ $ bzr branch lp:juju-quickstart/packaging packaging
+ $ cd packaging

  Check that the packaging version reflects the latest Quickstart version.
The
  packaging version can be found in the ``debian/changelog`` file present in
the
@@ -141,8 +141,15 @@
  At this point, edit the changelog as required, commit and push the changes
back
  to the packaging branch trunk, and follow the instructions below.

-The recipe for creating packages is in
+The procedure is analogous for pre-trusty series releases, just using the
+other packaging branch.
+
+The recipe for creating packages for trusty and beyond is in:

<https://code.launchpad.net/~juju-gui-charmers/+recipe/juju-quickstart-trunk-daily>.
+
+The pre-trusty recipe is at:
+<https://code.launchpad.net/~juju-gui-charmers/+recipe/juju-quickstart-pre-trusty-daily>.
+
  We currently publish beta releases on the Juju Quickstart Beta PPA: see
  <https://launchpad.net/~juju-gui/+archive/quickstart-beta/+packages>.
  When a beta release is ready to be published, we move over the packages
from

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New r...

Read more...

Revision history for this message
Francesco Banconi (frankban) wrote :

Hi Brad,
thanks for the really nice updates to the documentation!

LGTM with a couple of suggestions.

https://codereview.appspot.com/103310043/diff/1/HACKING.rst
File HACKING.rst (right):

https://codereview.appspot.com/103310043/diff/1/HACKING.rst#newcode106
HACKING.rst:106: Repeat above on ec2.
What do you think about adding a step for verifying remote bundles with
simplified names are correctly deployed as well?
E.g. "juju quickstart bundle:mediawiki/single" or similar?

Also, it would be nice to also live test that the automatically
generated local environment works. To do this, we should temporarily
remove the ~/.juju and launch quickstart, selecting the first option.
This seems to me particularly important since it is likely the first
thing users new to Juju will do when installing quickstart.

The above can be done in a separate branch.

https://codereview.appspot.com/103310043/

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

Thanks for the review. One question in-line.

https://codereview.appspot.com/103310043/diff/1/HACKING.rst
File HACKING.rst (right):

https://codereview.appspot.com/103310043/diff/1/HACKING.rst#newcode106
HACKING.rst:106: Repeat above on ec2.
On 2014/06/11 13:26:46, frankban wrote:
> What do you think about adding a step for verifying remote bundles
with
> simplified names are correctly deployed as well?
> E.g. "juju quickstart bundle:mediawiki/single" or similar?

Does line 103 above not do what you want?

> Also, it would be nice to also live test that the automatically
generated local
> environment works. To do this, we should temporarily remove the
~/.juju and
> launch quickstart, selecting the first option.
> This seems to me particularly important since it is likely the first
thing users
> new to Juju will do when installing quickstart.

Good idea. I'll add it to this branch.

> The above can be done in a separate branch.

https://codereview.appspot.com/103310043/

Revision history for this message
Francesco Banconi (frankban) wrote :

On 2014/06/11 13:31:19, bac wrote:
> Thanks for the review. One question in-line.

> https://codereview.appspot.com/103310043/diff/1/HACKING.rst
> File HACKING.rst (right):

> https://codereview.appspot.com/103310043/diff/1/HACKING.rst#newcode106
> HACKING.rst:106: Repeat above on ec2.
> On 2014/06/11 13:26:46, frankban wrote:
> > What do you think about adding a step for verifying remote bundles
with
> > simplified names are correctly deployed as well?
> > E.g. "juju quickstart bundle:mediawiki/single" or similar?

> Does line 103 above not do what you want?

Oh, I missed that, you are right. I am not sure about the description of
that
step: "Verify an environment that has already been bootstrapped is
recogized and
the GUI is deployed::".
Perhaps another juju-quickstart call is missing below that, and the we
need to
add something like "Verify quickstart can deploy remote bundles"?

https://codereview.appspot.com/103310043/

79. By Brad Crittenden

Added new QA step to verify environments.yaml generation.

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

*** Submitted:

Update HACKING doc.

Reference the two different packaging recipes for trusty and beyond and
for
the pre-trusty series.

The packaging branches are now two separate series:
lp:juju-quickstart/packaging and
lp:juju-quickstart/packaging-pre-trusty.
Referencing them in the recipes is cleaner than using bare branch names.

Also add a QA step for environments.yaml generation.

R=frankban
CC=
https://codereview.appspot.com/103310043

https://codereview.appspot.com/103310043/

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