Contribution is not easy, so we created this document to describe how to get you setup so you can contribute back and make everyone's life easier. All contributions will be made via pull request at https://github.com/buildtesters/buildtest-nersc. There will be no push to devel branch, since we have this disabled for all users, all changes must go through pull request.
First, you'll need to fork this repo in your userspace and clone the repo.
First you need to add the upstream repo, to do this by running the following:
git remote add upstream https://github.com/buildtesters/buildtest-nersc.git
The upstream tag is used to sync your local fork with upstream repo. If your remotes are setup properly you should have something like this:
siddiq90@cori01> git remote -v
origin https://github.com/shahzebsiddiqui/buildtest-nersc.git (fetch)
origin https://github.com/shahzebsiddiqui/buildtest-nersc.git (push)
upstream https://github.com/buildtesters/buildtest-nersc.git (fetch)
upstream https://github.com/buildtesters/buildtest-nersc.git (push)
Make sure you set your user name and email set properly in git configuration. We don't want commits from unknown users. This can be done by setting the following:
git config user.name "First Last"
git config user.email "[email protected]"
This will save the configuration local to this repo, Alternately you can setup your user.name and user.email in global setting so its configured for all projects which can be done by running the following:
git config --global user.name "First Last"
git config --global user.email "[email protected]"
The global git configuration is stored in ~/.gitconfig. If you have done this correctly you may have something like as follows
siddiq90@cori01> cat ~/.gitconfig
[user]
name = Shahzeb Siddiqui
email = [email protected]
For more details see First Time Git Setup
The devel from upstream will get Pull Requests from other contributors, in-order
to sync your forked repo with upstream, run the commands below::
cd buildtest-nersc
git checkout devel
git fetch upstream devel
git pull upstream devel
Once the changes are pulled locally you can sync your upstream fork as follows:
git checkout devel
git push origin devel
Please make sure to create a new branch when contributing to this project. Do not push to devel branch on your fork or upstream, instead you should create a new branch
from devel as follows:
cd buildtest-nersc
git checkout devel
git checkout -b featureX
Once you are ready to push to your fork repo do the following:
git push origin featureX
Once the branch is created in your fork, you can issue a Merge Request to devel branch for upstream repo (https://software.nersc.gov/NERSC/buildtest-nersc).
The default branch is devel. This branch is protected branch
which prevents users from accidently deleting the branch.
All incoming PRs submitted to devel branch. Please make sure you sync your buildtest
codebase with devel when you contribute tests and buildspec.
Application tests are stored in apps directory. Tests are categorized by application, please consider adding test in one of the
appropriate directories or create a new directory. Tests from E4S Testsuite or
spack test are located in e4s directory.
This should be used for testing E4S stack on Cori.
If you are adding a buildspec in your PR, please add a test description using description field. Please add test with appropriate
tagname using tags field. For instance all e4s tests are set to e4s tag name. This allows all e4s tests to be run via buildtest build --tags e4s.
Please add yourself to maintainers field which helps contact individual when test fails. When you contribute your test and buildspec please test this locally.
Often times, you may start a feature branch and your PR get's out of sync with
devel branch which may lead to conflicts, this is a result of merging incoming
PRs that may cause upstream HEAD to change over time which can cause merge conflicts.
This may be confusing at first, but don't worry we are here to help. For more details
about merge conflicts click here.
Syncing your feature branch with devel is out of scope for this documentation, however you can use the steps below as a guide when you run into this issue.
You may want to take the steps to first sync devel branch and then
selectively rebase or merge devel into your feature branch.
First go to devel branch and fetch changes from upstream:
git checkout devel
git fetch upstream devel
Note you shouldn't be making any changes to your local devel branch, if git fetch was successful you can merge your devel with upstream as follows:
git merge upstream/devel
Next, navigate to your feature branch and sync feature changes with devel::
git checkout <feature-branch>
git merge devel
Note: Running above command will sync your feature branch with devel but you may have some file conflicts depending on files changed during PR. You will need to resolve them manually before pushing your changes.
Instead of merge from devel you can rebase your commits interactively when syncing with devel. This can be done by running:
git rebase -i devel
Once you have synced your branch push your changes and check if file conflicts are resolved in your Pull Request:
git push origin <feature-branch>
If you need elevated priviledge to project settings please contact the maintainer
- Shahzeb Siddiqui, @shahzebsiddiqui