Jetstream Code Sync Kickoff Email

Click here to return to top level Code Management page.

Subject: Jetstream Code Synchronization Kickoff

Hi Everyone,

It’s time again to start the Jetstream code update process. After the current round of merging and testing activities are complete, a new baseline version of Jetstream will be available. I will send emails to all group members containing instructions for running test cases and updating to the new baseline version of Jetstream. Please note that it is mandatory that all group members update their version of Jetstream on a regular basis.

If your name is on the following list then you are part of this month’s Jetstream Code Update group. If this is the case, read on for instructions on how to proceed with the code updating process. NOTE: The procedure is to be performed by each member of the current Jetstream Code Update group, one at a time, in the order prescribed by the following list:

1. Tim Chau
2. Gregg Streuber
3. Tom Reist

Member 1 starts by pulling from sync staging area, merging locally (possibly including resolving merge conflicts) then pushing back to sync staging area. Note: as part of the local merge process, please ensure that all compiling issues are resolved before pushing back to the sync staging area.

The following steps describe the pull/merge/push procedure to be performed on Scinet by each member of the current merge group:

1. Commit any pending changes to your master branch before beginning the merge process:
   • git checkout master
   • git commit -a
2. Create a branch for merging:
   • git branch merge
3. Switch to merge branch so that your local master branch is not affected during merge:
   • git checkout merge
4. Pull from the Jetstream sync staging area:
   • git pull /home/z/zingg/hbuckley/jetstream_sync_staging_20170202
5. Resolve conflicts
6. Ensure that all compiling issues are resolved before pushing back to the sync staging area. Execute the following script to compile Jetstream:
   • ./make_jetstream
   • confirm that executable has been sucessfully compiled...check that it was compiled today:
   • ls -l ~/bin/jetstream_x86_64
7. After resolving any compiling issues, commit changes to the merge branch:
   • git commit -a
8. Push back to the Jetstream sync staging area:
   • git push /home/z/zingg/hbuckley/jetstream_sync_staging_20151208 merging:master
9. Set some write permissions in the sync staging area:
   • chmod g+w /home/z/zingg/hbuckley/jetstream_sync_staging_20160511/objects/*

Member 2, then member 3, then member 4 (in sequence) repeat the pull/merge/push steps described above.

Final member, please email me when the merge process is complete.

Thanks for your cooperation,

<Gatekeeper>