Permalink
Browse files

Promote slave stability on deployment process and enhance job backup …

…by deleting extraneous files

Change-Id: Ieaba3e160fb12bf49f82910cc912ed9279028454
  • Loading branch information...
eveningwear committed Oct 30, 2012
1 parent f176027 commit 550c0ede6d7e83781f8dd61002b1b733962358a3
Showing with 5 additions and 2 deletions.
  1. +3 −1 jobs/jenkins/templates/config_slave
  2. +1 −1 jobs/jenkins/templates/run_backup
  3. +1 −0 jobs/jenkins_slave/monit
@@ -20,7 +20,7 @@
<default>
<comparator class="hudson.util.CaseInsensitiveComparator"/>
</default>
- <int>29</int>
+ <int>30</int>
<string>CREATE_CONTAINER</string>
<string>/var/vcap/jobs/jenkins_slave/bin/create_container</string>
<string>DEA_RUBY19</string>
@@ -39,6 +39,8 @@
<string>/var/vcap/packages/ruby</string>
<string>WARDEN_REPL</string>
<string>/var/vcap/packages/warden/warden/bin/warden-repl</string>
+ <string>WARDEN_REPL_V2</string>
+ <string>/var/vcap/packages/warden/warden/bin/warden</string>
<string>WARDEN_INSTANCES</string>
<string>/var/vcap/data/warden/depot</string>
<string>VCAP_GIT</string>
@@ -57,7 +57,7 @@ do
ps $JENKINS_PID
if [ $? == 0 ] && (( $now - $last_backup > $backup_interval_secs )); then
log "Prepare for starting sync to $jenkins_backup_address:$DATA_DIR/"
- rsync -avz $DATA_DIR/jobs vcap@$jenkins_backup_address:$DATA_DIR/ | grep "jobs" >> $LOG_DIR/$BACKUP_LOG
+ rsync -avz --delete $DATA_DIR/jobs vcap@$jenkins_backup_address:$DATA_DIR/ | grep "jobs" >> $LOG_DIR/$BACKUP_LOG
echo $now > $LAST_BAK_FILE
fi
View
@@ -9,6 +9,7 @@ check process warden
start program "/var/vcap/jobs/jenkins_slave/bin/warden_ctl start"
stop program "/var/vcap/jobs/jenkins_slave/bin/warden_ctl stop"
group vcap
+ depends on jenkins_slave
<% if properties.jenkins.enable_zabbix_agent==1 %>
check process zabbix

0 comments on commit 550c0ed

Please sign in to comment.