nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 15:03:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

nixos/jenkins-job-builder: set serviceConfig.Type = "oneshot"

Browse Source 
This change allows detecting configuration errors during
switch-to-configuration instead of them being reported asynchronously
*after* switch-to-configuration has exited.

(And update the NixOS test accordingly.)
This commit is contained in:
Bjørn Forsman 2022-07-18 10:17:40 +02:00
parent 57d8154c4e
commit 16108ff74a
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -243,6 +243,7 @@ in {
done done
'' + (if cfg.accessUser != "" then reloadScript else ""); '' + (if cfg.accessUser != "" then reloadScript else "");
serviceConfig = { serviceConfig = {
Type = "oneshot";
User = jenkinsCfg.user; User = jenkinsCfg.user;
RuntimeDirectory = "jenkins-job-builder"; RuntimeDirectory = "jenkins-job-builder";
}; };

6
nixos/tests/jenkins.nix
View File

@ -81,7 +81,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
in '' in ''
start_all() start_all()
master.wait_for_unit("jenkins") master.wait_for_unit("default.target")
assert "Authentication required" in master.succeed("curl http://localhost:8080") assert "Authentication required" in master.succeed("curl http://localhost:8080")
@ -96,8 +96,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
with subtest("jobs are declarative"): with subtest("jobs are declarative"):
# Check that jobs are created on disk. # Check that jobs are created on disk.
master.wait_for_unit("jenkins-job-builder")
master.wait_until_fails("systemctl is-active jenkins-job-builder")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/job-1/config.xml")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml")
master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml")
@ -115,8 +113,6 @@ import ./make-test-python.nix ({ pkgs, ...} : {
) )
# Check that jobs are removed from disk. # Check that jobs are removed from disk.
master.wait_for_unit("jenkins-job-builder")
master.wait_until_fails("systemctl is-active jenkins-job-builder")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/job-1/config.xml")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml")
master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml")