Skip to content

Commit fb56c5a

Browse files
adriaanmadriaanm
authored
Merge pull request #247 from SethTisue/changes-20180222
accumulated Jenkins config changes
2 parents a249d0f + 2e41082 commit fb56c5a

File tree

4 files changed

+210
-195
lines changed

4 files changed

+210
-195
lines changed

‎roles/jenkins/files/jobs/scala-2.12.x-release-main/config.xml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,12 @@
5353
<defaultValue>2.12.x</defaultValue>
5454
<trim>false</trim>
5555
</hudson.model.StringParameterDefinition>
56+
<hudson.model.StringParameterDefinition>
57+
<name>sbtBuildTask</name>
58+
<description></description>
59+
<defaultValue>testAll</defaultValue>
60+
<trim>false</trim>
61+
</hudson.model.StringParameterDefinition>
5662
</parameterDefinitions>
5763
</hudson.model.ParametersDefinitionProperty>
5864
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
@@ -81,7 +87,7 @@ def bootstrapParams = [
8187
s(&quot;jvmVersion&quot;),
8288
s(&quot;SCALA_VER_BASE&quot;),
8389
s(&quot;SCALA_VER_SUFFIX&quot;),
84-
s(&quot;sbtBuildTask&quot;, &quot;&quot;) // &quot;testAll&quot;
90+
s(&quot;sbtBuildTask&quot;)
8591
]
8692

8793
def buildPropsList = []
@@ -94,20 +100,19 @@ stage(&apos;bootstrap&apos;) {
94100

95101
stage(&apos;copy artifact&apos;) {
96102
node(&quot;&quot;) {
97-
copyArtifacts(projectName: bootstrapJobName, selector: specific(&quot;${built.number}&quot;), filter: &apos;jenkins.properties&apos;, flatten: true);
103+
copyArtifacts(projectName: bootstrapJobName, selector: specific(&quot;${bootstrapBuild.number}&quot;), filter: &apos;jenkins.properties&apos;, flatten: true);
98104
def props = readProperties file: &apos;jenkins.properties&apos;
99105
buildPropsList = props.entrySet().collect{&quot;${it.getKey()}=${it.getValue()}&quot;}
100106
}
101107
}
102108

103109
def releaseStage(scriptFile, label) {
104-
node(label) { stage(name) {
110+
node(label) { stage(scriptFile) {
105111
try {
106112
scalaDistCheckout()
107113
ansiColor(&apos;xterm&apos;) {
108114
withEnv(buildPropsList) {
109-
echo &quot;DRY RUN: ${scriptFile}&quot;
110-
//runScript(scriptFile)
115+
runScript(scriptFile)
111116
}
112117
}
113118
}

‎roles/jenkins/files/jobs/scala-2.13.x-integrate-community-build/config.xml

Lines changed: 163 additions & 140 deletions
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,178 @@
1-
<?xml version="1.0" encoding="UTF-8"?><project>
2-
<description>Community Build</description>
3-
<properties>
4-
<com.tikal.hudson.plugins.notification.HudsonNotificationProperty plugin="notification@1.7">
5-
<endpoints>
6-
7-
<com.tikal.hudson.plugins.notification.Endpoint>
8-
<protocol>HTTP</protocol>
9-
<format>JSON</format>
10-
<url>http://scala-ci.typesafe.com:8888/jenkins</url>
11-
<event>all</event>
12-
<timeout>30000</timeout>
13-
</com.tikal.hudson.plugins.notification.Endpoint>
14-
15-
<com.tikal.hudson.plugins.notification.Endpoint>
16-
<protocol>HTTP</protocol>
17-
<format>JSON</format>
18-
<url>https://scala-ci.typesafe.com/benchq/webhooks/jenkins</url>
19-
<event>all</event>
20-
<timeout>30000</timeout>
21-
</com.tikal.hudson.plugins.notification.Endpoint>
22-
</endpoints>
23-
</com.tikal.hudson.plugins.notification.HudsonNotificationProperty>
24-
<hudson.model.ParametersDefinitionProperty>
25-
<parameterDefinitions>
26-
<hudson.model.StringParameterDefinition>
27-
<name>repo_user</name>
28-
<description>The github username for the repo to clone.</description>
29-
<defaultValue>scala</defaultValue>
30-
</hudson.model.StringParameterDefinition>
31-
<hudson.model.StringParameterDefinition>
32-
<name>repo_name</name>
33-
<description>The name of the repo to clone.</description>
34-
<defaultValue>community-builds</defaultValue>
35-
</hudson.model.StringParameterDefinition>
36-
<hudson.model.StringParameterDefinition>
37-
<name>repo_ref</name>
38-
<description>The git ref at ${repo_user}/${repo_name} to build.</description>
39-
<defaultValue>2.13.x</defaultValue>
40-
</hudson.model.StringParameterDefinition>
41-
42-
43-
<hudson.model.StringParameterDefinition>
44-
<name>version</name>
45-
<description>Published Scala version to build the community projects with. This should be a complete build, including modules, and library sources.</description>
46-
<defaultValue/>
47-
</hudson.model.StringParameterDefinition>
48-
49-
<hudson.model.StringParameterDefinition>
50-
<name>projects</name>
51-
<description>List of projects to build (comma-separated, no spaces).</description>
52-
<defaultValue/>
53-
</hudson.model.StringParameterDefinition>
54-
55-
<hudson.model.StringParameterDefinition>
56-
<name>scalac_opts</name>
57-
<description>Scala compiler arguments, e.g., -Yopt:l:classpath, passed to project builds.</description>
58-
<defaultValue/>
59-
</hudson.model.StringParameterDefinition>
60-
61-
<hudson.model.StringParameterDefinition>
62-
<name>jvmFlavor</name>
63-
<description>Java flavor to use (oracle/openjdk).</description>
64-
<defaultValue>openjdk</defaultValue>
65-
</hudson.model.StringParameterDefinition>
66-
67-
<hudson.model.StringParameterDefinition>
68-
<name>jvmVersion</name>
69-
<description>Java version to use (6/7/8).</description>
70-
<defaultValue>8</defaultValue>
71-
</hudson.model.StringParameterDefinition>
72-
</parameterDefinitions>
73-
</hudson.model.ParametersDefinitionProperty>
74-
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@1.8.4">
75-
<maxConcurrentPerNode>1</maxConcurrentPerNode>
76-
<maxConcurrentTotal>0</maxConcurrentTotal>
77-
<throttleEnabled>true</throttleEnabled>
78-
<throttleOption>project</throttleOption>
79-
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
80-
81-
</properties>
82-
<scm class="hudson.plugins.git.GitSCM" plugin="git@2.2.1">
83-
<configVersion>2</configVersion>
84-
<userRemoteConfigs>
85-
<hudson.plugins.git.UserRemoteConfig>
86-
<name>${repo_user}</name>
87-
<refspec>+refs/heads/*:refs/remotes/${repo_user}/* +refs/pull/*/head:refs/remotes/${repo_user}/pr/*/head</refspec>
88-
<url>https://github.com/${repo_user}/${repo_name}.git</url>
89-
</hudson.plugins.git.UserRemoteConfig>
90-
</userRemoteConfigs>
91-
<branches>
92-
<hudson.plugins.git.BranchSpec>
93-
<name>${repo_ref}</name>
94-
</hudson.plugins.git.BranchSpec>
95-
</branches>
96-
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
97-
<submoduleCfg class="list"/>
98-
<extensions>
99-
<hudson.plugins.git.extensions.impl.CleanCheckout/>
100-
</extensions>
101-
</scm>
102-
103-
<assignedNode>jenkins-worker-behemoth-2</assignedNode>
104-
<canRoam>false</canRoam>
105-
<concurrentBuild>true</concurrentBuild>
106-
<builders>
107-
<hudson.plugins.groovy.SystemGroovy plugin="groovy">
108-
<scriptSource class="hudson.plugins.groovy.StringScriptSource">
109-
<command>repo_user = build.buildVariableResolver.resolve("repo_user")
110-
repo_name = build.buildVariableResolver.resolve("repo_name")
111-
repo_ref = build.buildVariableResolver.resolve("repo_ref").take(12)
112-
build.setDisplayName("[${build.number}] $repo_user/$repo_name#$repo_ref")
113-
</command>
114-
</scriptSource>
115-
</hudson.plugins.groovy.SystemGroovy>
116-
117-
<hudson.tasks.Shell>
118-
<command>#!/bin/bash -ex
1+
<?xml version='1.1' encoding='UTF-8'?>
2+
<project>
3+
<actions/>
4+
<description>Community Build</description>
5+
<keepDependencies>false</keepDependencies>
6+
<properties>
7+
<com.tikal.hudson.plugins.notification.HudsonNotificationProperty plugin="notification@1.13-SNAPSHOT">
8+
<endpoints>
9+
<com.tikal.hudson.plugins.notification.Endpoint>
10+
<protocol>HTTP</protocol>
11+
<format>JSON</format>
12+
<urlInfo>
13+
<urlOrId>http://scala-ci.typesafe.com:8888/jenkins</urlOrId>
14+
<urlType>PUBLIC</urlType>
15+
</urlInfo>
16+
<event>all</event>
17+
<timeout>30000</timeout>
18+
<loglines>0</loglines>
19+
<retries>0</retries>
20+
</com.tikal.hudson.plugins.notification.Endpoint>
21+
<com.tikal.hudson.plugins.notification.Endpoint>
22+
<protocol>HTTP</protocol>
23+
<format>JSON</format>
24+
<urlInfo>
25+
<urlOrId>https://scala-ci.typesafe.com/benchq/webhooks/jenkins</urlOrId>
26+
<urlType>PUBLIC</urlType>
27+
</urlInfo>
28+
<event>all</event>
29+
<timeout>30000</timeout>
30+
<loglines>0</loglines>
31+
<retries>0</retries>
32+
</com.tikal.hudson.plugins.notification.Endpoint>
33+
</endpoints>
34+
</com.tikal.hudson.plugins.notification.HudsonNotificationProperty>
35+
<com.sonyericsson.rebuild.RebuildSettings plugin="rebuild@1.27">
36+
<autoRebuild>false</autoRebuild>
37+
<rebuildDisabled>false</rebuildDisabled>
38+
</com.sonyericsson.rebuild.RebuildSettings>
39+
<com.synopsys.arc.jenkinsci.plugins.jobrestrictions.jobs.JobRestrictionProperty plugin="job-restrictions@0.6"/>
40+
<hudson.model.ParametersDefinitionProperty>
41+
<parameterDefinitions>
42+
<hudson.model.StringParameterDefinition>
43+
<name>repo_user</name>
44+
<description>The github username for the repo to clone.</description>
45+
<defaultValue>scala</defaultValue>
46+
<trim>false</trim>
47+
</hudson.model.StringParameterDefinition>
48+
<hudson.model.StringParameterDefinition>
49+
<name>repo_name</name>
50+
<description>The name of the repo to clone.</description>
51+
<defaultValue>community-builds</defaultValue>
52+
<trim>false</trim>
53+
</hudson.model.StringParameterDefinition>
54+
<hudson.model.StringParameterDefinition>
55+
<name>repo_ref</name>
56+
<description>The git ref at ${repo_user}/${repo_name} to build.</description>
57+
<defaultValue>2.13.x</defaultValue>
58+
<trim>false</trim>
59+
</hudson.model.StringParameterDefinition>
60+
<hudson.model.StringParameterDefinition>
61+
<name>version</name>
62+
<description>Published Scala version to build the community projects with. This should be a complete build, including modules, and library sources.</description>
63+
<defaultValue></defaultValue>
64+
<trim>false</trim>
65+
</hudson.model.StringParameterDefinition>
66+
<hudson.model.StringParameterDefinition>
67+
<name>projects</name>
68+
<description>List of projects to build (comma-separated, no spaces).</description>
69+
<defaultValue></defaultValue>
70+
<trim>false</trim>
71+
</hudson.model.StringParameterDefinition>
72+
<hudson.model.StringParameterDefinition>
73+
<name>scalac_opts</name>
74+
<description>Scala compiler arguments, e.g., -Yopt:l:classpath, passed to project builds.</description>
75+
<defaultValue></defaultValue>
76+
<trim>false</trim>
77+
</hudson.model.StringParameterDefinition>
78+
<hudson.model.StringParameterDefinition>
79+
<name>jvmFlavor</name>
80+
<description>Java flavor to use (oracle/openjdk).</description>
81+
<defaultValue>openjdk</defaultValue>
82+
<trim>false</trim>
83+
</hudson.model.StringParameterDefinition>
84+
<hudson.model.StringParameterDefinition>
85+
<name>jvmVersion</name>
86+
<description>Java version to use (6/7/8).</description>
87+
<defaultValue>8</defaultValue>
88+
<trim>false</trim>
89+
</hudson.model.StringParameterDefinition>
90+
</parameterDefinitions>
91+
</hudson.model.ParametersDefinitionProperty>
92+
<hudson.plugins.throttleconcurrents.ThrottleJobProperty plugin="throttle-concurrents@2.0.1">
93+
<maxConcurrentPerNode>1</maxConcurrentPerNode>
94+
<maxConcurrentTotal>0</maxConcurrentTotal>
95+
<categories class="java.util.concurrent.CopyOnWriteArrayList"/>
96+
<throttleEnabled>true</throttleEnabled>
97+
<throttleOption>project</throttleOption>
98+
<limitOneJobWithMatchingParams>false</limitOneJobWithMatchingParams>
99+
<paramsToUseForLimit></paramsToUseForLimit>
100+
</hudson.plugins.throttleconcurrents.ThrottleJobProperty>
101+
</properties>
102+
<scm class="hudson.plugins.git.GitSCM" plugin="git@3.7.0">
103+
<configVersion>2</configVersion>
104+
<userRemoteConfigs>
105+
<hudson.plugins.git.UserRemoteConfig>
106+
<name>${repo_user}</name>
107+
<refspec>+refs/heads/*:refs/remotes/${repo_user}/* +refs/pull/*/head:refs/remotes/${repo_user}/pr/*/head</refspec>
108+
<url>https://github.com/${repo_user}/${repo_name}.git</url>
109+
</hudson.plugins.git.UserRemoteConfig>
110+
</userRemoteConfigs>
111+
<branches>
112+
<hudson.plugins.git.BranchSpec>
113+
<name>${repo_ref}</name>
114+
</hudson.plugins.git.BranchSpec>
115+
</branches>
116+
<doGenerateSubmoduleConfigurations>false</doGenerateSubmoduleConfigurations>
117+
<submoduleCfg class="list"/>
118+
<extensions>
119+
<hudson.plugins.git.extensions.impl.CleanCheckout/>
120+
</extensions>
121+
</scm>
122+
<assignedNode>jenkins-worker-behemoth-3</assignedNode>
123+
<canRoam>false</canRoam>
124+
<disabled>false</disabled>
125+
<blockBuildWhenDownstreamBuilding>false</blockBuildWhenDownstreamBuilding>
126+
<blockBuildWhenUpstreamBuilding>false</blockBuildWhenUpstreamBuilding>
127+
<triggers/>
128+
<concurrentBuild>true</concurrentBuild>
129+
<builders>
130+
<hudson.plugins.groovy.SystemGroovy plugin="groovy@2.0">
131+
<source class="hudson.plugins.groovy.StringSystemScriptSource">
132+
<script plugin="script-security@1.41">
133+
<script>repo_user = build.buildVariableResolver.resolve(&quot;repo_user&quot;)
134+
repo_name = build.buildVariableResolver.resolve(&quot;repo_name&quot;)
135+
repo_ref = build.buildVariableResolver.resolve(&quot;repo_ref&quot;).take(12)
136+
build.setDisplayName(&quot;[${build.number}] $repo_user/$repo_name#$repo_ref&quot;)
137+
</script>
138+
<sandbox>false</sandbox>
139+
</script>
140+
</source>
141+
</hudson.plugins.groovy.SystemGroovy>
142+
<hudson.tasks.Shell>
143+
<command>#!/bin/bash -ex
119144
if [ -f /usr/local/share/jvm/jvm-select ]; then
120145
source /usr/local/share/jvm/jvm-select
121146
jvmSelect $jvmFlavor $jvmVersion
122147
else
123-
echo "WARNING: jvm-select not present. using system default Java"
148+
echo &quot;WARNING: jvm-select not present. using system default Java&quot;
124149
fi
125150

126151
source scripts/jobs/integrate/community-build
127152
</command>
128-
</hudson.tasks.Shell>
129-
130-
</builders>
131-
<buildWrappers>
132-
<hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@1.14.1">
133-
<strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
134-
<timeoutMinutes>720</timeoutMinutes>
135-
</strategy>
136-
<operationList/>
137-
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
138-
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.4.1">
139-
<colorMapName>xterm</colorMapName>
140-
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
141-
<hudson.plugins.logfilesizechecker.LogfilesizecheckerWrapper plugin="logfilesizechecker@1.2">
142-
<setOwn>false</setOwn>
143-
<maxLogSize>0</maxLogSize>
144-
<failBuild>true</failBuild>
145-
</hudson.plugins.logfilesizechecker.LogfilesizecheckerWrapper>
146-
</buildWrappers>
147-
153+
</hudson.tasks.Shell>
154+
</builders>
148155
<publishers>
149-
<hudson.tasks.Mailer plugin="mailer@1.8">
156+
<hudson.tasks.Mailer plugin="mailer@1.20">
150157
<recipients>adriaan@lightbend.com seth.tisue@lightbend.com</recipients>
151158
<dontNotifyEveryUnstableBuild>false</dontNotifyEveryUnstableBuild>
152159
<sendToIndividuals>false</sendToIndividuals>
153160
</hudson.tasks.Mailer>
154161
</publishers>
162+
<buildWrappers>
163+
<hudson.plugins.build__timeout.BuildTimeoutWrapper plugin="build-timeout@1.19">
164+
<strategy class="hudson.plugins.build_timeout.impl.AbsoluteTimeOutStrategy">
165+
<timeoutMinutes>720</timeoutMinutes>
166+
</strategy>
167+
<operationList/>
168+
</hudson.plugins.build__timeout.BuildTimeoutWrapper>
169+
<hudson.plugins.logfilesizechecker.LogfilesizecheckerWrapper plugin="logfilesizechecker@1.3">
170+
<setOwn>false</setOwn>
171+
<maxLogSize>0</maxLogSize>
172+
<failBuild>true</failBuild>
173+
</hudson.plugins.logfilesizechecker.LogfilesizecheckerWrapper>
174+
<hudson.plugins.ansicolor.AnsiColorBuildWrapper plugin="ansicolor@0.5.2">
175+
<colorMapName>xterm</colorMapName>
176+
</hudson.plugins.ansicolor.AnsiColorBuildWrapper>
177+
</buildWrappers>
155178
</project>

0 commit comments

Comments
 (0)