From fcf2833ecef7aa2a472b35793e5c38885702fe4f Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Mon, 23 Oct 2023 16:17:42 -0500 Subject: [PATCH 01/14] Fix build issues https://forum.snapcraft.io/t/jenkins-snaps-not-building/37368/3 --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b080234..e9bdd52 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -55,4 +55,4 @@ parts: prime: - jenkins-config - launch - + - -usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs From f55caeaa35ea0d238a2ee818a19c7dd783bb7374 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Mon, 23 Oct 2023 16:55:55 -0500 Subject: [PATCH 02/14] smh I failed to ensure that the right java package was referenced in prime...ugh. --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e9bdd52..eaa1ca3 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -55,4 +55,4 @@ parts: prime: - jenkins-config - launch - - -usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs + - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs From 1173023e07f2a528e4edb8bcf7fc6291cb9701a1 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Mon, 23 Oct 2023 21:13:57 -0500 Subject: [PATCH 03/14] Update test-snap-can-build.yml Implementing test builds on `testing` branch. Makes far more sense. --- .github/workflows/test-snap-can-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml index f4b326e..4228e6c 100644 --- a/.github/workflows/test-snap-can-build.yml +++ b/.github/workflows/test-snap-can-build.yml @@ -2,9 +2,9 @@ name: 🧪 Test snap can be built on x86_64 on: push: - branches: [ master ] + branches: [ testing ] pull_request: - branches: [ master ] + branches: [ testing ] jobs: build: From c9c7b679967aa16d581e356dd68e417613340c8f Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Mon, 23 Oct 2023 21:26:38 -0500 Subject: [PATCH 04/14] Update snapcraft.yaml --- snap/snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e15f22d..c28cfc4 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -55,4 +55,5 @@ parts: prime: - jenkins-config - launch - - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs \ No newline at end of file + - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs + - -usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs From 0a9bf6925fddcd6967d29347f8de03021bd9b8c1 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Thu, 26 Oct 2023 17:53:19 -0500 Subject: [PATCH 05/14] Update snapcraft.yaml Just in case there were any more errors from snapcraft.io. --- snap/snapcraft.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e15f22d..c28cfc4 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -55,4 +55,5 @@ parts: prime: - jenkins-config - launch - - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs \ No newline at end of file + - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs + - -usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs From 6704451d240c9c42024092e787db05ca56b67daa Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Thu, 26 Oct 2023 18:00:21 -0500 Subject: [PATCH 06/14] Update snapcraft.yaml last commit no good. --- snap/snapcraft.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index c28cfc4..f322131 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -56,4 +56,3 @@ parts: - 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 From a2e4c608bbbbd3d56496628e8868872e6cdbdc61 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 31 Oct 2023 13:42:22 -0500 Subject: [PATCH 07/14] Maybe? --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index e621cea..9362af6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ 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 From 15c9a560bca02d202ead56ebec12d2d7a931dc54 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 31 Oct 2023 13:59:54 -0500 Subject: [PATCH 08/14] Core22 commit Included naming conventions, as build seemed to work in commit: https://github.com/kz6fittycent/jenkins/commit/a2e4c608bbbbd3d56496628e8868872e6cdbdc61 --- snap/snapcraft.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9362af6..b155bb5 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -38,16 +38,16 @@ parts: - ca-certificates-java override-pull: | - snapcraftctl pull - snapcraftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f2)" + craftctl pull + craftctl 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 + mv $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk-* $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk + rm $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts + cp /etc/ssl/certs/java/cacerts $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts + cp /etc/ssl/certs/java/cacerts $CRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts + mv jenkins.war $CRAFT_PART_INSTALL config: plugin: dump From 3a6df72488700d0d3971d35e3e6f4ca7fb068449 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 31 Oct 2023 14:10:13 -0500 Subject: [PATCH 09/14] Update snapcraft.yaml apparently the new naming convention isn't working. Reverted to older one from core20. --- snap/snapcraft.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index b155bb5..9362af6 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -38,16 +38,16 @@ parts: - ca-certificates-java override-pull: | - craftctl pull - craftctl set-version "$(git describe --tags | sed 's/^v//' | cut -d "-" -f2)" + 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 $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk-* $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk - rm $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts - cp /etc/ssl/certs/java/cacerts $CRAFT_PART_INSTALL/usr/lib/jvm/java-17-openjdk/lib/security/cacerts - cp /etc/ssl/certs/java/cacerts $CRAFT_PART_INSTALL/etc/ssl/certs/java/cacerts - mv jenkins.war $CRAFT_PART_INSTALL + 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 From 86837ce8fa079eea15d28eafc22761759be8978c Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Mon, 13 Nov 2023 15:03:17 -0600 Subject: [PATCH 10/14] Update test-snap-can-build.yml --- .github/workflows/test-snap-can-build.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-snap-can-build.yml b/.github/workflows/test-snap-can-build.yml index 4228e6c..f4b326e 100644 --- a/.github/workflows/test-snap-can-build.yml +++ b/.github/workflows/test-snap-can-build.yml @@ -2,9 +2,9 @@ name: 🧪 Test snap can be built on x86_64 on: push: - branches: [ testing ] + branches: [ master ] pull_request: - branches: [ testing ] + branches: [ master ] jobs: build: From f04780a1a6dd064eb07a7046f389da912b5034e8 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 14 Nov 2023 17:07:44 -0600 Subject: [PATCH 11/14] Cleanup added to remove blacklisted certs Added cleanup section - used in mc-installer. I'm at a loss after this. The failed tests seem to be hit/miss and that makes no sense to me. Whatever, here we go! --- snap/snapcraft.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9362af6..de54fe8 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -58,3 +58,14 @@ parts: - -usr/lib/jvm/java-17-openjdk-amd64/lib/security/blacklisted.certs - -usr/lib/jvm/java-11-openjdk-amd64/lib/security/blacklisted.certs + 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 From 17a484e3865d4bc3c01f5ac42b0ed38fde10def0 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Tue, 14 Nov 2023 17:21:28 -0600 Subject: [PATCH 12/14] This is getting really, really old I'm reverting back to core20 since the testing branch is working as expected, and no failures. If this doesn't work, I am done and closing the PR. --- snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index de54fe8..8712589 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: jenkins summary: Jenkins automation server -base: core22 +base: core20 description: | Jenkins is the leading open-source automation server. Built with Java, it provides over 1000 plugins to support automating virtually anything, so that @@ -63,9 +63,9 @@ parts: - jenkins plugin: nil build-snaps: - - core22 + - core20 override-prime: | set -eux - for snap in "core22"; do # List all content-snaps and base snaps you're using here + for snap in "core20"; 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 From fe71cdb6c3fa4a47334f7842309499f7643f8e4f Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Wed, 15 Nov 2023 08:29:26 -0600 Subject: [PATCH 13/14] Updated license in yaml license: MIT --- snap/snapcraft.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 8712589..57e6a28 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -7,7 +7,7 @@ description: | humans can actually spend their time doing things machines cannot. adopt-info: jenkins - +license: MIT confinement: classic grade: stable From 97fc9b4af2e30276d7cf788efa46628ec15f0680 Mon Sep 17 00:00:00 2001 From: kz6fittycent Date: Wed, 15 Nov 2023 08:40:43 -0600 Subject: [PATCH 14/14] Core22 Test builds are failing randomly. I am not certain the checks are legitimate. If it's failing on nearly 50%, what does that say about the 50% that are passing? I'm done troubleshooting it. --- snap/snapcraft.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 57e6a28..8c82f0f 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ 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 @@ -63,9 +63,9 @@ parts: - jenkins plugin: nil build-snaps: - - core20 + - core22 override-prime: | set -eux - for snap in "core20"; do # List all content-snaps and base snaps you're using here + 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