Changes between Version 4 and Version 5 of how-to/puppet/workflow
- Timestamp:
- May 5, 2013, 1:08:13 AM (11 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
how-to/puppet/workflow
v4 v5 5 5 Fortunately, you can still only publish tested commits. 6 6 7 * Open two terminals. On terminal 0, ssh as root@roach. On terminal 1, cd into your puppet/confdir7 * Open two terminals. On terminal 0, ssh as `root@roach`. On terminal 1, cd into your puppet/confdir 8 8 * On terminal 1, make changes, git add them, and git commit them. 9 * On terminal 1, git push roach master10 * If they succeed, then you are done. You can git push mfplto publish your changes.9 * On terminal 1, `git push roach master` 10 * If they succeed, then you are done. You can `git push mfpl` to publish your changes. 11 11 * If they fail: 12 12 * Make additional changes in terminal 1 13 13 * git add the files you modified 14 * git commit --amend14 * `git commit --amend` 15 15 * Optionally change your commit message (or just save the existing one) 16 * On roach, run freepuppet-init (that erases your existing git repo, and builds a new empty one so your previosly pushed commit is no longer there).16 * On roach, run `freepuppet-init` (that erases your existing git repo, and builds a new empty one so your previously pushed commit is no longer there). 17 17 * On your workstation, run `git push roach master` 18 18 * Repeat as needed.