Changes between Version 2 and Version 3 of how-to/puppet/workflow


Ignore:
Timestamp:
Apr 21, 2011, 10:59:25 PM (14 years ago)
Author:
Jamie McClelland
Comment:

--

Legend:

Unmodified
Added
Removed
Modified

  • how-to/puppet/workflow

    v2 v3  
    55Fortunately, you can still only publish tested commits.
    66
    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
     7 * Open two terminals. On terminal 0, ssh as root@roach. On terminal 1, cd into your puppet/confdir
     8 * On terminal 1, make changes, git add them, and git commit them.
     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.
    1111 * If they fail:
    12   * Make additional changes on your workstation
     12  * Make additional changes in terminal 1
    1313  * git add the files you modified
    1414  * git commit --amend
     15  * Optionally change your commit message (or just save the existing one)
    1516  * 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
     17  * On your workstation, run `git push roach master`
     18 * Repeat as needed.