Merge pull request #37 from kz6fittycent/master

Snap not building - fixed issue
snapcrafters · Nov 25, 2023 · b98436d · b98436d
2 parents 9e7bab9 + 97fc9b4
commit b98436d
Showing 1 changed file with 46 additions and 31 deletions.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -1,13 +1,13 @@
 name: jenkins
 summary: Jenkins automation server
-base: core20
+base: core22
 description: |
   Jenkins is the leading open-source automation server. Built with Java, it
   provides over 1000 plugins to support automating virtually anything, so that
   humans can actually spend their time doing things machines cannot.
 
 adopt-info: jenkins
-
+license: MIT
 confinement: classic
 grade: stable
 
@@ -24,33 +24,48 @@ apps:
     command: jenkins-config
 
 parts:
-  jenkins:
-    plugin: nil
-    source: https://github.com/jenkinsci/jenkins.git # in lieu of the BGI trigger which didn't seem to work
-    stage-packages:
-      - fonts-dejavu-core
-      - libfontconfig1
-      - openjdk-17-jre-headless
-      - ca-certificates-java
-    build-packages:
-      - curl
-      - libnss3
-      - ca-certificates-java
-
-    override-pull: |
-      snapcraftctl pull
-      snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f2)"
+    jenkins:
+        plugin: nil
+        source: https://github.com/jenkinsci/jenkins.git # in lieu of the BGI trigger which didn't seem to work
+        stage-packages:
+            - fonts-dejavu-core
+            - libfontconfig1
+            - openjdk-17-jre-headless
+            - ca-certificates-java
+        build-packages:
+            - curl
+            - libnss3
+            - ca-certificates-java
+
+        override-pull: |
+          snapcraftctl pull
+          snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f2)"
+        
+        override-build: |
+            curl -sLO http://mirrors.jenkins.io/war/latest/jenkins.war
+            mv $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk-* $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk
+            rm $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
+            cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
+            cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts
+            mv jenkins.war $SNAPCRAFT_PART_INSTALL
+                       
+    config:
+        plugin: dump
+        source: snap/local
+        prime:
+            - jenkins-config
+            - launch
+            - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs
+            - -usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs
 
-    override-build: |
-      curl -sLO http://mirrors.jenkins.io/war/latest/jenkins.war
-      mv $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk-* $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk
-      rm $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
-      cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts
-      cp /etc/ssl/certs/java/cacerts $SNAPCRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts
-      mv jenkins.war $SNAPCRAFT_PART_INSTALL
-  config:
-    plugin: dump
-    source: snap/local
-    prime:
-      - jenkins-config
-      - launch
+    cleanup:
+      after: 
+        - jenkins
+      plugin: nil
+      build-snaps: 
+        - core22
+      override-prime: |
+        set -eux
+        for snap in "core22"; do  # List all content-snaps and base snaps you're using here
+          cd "/snap/$snap/current" && find . -type f,l -exec rm -f "$SNAPCRAFT_PRIME/{}" \;
+        done