Merge lp://qastaging/~jml/canonical-identity-provider/acceptance-script into lp://qastaging/canonical-identity-provider/release
| Status: | Merged |
|---|---|
| Approved by: | Jonathan Lange |
| Approved revision: | no longer in the source branch. |
| Merged at revision: | 593 |
| Proposed branch: | lp://qastaging/~jml/canonical-identity-provider/acceptance-script |
| Merge into: | lp://qastaging/canonical-identity-provider/release |
| Diff against target: |
105 lines (+86/-0) 4 files modified
scripts/local.cfg-dev (+12/-0) scripts/local.cfg-production (+8/-0) scripts/local.cfg-staging (+9/-0) scripts/run-acceptance-tests (+57/-0) |
| To merge this branch: | bzr merge lp://qastaging/~jml/canonical-identity-provider/acceptance-script |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Natalia Bidart (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Move acceptance scripts to source tree
Description of the change
Rather than keep the details of how to run acceptance tests in the Jenkins
config, it's probably better to keep it in the source tree.
This branch does that. It combines the configurations from:
http://
http://
http://
Into one script. It's not a great script, but it already has less duplication
than those configs.
It is possible that the script acceptance-dev.sh could be helpfully broken
up into something that launches the dev server and then outputs details
which can then be used to run this new script against it. That's outside
the scope of this branch.
Reviewer: please check to see that this script is equivalent to the configs,
sane, and doesn't include any revealing data.
Thanks,
jml
Looks good to me!