Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Fix bundle deploying #686

Merged
merged 2 commits into from Jan 7, 2015
Merged

Fix bundle deploying #686

merged 2 commits into from Jan 7, 2015

Conversation

makyo
Copy link
Contributor

@makyo makyo commented Jan 6, 2015

This branch utilizes the bundles.yaml.orig file to deploy the bundles, rather than the bundle data as returned by the charm store. It also fixes the inability to drag-and-drop a bundle.

Move the asynchronous bundle fetching to the deployer call on dnd

Grab bundle.yaml.orig from bundle details page
@makyo
Copy link
Contributor Author

makyo commented Jan 6, 2015

QA

Ensure that you can deploy a bundle by dragging and dropping, as well as through the 'add to canvas' button in the bundle details. At least one QA in a real env, please, since this tests working with the deployer.

@jujugui
Copy link
Contributor

jujugui commented Jan 6, 2015

Test FAILed.
Refer to this link for build results (access rights to CI server needed):
http://ci.jujugui.org:8080//job/juju-gui/2334/
Test FAILed.

@mitechie
Copy link
Contributor

mitechie commented Jan 7, 2015

Bah, thought we fixed the notifier widget. Forcing rebuild at http://ci.jujugui.org:8080/job/juju-gui/2335/console

@mitechie
Copy link
Contributor

mitechie commented Jan 7, 2015

triggered again but getting suspicious at this point something has been tripped up causing issues.

entityData.id,
topo.get('env'),
topo.get('db')
// For now, simply send the bundles.yaml.orig file contents to the
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

XXX this?

@mitechie
Copy link
Contributor

mitechie commented Jan 7, 2015

code is 👍 no QA with one note on adding the XXX to the comment.

@frankban
Copy link
Member

frankban commented Jan 7, 2015

Code looks good, will now QA.

@frankban
Copy link
Member

frankban commented Jan 7, 2015

QA Ok:
I deployed the GUI using "make deploy" on the juju GUI charm development trunk.
I switched to your branch with juju set juju-gui juju-gui-source="https://github.com/makyo/juju-gui.git dnd-fix".
Deployed a charm, and two bundles, one with the button and one dropping the icon. Everything worked well.
👍 thanks for these fixes!

@makyo
Copy link
Contributor Author

makyo commented Jan 7, 2015

Different failure, trying one more time to confirm: http://ci.jujugui.org:8080/job/juju-gui/2337/

@makyo
Copy link
Contributor Author

makyo commented Jan 7, 2015

Tests passed in most recent run. Thanks all :shipit:

@jujugui
Copy link
Contributor

jujugui commented Jan 7, 2015

Status: merge request accepted. Url: http://ci.jujugui.org:8080/job/juju-gui-merge

@jujugui
Copy link
Contributor

jujugui commented Jan 7, 2015

Test PASSed.
Refer to this link for build results (access rights to CI server needed):
http://ci.jujugui.org:8080//job/juju-gui/2338/
Test PASSed.

jujugui added a commit that referenced this pull request Jan 7, 2015
Fix bundle deploying

This branch utilizes the bundles.yaml.orig file to deploy the bundles, rather than the bundle data as returned by the charm store.  It also fixes the inability to drag-and-drop a bundle.
@jujugui jujugui merged commit 5c02080 into juju:develop Jan 7, 2015
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants