diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-07-23 12:02:12 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-23 12:02:12 +0000 |
| commit | b38a1818bcfab24ae6f9f815f28959ffd11a4371 (patch) | |
| tree | fc58eb7afa5d1a4c7bd4c244b0b09af28c862181 /nixos/tests | |
| parent | f0365462869b14a3b4c188e5cd7f8caaa6702e03 (diff) | |
| parent | 6629a2339e11b8a63878361ead0583fb4359f886 (diff) | |
Merge staging-next into staging
Diffstat (limited to 'nixos/tests')
| -rw-r--r-- | nixos/tests/jenkins.nix | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nixos/tests/jenkins.nix b/nixos/tests/jenkins.nix index 63b5860f0d206..3f111426db388 100644 --- a/nixos/tests/jenkins.nix +++ b/nixos/tests/jenkins.nix @@ -81,7 +81,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { in '' start_all() - master.wait_for_unit("jenkins") + master.wait_for_unit("default.target") 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"): # 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/folder-1/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. - 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/folder-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") |