Add juju-ci-tools and juju-release-tools #7350

Merged
merged 7,966 commits into from May 18, 2017

Conversation

Projects
None yet
9 participants
Owner

nskaggs commented May 16, 2017

Description of change

This change brings in the QA and CI tests and tools that were managed as separate projects. Yay!

Note, most authors match, but in cases where they don't, it's simpler to add the associated email to the github account vs rewriting history (I fixed mine by just adding the additional email).

This diff insanely large, so in summary

lp:juju-ci-tools -> acceptancetests
lp:juju-release-tools -> releasetests

All history from the bzr repo was preserved, and the commits are intermingled now with the rest of the greater juju repository.

QA steps

No change, but we'll have to update our tooling to utilize this location and deprecate the old locations for these projects.

Documentation changes

N/A

Bug reference

N/A

viswesn and others added some commits Mar 20, 2017

abentley and others added some commits Apr 12, 2017

List go version information during unit tests
Add network and grant revoke to representative tests
migrate to go-1.8

@nskaggs nskaggs changed the title from Develop to Add juju-ci-tools and juju-release-tools May 16, 2017

the .pyc files also got added to the project.

Contributor

bz2 commented May 17, 2017

What method did you use to create this PR? The branch as presented does not preserve history, all the added files in the final revision are seen as new.

Compare:

https://github.com/nskaggs/juju/commits/fcd484dbc50d477d26d86c5f23186f7c57a2f40d/acceptancetests/Makefile

https://github.com/nskaggs/juju/commits/d370579ac762d0f54cbcd88a8e9d328bace00eb4/Makefile

Owner

nskaggs commented May 17, 2017

@bz2 That's kind of odd. I used subtree merging to create this. You can see it did intermingle the history, and it seemed legit, hmm.

Owner

nskaggs commented May 17, 2017

Are we happy with the quasi lost history? You can see the changes, but as pointed out, you can see a file's history anymore directly. I think this is a knock on affect of the subtree merge, but maybe I could do it better.

Owner

nskaggs commented May 17, 2017

Actually, I think I can link them by committing a move. I'll try.

Owner

nskaggs commented May 17, 2017

Idea failed. I'm happy as-is though if others are.

mjs approved these changes May 17, 2017

I'm ok with the wonky history.

Owner

nskaggs commented May 18, 2017

$$merge$$

Contributor

jujubot commented May 18, 2017

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

@jujubot jujubot merged commit 11f1d4a into juju:develop May 18, 2017

1 check passed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details

@nskaggs nskaggs referenced this pull request May 18, 2017

Merged

Add ci charm repo #7362

jujubot added a commit that referenced this pull request May 19, 2017

Merge pull request #7362 from nskaggs/add-ci-charm-repo
Add ci charm repo

## 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.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment