Who this workflow is for
This page describes the workflow for those infra peeps with git repo commit access.
If you do not have commit access, please Fork our repo on Github and issue a Pull Request - we will be notified and respond to PRs in a timely manner.
For Infra folks with commit bit - the current workflow to use goes something like this.
DO NOTE: Deployment branch is currently locked, only root can push to it.!
Working on the infrastructure-puppet repo
git clone https://gitbox.apache.org/repos/asf/infrastructure-puppet.git if you haven't already.
Since this repo is on Gitbox, you can push to Gitbox or Github, but it's best to choose one and stick to it (split brain is a hell of a thing)
Ensure you have deployment branch up-to date.
git checkout deployment
git pull
DO NOT use master. It is not used any more and changes pushed to master will be ignored.
work on your branch
git checkout -b $yourbranch
(do some amazing coding)
Do some lint checking:
bundle exec puppet-lint modules/ [1]
git add .
git commit -m "changes to my branch"
git push origin $yourbranch # ALWAYS specify what branch you're pushing to!
(ask an active infra member to approve (+1) your branch and either they will merge it or you can self-merge quoting the +1 and its author in the log message.)
Pull requests
once you've made a branch, feel free to just make a pull request on github https://github.com/apache/infrastructure-puppet/pull/new/deployment
Github is pretty smart and will recognize branches you've made to select against
This is can be a better method for merging large changes that require discussion or are more asynchronous across timezones/ etc
Merge your own branch in case of emergency
Important: This means having to merge without a +1 from anyone else - i.e. nobody has reviewed your branch and nobody is around to do so and that the
branch is in need of immediate merge. i.e. some service is down and needs it. LEAVE A NOTE IN THE COMMIT MESSAGE
git pull
git checkout deployment
Do some lint checking:
bundle exec puppet-lint modules/ [1]
git merge origin/$yourbranch # will provide you an opportunity for a commit message
git push origin deployment # ALWAYS specify what branch you're pushing to!
Merging others branches (approve + merge) (default workflow)
git pull
git checkout $theirbranch
Do some lint checking:
bundle exec puppet-lint modules/ [1]
git checkout deployment
git merge origin/$theirbranch # may provide you an opportunity for a commit message
git push origin deployment # ALWAYS specify what branch you're pushing to!
Keeping your branch in sync with deployment (a.k.a rebase)
git pull
git checkout $mybranch
git rebase deployment
(fix any merge conflicts by using git status for what needs to be done and asking those in #asfinfra)
git push origin $mybranch # ALWAYS specify what branch you're pushing to!
Merging Conflicts
something like (whilst on your branch) :
git rebase deployment
(edit and resolve conflicts, the stuff between <<<<<<< HEAD and >>>>>>> $branch)
git add $conflicted_file(s)
git rebase --continue
Cleaning up after yourself (deleting your merged branch)
(delete branch locally after merge)
git branch -d $branch (it may complain, and if so, use -D)
(delete branch on remote)
git push origin :$branch
Links to external resources
Resolving merge conflicts in many more situations
More tips on cleaning up branches etc :-
Footnotes
Prepare for lint checking
From root of puppet repo on deployment branch, run
From root of puppet repo on deployment branch, run
To check again puppet-lint, run