Commit fdcd8b4f authored by Felix Singer's avatar Felix Singer
Browse files

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: default avatarFelix Singer <felixsinger@posteo.net>
parent 0e426ae9

nixos/modules/services/continuous-integration/jenkins/job-builder.nix

+1 −1
Original line number Diff line number Diff line
@@ -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

nixos/tests/jenkins-cli.nix

+1 −1
Original line number Diff line number Diff line
@@ -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)"

    )

  '';

}

nixos/tests/jenkins.nix

+2 −2
Original line number Diff line number Diff line
@@ -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}"

    '';

pkgs/by-name/je/jenkins/package.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 ];