Skip to content
This repository has been archived by the owner on May 15, 2018. It is now read-only.

Commit

Permalink
Upgrade EmailExt plugin to v2.38.1 (#345)
Browse files Browse the repository at this point in the history
  • Loading branch information
@whimboo
whimboo committed Jun 12, 2014
1 parent 8d8330a commit ddfa59c
Show file tree
Hide file tree
Showing 49 changed files with 447 additions and 597 deletions.
106 changes: 43 additions & 63 deletions config/production/jenkins.patch
View file

Large diffs are not rendered by default.

18 changes: 3 additions & 15 deletions config/staging/jenkins.patch
View file
@@ -1,8 +1,8 @@
diff --git a/jenkins-master/config.xml b/jenkins-master/config.xml
index 5efb66c..8cacc94 100644
index f334d85..9a84f84 100644
--- a/jenkins-master/config.xml
+++ b/jenkins-master/config.xml
@@ -16,16 +16,212 @@
@@ -17,16 +17,212 @@
<clouds/>
<slaves>
<slave>
Expand Down Expand Up @@ -221,7 +221,7 @@ index 5efb66c..8cacc94 100644
</slave>
</slaves>
<quietPeriod>5</quietPeriod>
@@ -235,7 +431,12 @@
@@ -245,7 +441,12 @@
<primaryView>All</primaryView>
<slaveAgentPort>0</slaveAgentPort>
<label>master</label>
Expand All @@ -235,18 +235,6 @@ index 5efb66c..8cacc94 100644
<globalNodeProperties>
<hudson.slaves.EnvironmentVariablesNodeProperty>
<envVars serialization="custom">
diff --git a/jenkins-master/hudson.plugins.emailext.ExtendedEmailPublisher.xml b/jenkins-master/hudson.plugins.emailext.ExtendedEmailPublisher.xml
index 431c590..009074e 100644
--- a/jenkins-master/hudson.plugins.emailext.ExtendedEmailPublisher.xml
+++ b/jenkins-master/hudson.plugins.emailext.ExtendedEmailPublisher.xml
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.plugins.emailext.ExtendedEmailPublisherDescriptor plugin="email-ext@2.35.1">
- <hudsonUrl>http://localhost:8080/</hudsonUrl>
+ <hudsonUrl>http://mm-ci-staging.qa.scl3.mozilla.com:8080/</hudsonUrl>
<adminAddress>mozmill-ci@mozilla.com</adminAddress>
<useSsl>false</useSsl>
<defaultContentType>text/plain</defaultContentType>
diff --git a/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml b/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml
index 2cec9ac..a8c78ed 100644
--- a/jenkins-master/jenkins.model.JenkinsLocationConfiguration.xml
Expand Down
2 changes: 1 addition & 1 deletion jenkins-master/config.xml
View file
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson>
<disabledAdministrativeMonitors/>
<version>1.509.4</version>
<version>1.554.2</version>
<numExecutors>1</numExecutors>
<mode>NORMAL</mode>
<useSecurity>true</useSecurity>
Expand Down
3 changes: 1 addition & 2 deletions jenkins-master/hudson.plugins.emailext.ExtendedEmailPublisher.xml
View file
@@ -1,6 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.plugins.emailext.ExtendedEmailPublisherDescriptor plugin="email-ext@2.35.1">
<hudsonUrl>http://localhost:8080/</hudsonUrl>
<hudson.plugins.emailext.ExtendedEmailPublisherDescriptor plugin="email-ext@2.38.1">
<adminAddress>mozmill-ci@mozilla.com</adminAddress>
<useSsl>false</useSsl>
<defaultContentType>text/plain</defaultContentType>
Expand Down
2 changes: 1 addition & 1 deletion jenkins-master/hudson.tasks.Mailer.xml
View file
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<hudson.tasks.Mailer_-DescriptorImpl plugin="mailer@1.4">
<hudson.tasks.Mailer_-DescriptorImpl plugin="mailer@1.6">
<defaultSuffix>@mozilla.com</defaultSuffix>
<adminAddress>mozmill-ci@mozilla.com</adminAddress>
<smtpHost>smtp.mozilla.org</smtpHost>
Expand Down
4 changes: 4 additions & 0 deletions jenkins-master/jenkins.model.ArtifactManagerConfiguration.xml
View file
@@ -0,0 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<jenkins.model.ArtifactManagerConfiguration>
<artifactManagerFactories/>
</jenkins.model.ArtifactManagerConfiguration>
4 changes: 4 additions & 0 deletions jenkins-master/jenkins.model.DownloadSettings.xml
View file
@@ -0,0 +1,4 @@
<?xml version='1.0' encoding='UTF-8'?>
<jenkins.model.DownloadSettings>
<useBrowser>true</useBrowser>
</jenkins.model.DownloadSettings>
23 changes: 10 additions & 13 deletions jenkins-master/jobs/mozilla-aurora_addons/config.xml
View file
Expand Up @@ -124,18 +124,17 @@
<keepLongStdio>false</keepLongStdio>
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.35.1">
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.38.1">
<recipientList>$DEFAULT_RECIPIENTS</recipientList>
<configuredTriggers>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<email>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -151,10 +150,9 @@

View the build in Jenkins:
${BUILD_URL}</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -167,10 +165,9 @@ ${BUILD_URL}</body>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand Down
23 changes: 10 additions & 13 deletions jenkins-master/jobs/mozilla-aurora_endurance/config.xml
View file
Expand Up @@ -139,18 +139,17 @@
<keepLongStdio>false</keepLongStdio>
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.35.1">
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.38.1">
<recipientList>$DEFAULT_RECIPIENTS</recipientList>
<configuredTriggers>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<email>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -166,10 +165,9 @@

View the build in Jenkins:
${BUILD_URL}</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -182,10 +180,9 @@ ${BUILD_URL}</body>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand Down
23 changes: 10 additions & 13 deletions jenkins-master/jobs/mozilla-aurora_functional/config.xml
View file
Expand Up @@ -124,18 +124,17 @@
<keepLongStdio>false</keepLongStdio>
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.35.1">
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.38.1">
<recipientList>$DEFAULT_RECIPIENTS</recipientList>
<configuredTriggers>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<email>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -151,10 +150,9 @@

View the build in Jenkins:
${BUILD_URL}</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -167,10 +165,9 @@ ${BUILD_URL}</body>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand Down
19 changes: 6 additions & 13 deletions jenkins-master/jobs/mozilla-aurora_l10n/config.xml
View file
Expand Up @@ -124,18 +124,15 @@
<keepLongStdio>false</keepLongStdio>
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.35.1">
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.38.1">
<recipientList>$DEFAULT_RECIPIENTS</recipientList>
<configuredTriggers>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<email>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>false</sendToRecipientList>
<recipientProviders/>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -151,10 +148,9 @@

View the build in Jenkins:
${BUILD_URL}</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -167,10 +163,7 @@ ${BUILD_URL}</body>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>false</sendToRecipientList>
<recipientProviders/>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand Down
23 changes: 10 additions & 13 deletions jenkins-master/jobs/mozilla-aurora_remote/config.xml
View file
Expand Up @@ -124,18 +124,17 @@
<keepLongStdio>false</keepLongStdio>
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.35.1">
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.38.1">
<recipientList>$DEFAULT_RECIPIENTS</recipientList>
<configuredTriggers>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<email>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -151,10 +150,9 @@

View the build in Jenkins:
${BUILD_URL}</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -167,10 +165,9 @@ ${BUILD_URL}</body>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand Down
23 changes: 10 additions & 13 deletions jenkins-master/jobs/mozilla-aurora_update/config.xml
View file
Expand Up @@ -134,18 +134,17 @@
<keepLongStdio>false</keepLongStdio>
<testDataPublishers/>
</hudson.tasks.junit.JUnitResultArchiver>
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.35.1">
<hudson.plugins.emailext.ExtendedEmailPublisher plugin="email-ext@2.38.1">
<recipientList>$DEFAULT_RECIPIENTS</recipientList>
<configuredTriggers>
<hudson.plugins.emailext.plugins.trigger.UnstableTrigger>
<email>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -161,10 +160,9 @@

View the build in Jenkins:
${BUILD_URL}</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand All @@ -177,10 +175,9 @@ ${BUILD_URL}</body>
<recipientList></recipientList>
<subject>$PROJECT_DEFAULT_SUBJECT</subject>
<body>$PROJECT_DEFAULT_CONTENT</body>
<sendToDevelopers>false</sendToDevelopers>
<sendToRequester>false</sendToRequester>
<includeCulprits>false</includeCulprits>
<sendToRecipientList>true</sendToRecipientList>
<recipientProviders>
<hudson.plugins.emailext.plugins.recipients.ListRecipientProvider/>
</recipientProviders>
<attachmentsPattern></attachmentsPattern>
<attachBuildLog>true</attachBuildLog>
<compressBuildLog>false</compressBuildLog>
Expand Down

0 comments on commit ddfa59c

Please sign in to comment.