Bring cdt-lsp Jenkins configuration up to date with CDT's one

eclipse-cdt · Feb 28, 2024 · dd7ef38 · dd7ef38
1 parent e45bfa7
commit dd7ef38
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git 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
@@ -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
@@ -20,8 +20,11 @@ spec:
       readOnly: true
     - name: m2-repo
       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:
@@ -30,9 +33,6 @@ spec:
       limits:
         memory: "512Mi"
         cpu: "500m"
-    volumeMounts:
-    - name: volume-known-hosts
-      mountPath: /home/jenkins/.ssh
   volumes:
   - name: settings-xml
     secret:
@@ -42,6 +42,8 @@ spec:
         path: settings.xml
   - name: m2-repo
     emptyDir: {}
-  - name: volume-known-hosts
-    configMap:
-      name: known-hosts
+  - name: "jenkins-home"
+    emptyDir: {}
+  - name: tools
+    persistentVolumeClaim:
+      claimName: tools-claim-jiro-cdt