From fdcd8b4f044e21220a2466867124f3655f51b3a9 Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Wed, 18 Mar 2026 15:59:08 +0100 Subject: [PATCH] jenkins: 2.541.2 -> 2.541.3 jenkins-cli requires the -http parameter now, otherwise it fails to connect to Jenkins and the tests fail. https://www.jenkins.io/changelog-stable/#v2.541.3 Signed-off-by: Felix Singer --- .../services/continuous-integration/jenkins/job-builder.nix | 2 +- nixos/tests/jenkins-cli.nix | 2 +- nixos/tests/jenkins.nix | 4 ++-- pkgs/by-name/je/jenkins/package.nix | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 12c1c886c633..42b51226499f 100644 --- a/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -175,7 +175,7 @@ in (umask 0077; printf "${cfg.accessUser}:@password_placeholder@" >"$auth_file") "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "$access_token_file" "$auth_file" - if ! "${pkgs.jenkins}/bin/jenkins-cli" -s "$jenkins_url" -auth "@$auth_file" reload-configuration; then + if ! "${pkgs.jenkins}/bin/jenkins-cli" -http -s "$jenkins_url" -auth "@$auth_file" reload-configuration; then echo "error: failed to reload configuration" exit 1 fi diff --git a/nixos/tests/jenkins-cli.nix b/nixos/tests/jenkins-cli.nix index fd1801eaef25..f50e10202abd 100644 --- a/nixos/tests/jenkins-cli.nix +++ b/nixos/tests/jenkins-cli.nix @@ -25,7 +25,7 @@ assert "http://0.0.0.0:8080" in machine.succeed("echo $JENKINS_URL") machine.succeed( - "jenkins-cli -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword)" + "jenkins-cli -http -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword)" ) ''; } diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 11ed68e7f7f5..08633a35d85c 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -118,7 +118,7 @@ master.wait_until_succeeds("test -f ${jenkinsHome}/jobs/folder-1/jobs/job-2/config.xml") # Verify that jenkins also sees the jobs. - out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat ${jenkinsHome}/secrets/initialAdminPassword) list-jobs") + out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -http -s ${jenkinsUrl} -auth admin:$(cat ${jenkinsHome}/secrets/initialAdminPassword) list-jobs") jobs = [x.strip() for x in out.splitlines()] # Seeing jobs inside folders requires the Folders plugin # (https://plugins.jenkins.io/cloudbees-folder/), which we don't have @@ -135,7 +135,7 @@ master.wait_until_fails("test -f ${jenkinsHome}/jobs/folder-1/jobs/job-2/config.xml") # Verify that jenkins also sees the jobs as removed. - out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat ${jenkinsHome}/secrets/initialAdminPassword) list-jobs") + out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -http -s ${jenkinsUrl} -auth admin:$(cat ${jenkinsHome}/secrets/initialAdminPassword) list-jobs") jobs = [x.strip() for x in out.splitlines()] assert jobs == [], f"jobs != []: {jobs}" ''; diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index cc23ed10c282..191a07ec7995 100644 --- a/pkgs/by-name/je/jenkins/package.nix +++ b/pkgs/by-name/je/jenkins/package.nix @@ -18,11 +18,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "jenkins"; - version = "2.541.2"; + version = "2.541.3"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-3J1TLlTUt+t9eO3NMheHbdSBG0nRo7ZuWZrUpkLVcZM="; + hash = "sha256-AACt36hyKWMWQTek4OYKvCJ9nWBxDE3rGUgfmnUc9RI="; }; nativeBuildInputs = [ makeWrapper ];