diff --git a/Jenkinsfile b/Jenkinsfile index d5c986ba..d4789663 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -28,7 +28,7 @@ pipeline { export PATH=$PWD/clangd_15.0.6/bin:$PATH which clangd clangd --version - /usr/share/maven/bin/mvn \ + /jipp/tools/apache-maven/latest/bin/mvn \ clean verify -B -V -X -e \ -Dmaven.test.failure.ignore=true \ -P production \ diff --git a/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml b/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml index ad0290b3..f463e472 100644 --- a/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml +++ b/jenkins/pod-templates/cdt-full-pod-plus-eclipse-install.yaml @@ -8,10 +8,10 @@ spec: args: ["/bin/sh", "-c", "/home/vnc/.vnc/xstartup.sh && cat"] resources: requests: - memory: "2662Mi" + memory: "10000Mi" cpu: "1" limits: - memory: "2662Mi" + memory: "10000Mi" cpu: "1" volumeMounts: - name: settings-xml @@ -22,6 +22,11 @@ spec: mountPath: /home/jenkins/.m2/repository - name: volume-known-hosts mountPath: /home/jenkins/.ssh + - name: "jenkins-home" + mountPath: "/home/jenkins" + readOnly: false + - name: tools + mountPath: /jipp/tools - name: jnlp resources: requests: @@ -45,3 +50,8 @@ spec: - name: volume-known-hosts configMap: name: known-hosts + - name: "jenkins-home" + emptyDir: {} + - name: tools + persistentVolumeClaim: + claimName: tools-claim-jiro-cdt