Skip to content

Commit 78f3e4c

Browse files
uhafneruhafner
authored
Merge pull request #1579 from uhafner/latest-jenkins
Upgrade Jenkins configuration from devenv
2 parents 254ec1d + 9a52781 commit 78f3e4c

5 files changed

Lines changed: 14 additions & 13 deletions

File tree

‎docker/images/java-agent/Dockerfile‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,4 @@ RUN curl -sS -L -O --output-dir /tmp/ --create-dirs https://archive.apache.org/
2424
export PATH=${M2_HOME}/bin:${PATH}" > /etc/profile.d/maven.sh
2525
ENV M2_HOME="/opt/maven"
2626
ENV PATH="${M2_HOME}/bin/:${PATH}"
27-
28-
RUN echo "PATH=${PATH}" >> /etc/environment && \
29-
mkdir -pv "${JENKINS_AGENT_HOME}/.m2/repository" && \
30-
chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}"
27+
RUN echo "PATH=${PATH}" >> /etc/environment && chown -R jenkins:jenkins "${JENKINS_AGENT_HOME}"

‎docker/images/jenkins-controller/jenkins.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
jenkins:
2-
agentProtocols:
3-
- "JNLP4-connect"
4-
- "Ping"
52
authorizationStrategy: "loggedInUsersCanDoAnything"
63
crumbIssuer:
74
standard:

‎docker/images/jenkins-controller/plugins.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ command-launcher
1212
configuration-as-code
1313
credentials
1414
credentials-binding
15+
dark-theme
1516
dashboard-view
1617
display-url-api
1718
docker-commons
@@ -28,6 +29,7 @@ github
2829
github-api
2930
github-checks
3031
github-branch-source
32+
gravatar
3133
jackson2-api
3234
javadoc
3335
jdk-tool
@@ -44,6 +46,7 @@ mock-security-realm
4446
pam-auth
4547
pipeline-build-step
4648
pipeline-graph-analysis
49+
pipeline-graph-view
4750
pipeline-input-step
4851
pipeline-maven
4952
pipeline-milestone-step
@@ -61,6 +64,7 @@ ssh-credentials
6164
ssh-slaves
6265
structs
6366
timestamper
67+
theme-manager
6468
token-macro
6569
trilead-api
6670
warnings-ng

‎docker/images/jenkins-controller/preconfigured-jobs/history-coverage-model/config.xml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version='1.1' encoding='UTF-8'?>
2-
<flow-definition plugin="workflow-job@1426.v2ecb_a_a_42fd46">
2+
<flow-definition plugin="workflow-job@1505.vea_4b_20a_4a_495">
33
<actions/>
44
<description></description>
55
<keepDependencies>false</keepDependencies>
66
<properties/>
7-
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@3903.v48a_8836749e9">
7+
<definition class="org.jenkinsci.plugins.workflow.cps.CpsFlowDefinition" plugin="workflow-cps@4018.vf02e01888da_f">
88
<script>node (&apos;jdk21&apos;) {
99
def url = &quot;https://github.com/jenkinsci/coverage-model.git&quot;
1010
def tags = &quot;git ls-remote -t --sort v:refname --refs $url | cut -f1 | tail -n +28&quot;
@@ -35,6 +35,8 @@
3535

3636
junit(allowEmptyResults: true, testResults: &apos;**/target/*-reports/TEST-*.xml&apos;)
3737

38+
recordCoverage(tools: [[parser: &apos;METRICS&apos;, pattern: &apos;target/metrics/pmd.xml&apos;]],
39+
sourceCodeRetention: &apos;NEVER&apos;, id: &apos;metrics&apos;, name: &apos;Software Metrics&apos;)
3840
recordCoverage(tools: [
3941
[parser: &apos;JACOCO&apos;, pattern: &apos;target/site/jacoco/jacoco.xml&apos;],
4042
[parser: &apos;JUNIT&apos;, pattern: &apos;**/target/*-reports/TEST-*.xml&apos;]],
@@ -46,7 +48,7 @@
4648
[threshold: 50.0, metric: &apos;BRANCH&apos;, baseline: &apos;PROJECT&apos;, criticality: &apos;ERROR&apos;]])
4749
recordIssues tools: [checkStyle(pattern: &apos;target/**/checkstyle-result.xml&apos;),
4850
spotBugs(pattern: &apos;target/spotbugsXml.xml&apos;),
49-
pmdParser(pattern: &apos;target/**/pmd.xml&apos;),
51+
pmdParser(pattern: &apos;target/pmd-*/pmd.xml&apos;),
5052
cpd(pattern: &apos;target/cpd.xml&apos;),
5153
revApi(pattern: &apos;target/revapi-result.json&apos;),
5254
taskScanner(highTags:&apos;FIXME&apos;, normalTags:&apos;TODO&apos;, includePattern: &apos;**/*.java&apos;, excludePattern: &apos;target/**/*&apos;)],
@@ -58,7 +60,7 @@
5860

5961
stage (&apos;Mutation Coverage&apos;) {
6062
withMaven(mavenOpts: &apos;-Xmx1024m -Xms512m&apos;) {
61-
sh &quot;mvn org.pitest:pitest-maven:mutationCoverage&quot;
63+
sh &quot;mvn dependency:properties org.pitest:pitest-maven:mutationCoverage&quot;
6264
}
6365
recordCoverage tools: [[parser: &apos;PIT&apos;, pattern: &apos;**/pit-reports/mutations.xml&apos;],
6466
[parser: &apos;JUNIT&apos;, pattern: &apos;**/target/*-reports/TEST-*.xml&apos;]], id: &apos;pit&apos;,

‎docker/images/jenkins-controller/preconfigured-jobs/pipeline-codingstyle/config.xml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
stage (&apos;Build, Test and Static Analysis&apos;) {
2323
withMaven(maven: &apos;mvn-default&apos;, mavenOpts: &apos;-Xmx1024m -Xms512m&apos;) {
24-
sh &apos;mvn -ntp -V -e clean verify -Pci -Ppit&apos;
24+
sh &apos;mvn -ntp -V -e clean verify -Pci -Ppit -Powasp&apos;
2525
}
2626

2727
recordIssues tools: [java(), javaDoc()], aggregatingResults: &apos;true&apos;, id: &apos;java&apos;, name: &apos;Java&apos;
@@ -35,6 +35,7 @@
3535
spotBugs(pattern: &apos;target/spotbugsXml.xml&apos;),
3636
pmdParser(pattern: &apos;target/**/pmd.xml&apos;),
3737
cpd(pattern: &apos;target/**/cpd.xml&apos;),
38+
owaspDependencyCheck(pattern: &apos;**/target/dependency-check-report.json&apos;),
3839
taskScanner(highTags:&apos;FIXME&apos;, normalTags:&apos;TODO&apos;, includePattern: &apos;**/*.java&apos;, excludePattern: &apos;target/**/*&apos;)],
3940
qualityGates: [[threshold: 1, type: &apos;TOTAL&apos;, unstable: true]]
4041
}
@@ -135,4 +136,4 @@
135136
</definition>
136137
<triggers/>
137138
<disabled>false</disabled>
138-
</flow-definition>
139+
</flow-definition>

0 commit comments

Comments
 (0)