Skip to content

Commit

Permalink
Revert "[I/Y/P-Builds] Restore mount of toolchains.xml in K8 pod
Browse files Browse the repository at this point in the history
definitions"

This reverts commit 8d1b61a.

The yaml merge strategy for pod templates was changed to 'merge' for all
volumes/volumeMounts in:
eclipse-cbi/jiro#377

Now they are all inherited from the pod-template.
  • Loading branch information
HannesWell committed Jun 26, 2024
1 parent 63478e2 commit 90a8971
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 36 deletions.
12 changes: 0 additions & 12 deletions JenkinsJobs/Builds/I_build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -69,18 +69,6 @@ spec:
requests:
memory: "6144Mi"
cpu: "2000m"
volumeMounts:
- mountPath: "/home/jenkins/.m2/toolchains.xml"
name: "toolchains-xml"
readOnly: true
subPath: "toolchains.xml"
volumes:
- configMap:
items:
- key: "toolchains.xml"
path: "toolchains.xml"
name: "m2-dir"
name: "toolchains-xml"
"""
}
}
Expand Down
12 changes: 0 additions & 12 deletions JenkinsJobs/YBuilds/P_build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -46,18 +46,6 @@ spec:
requests:
memory: "6144Mi"
cpu: "2000m"
volumeMounts:
- mountPath: "/home/jenkins/.m2/toolchains.xml"
name: "toolchains-xml"
readOnly: true
subPath: "toolchains.xml"
volumes:
- configMap:
items:
- key: "toolchains.xml"
path: "toolchains.xml"
name: "m2-dir"
name: "toolchains-xml"
"""
}
}
Expand Down
12 changes: 0 additions & 12 deletions JenkinsJobs/YBuilds/Y_build.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,6 @@ spec:
requests:
memory: "6144Mi"
cpu: "2000m"
volumeMounts:
- mountPath: "/home/jenkins/.m2/toolchains.xml"
name: "toolchains-xml"
readOnly: true
subPath: "toolchains.xml"
volumes:
- configMap:
items:
- key: "toolchains.xml"
path: "toolchains.xml"
name: "m2-dir"
name: "toolchains-xml"
"""
}
}
Expand Down

0 comments on commit 90a8971

Please sign in to comment.