1.9 KiB
This repository contains scripts for managing multiple outstanding patches to TripleO (or other gerrit based projects).
- tooling to combine arbitrary unmerged gerrit patches (prep_source_repos) which will also export an rc file with git refs based on the combined branches
- a sample config file that we're using (repo_refs.yaml)
- some example inputs for doing rack testing of tripleo in the rack-testing subdir
Usage
-
create a repo_refs.yaml in your TRIPLEO_ROOT (see the one in the root of this repository for inspiration).
-
add the tripleo-end-to-end bin directory to your path (or symlink the specific scripts into place, or $up to you).
-
run prep_source_repos $YOUR_REFS_FILE $TRIPLEO_ROOT to checkout and update the repositories specified by the refs file. Note that local edits are saved via git stash whenever you refresh your source repos, and restored after the update (which may, of course, fail). This provides a convenient way to use local edits / work in progress for repositories that are used directly (vs e.g. those that are cloned into images).
-
source YOUR_REFS_FILE.variables to configure TripleO scripts to use your freshly integrated branches
-
proceed with any tripleo activies you might have (building images, deploying, etc etc).
Advanced use
Refs that don't match the xx/yy/zz form of gerrit refs are presumed to be local work-in-progress branches. These are not fetched, but are merged into the rollup branch along with all the other patches. With a little care this permits working effectively with multiple patchsets in one project without them being made into a stack in gerrit.
When running prep-source-repos any additional arguments after the refs and output dir are used to filter the repositories to fetch - so when working on (say) two local orthogonal patches to nova, and you need to update your rollup branch just do::
prep-source-repos foo bar nova
and only nova will be updated.