Add ci charm repo #7362

Merged
merged 179 commits into from May 19, 2017

Conversation

Projects
None yet
10 participants
Owner

nskaggs commented May 18, 2017

Description of change

This is a follow-up to #7350 . This adds the ci charm repository used by CI tests.

The import was done the same way, though I had to filter out some .git files in the older commits.

Curtis Hovey and others added some commits May 6, 2014

Rename the chaos monkey charm directory, move most setup to the start…
… action, add show-logs and show-monkey-ids actions.
Record chaos-monkey log location in start action output and update to…
… juju-chaos-monkey.tgz with workspace support.
Background the chaos monkey runner from the start action and display …
…the chaos monkey log line by line from the show-logs action.
Removed the empty services key from the landscape-scalable.yaml.
Landscape doesn't use it anymore. Juju now honours the keys with empty strings, causing a charm error in the case.

Christopher Lee and others added some commits Nov 4, 2016

I'm not sure we need the acceptancetests/repository/.gitignore and acceptancetests/repository/trusty/haproxy/.bzrignore files?

Spot checks of diffs for commits to the ci charm repo are look logical. And the overall log appears merged.

Owner

nskaggs commented May 19, 2017

I've left the .gitignore files as they are specific to these subdirs.

Owner

nskaggs commented May 19, 2017

$$merge$$

Contributor

jujubot commented May 19, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented May 19, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10931

@jujubot jujubot merged commit 013d55d into juju:develop May 19, 2017

1 check failed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment