mozilla
/
coversheet
зеркало из https://github.com/mozilla/coversheet.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Add jenkins patch for production

This commit is contained in:
Henrik Skupin 2014-06-19 16:33:03 +02:00
Родитель 07e6039368
Коммит fabc0b9037
3 изменённых файлов: 140 добавлений и 92 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

132
config/production/jenkins.patch Normal file
Просмотреть файл

@ -0,0 +1,132 @@
diff --git a/jenkins-master/config.xml b/jenkins-master/config.xml
index 9a3f490..2076a59 100644
--- a/jenkins-master/config.xml
+++ b/jenkins-master/config.xml
@@ -17,16 +17,100 @@
<clouds/>
<slaves>
<slave>
- <name>dummy</name>
- <description></description>
- <remoteFS></remoteFS>
+ <name>tps-osx-109-1</name>
+ <description>OS X 10.9</description>
+ <remoteFS>jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
- <label></label>
- <nodeProperties/>
- <userId>anonymous</userId>
+ <label>mac 10.9 64bit</label>
+ <nodeProperties>
+ <org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
+ <onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
+ <offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
+ </org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
+ </nodeProperties>
+ </slave>
+ <slave>
+ <name>tps-osx-109-2</name>
+ <description>OS X 10.9</description>
+ <remoteFS>jenkins</remoteFS>
+ <numExecutors>1</numExecutors>
+ <mode>NORMAL</mode>
+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+ <launcher class="hudson.slaves.JNLPLauncher"/>
+ <label>mac 10.9 64bit</label>
+ <nodeProperties>
+ <org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
+ <onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
+ <offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
+ </org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
+ </nodeProperties>
+ </slave>
+ <slave>
+ <name>tps-ub-1404-64-1</name>
+ <description>Ubuntu 14.04 64bit</description>
+ <remoteFS>jenkins</remoteFS>
+ <numExecutors>1</numExecutors>
+ <mode>NORMAL</mode>
+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+ <launcher class="hudson.slaves.JNLPLauncher"/>
+ <label>linux ubuntu 14.04 64bit</label>
+ <nodeProperties>
+ <org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
+ <onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
+ <offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
+ </org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
+ </nodeProperties>
+ </slave>
+ <slave>
+ <name>tps-ub-1404-64-2</name>
+ <description>Ubuntu 14.04 64bit</description>
+ <remoteFS>jenkins</remoteFS>
+ <numExecutors>1</numExecutors>
+ <mode>NORMAL</mode>
+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+ <launcher class="hudson.slaves.JNLPLauncher"/>
+ <label>linux ubuntu 14.04 64bit</label>
+ <nodeProperties>
+ <org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
+ <onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
+ <offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
+ </org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
+ </nodeProperties>
+ </slave>
+ <slave>
+ <name>tps-win-81-64-1</name>
+ <description>Windows 8.1 64bit</description>
+ <remoteFS>c:\jenkins</remoteFS>
+ <numExecutors>1</numExecutors>
+ <mode>NORMAL</mode>
+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+ <launcher class="hudson.slaves.JNLPLauncher"/>
+ <label>windows 8.1 64bit</label>
+ <nodeProperties>
+ <org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
+ <onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
+ <offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
+ </org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
+ </nodeProperties>
+ </slave>
+ <slave>
+ <name>tps-win-81-64-2</name>
+ <description>Windows 8.1 64bit</description>
+ <remoteFS>c:\jenkins</remoteFS>
+ <numExecutors>1</numExecutors>
+ <mode>NORMAL</mode>
+ <retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
+ <launcher class="hudson.slaves.JNLPLauncher"/>
+ <label>windows 8.1 64bit</label>
+ <nodeProperties>
+ <org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
+ <onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
+ <offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
+ </org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
+ </nodeProperties>
</slave>
</slaves>
<quietPeriod>5</quietPeriod>
@@ -54,7 +138,7 @@
</default>
<int>1</int>
<string>$NOTIFICATION_ADDRESS</string>
- <string></string>
+ <string>tps-reports@mozilla.org</string>
</tree-map>
</envVars>
</hudson.slaves.EnvironmentVariablesNodeProperty>
diff --git a/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml b/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml
index b6d90da..83592c7 100644
--- a/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml
+++ b/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<jenkins.model.JenkinsLocationConfiguration>
<adminAddress>tps-reports@mozilla.org</adminAddress>
- <jenkinsUrl>http://localhost:8080/</jenkinsUrl>
+ <jenkinsUrl>http://tps-ci-production.qa.scl3.mozilla.com:8080/</jenkinsUrl>
</jenkins.model.JenkinsLocationConfiguration>
\ No newline at end of file

98
jenkins-master/config.xml
Просмотреть файл

@ -17,100 +17,16 @@
<clouds/>
<slaves>
<slave>
<name>tps-osx-109-1</name>
<description>OS X 10.9</description>
<remoteFS>jenkins</remoteFS>
<name>dummy</name>
<description></description>
<remoteFS></remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
<label>mac 10.9 64bit</label>
<nodeProperties>
<org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
<onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
<offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
</nodeProperties>
</slave>
<slave>
<name>tps-osx-109-2</name>
<description>OS X 10.9</description>
<remoteFS>jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
<label>mac 10.9 64bit</label>
<nodeProperties>
<org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
<onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
<offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
</nodeProperties>
</slave>
<slave>
<name>tps-ub-1404-64-1</name>
<description>Ubuntu 14.04 64bit</description>
<remoteFS>jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
<label>linux ubuntu 14.04 64bit</label>
<nodeProperties>
<org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
<onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
<offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
</nodeProperties>
</slave>
<slave>
<name>tps-ub-1404-64-2</name>
<description>Ubuntu 14.04 64bit</description>
<remoteFS>jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
<label>linux ubuntu 14.04 64bit</label>
<nodeProperties>
<org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
<onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
<offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
</nodeProperties>
</slave>
<slave>
<name>tps-win-81-64-1</name>
<description>Windows 8.1 64bit</description>
<remoteFS>c:\jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
<label>windows 8.1 64bit</label>
<nodeProperties>
<org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
<onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
<offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
</nodeProperties>
</slave>
<slave>
<name>tps-win-81-64-2</name>
<description>Windows 8.1 64bit</description>
<remoteFS>c:\jenkins</remoteFS>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<retentionStrategy class="hudson.slaves.RetentionStrategy$Always"/>
<launcher class="hudson.slaves.JNLPLauncher"/>
<label>windows 8.1 64bit</label>
<nodeProperties>
<org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty plugin="mail-watcher-plugin@1.6">
<onlineAddresses>tps-reports@mozilla.org</onlineAddresses>
<offlineAddresses>tps-reports@mozilla.org</offlineAddresses>
</org.jenkinsci.plugins.mailwatcher.WatcherNodeProperty>
</nodeProperties>
<label></label>
<nodeProperties/>
<userId>anonymous</userId>
</slave>
</slaves>
<quietPeriod>5</quietPeriod>
@ -138,7 +54,7 @@
</default>
<int>1</int>
<string>$NOTIFICATION_ADDRESS</string>
<string>tps-reports@mozilla.org</string>
<string></string>
</tree-map>
</envVars>
</hudson.slaves.EnvironmentVariablesNodeProperty>

2
jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml
Просмотреть файл

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<jenkins.model.JenkinsLocationConfiguration>
<adminAddress>tps-reports@mozilla.org</adminAddress>
<jenkinsUrl>http://tps-ci-production.qa.scl3.mozilla.com:8080/</jenkinsUrl>
<jenkinsUrl>http://localhost:8080/</jenkinsUrl>
</jenkins.model.JenkinsLocationConfiguration>