THIS IS A TEST INSTANCE. ALL YOUR CHANGES WILL BE LOST!!!!
...
- If an unknown user submits a PR, then Jenkins automation will post a message to github asking if it is okay to test.
- Review the pull request. If the code is not malicious and is okay to test, post a comment "jenkins, ok"
- If the author is a trusted contributor, you can add them to a white-list of known users.
- Post a comment "jenkins, add user"
- Consider inviting them to the "trafodion-contributors" github group as well.
- New commits to the PR will trigger a new build. You can also trigger a retest without a new commit.
- Post a comment "jenkins, retest"
Ensure Criteria are Met
...
The acceptance criteria are determined by the project committee (PPMC). They should be documented here.
- Code Review(s)
- Time available for comments
- Testing
- Legal
- Other
...
Merge Pull Request
...
Example of merging pull request 12345.
- Check the pull request status on github, at the bottom of the pull request page. It will tell you if there are any merge conflicts with master branch.
- If there are conflicts, either ask the contributor to merge up, or be prepared to resolve the conflicts yourself.
- Create a local merge branch, based on the latest, greatest.
- git fetch apache (if ssh is not setup you will be prompted for your apache password)
- git checkout -b mrg_12345 apache/master
- Fetch pull request branch to default destination FETCH_HEAD
- git fetch origin +refs/pull/12345/head
- Merge locally, giving message that includes JIRA IDNormally, you want to just merge their branch:
- git merge --no-ff -m "Merge [TRAFODION-XYZ] PR-12345 Whizbang feature" FETCH_HEAD
- Sometimes you might want to squash their branch into a single commit. If so, add the "--squash" option.
- Additional checks of what you are preparing to push
- git log apache/master..HEAD
- git diff apache/master HEAD
- Push changes to Apache repo, specifying the source and the destination branch.
- git push apache HEAD:master (if ssh is not setup you will be prompted for your apache password)
...
Completion
...
- Close Jira, if appropriate, or ask the contributor to do so.
- If ASF automation does not close the pull request, ask the contributor to do so.
...