| | 1 | == Puppet workflow == |
| | 2 | |
| | 3 | Our workflow requires that you do something a little backwards. You have to git commit and ''then'' test your changes by git pushing into roach. Normally it should be the other way around. |
| | 4 | |
| | 5 | Fortunately, you can still only publish tested commits. |
| | 6 | |
| | 7 | * Operate with both an root@roach ssh terminal and your working terminal on your workstation |
| | 8 | * On our workstation, make changes, git add them, and git commit them. |
| | 9 | * git push roach master |
| | 10 | * If they succeed, then you are done |
| | 11 | * If they fail: |
| | 12 | * Make additional changes on your workstation |
| | 13 | * git add the files you modified |
| | 14 | * git commit --amend |
| | 15 | * On roach, run freepuppet-init (that blows away your existing git repo, and builds a new empty one so your previosly pushed commit is no longer there). |
| | 16 | * On your workstation, run git push roach master |
| | 17 | * Repeat |
