Skip to content

Commit

Permalink
Fixed Jenkins state analysis in src/steps/jenkins-install.lisp
Browse files Browse the repository at this point in the history
* src/steps/jenkins-install.lisp (jenkins-directory-state): don't fail
  for an installation that has been started exactly once
  (define-step jenkins/create-user): fixed expected state stopped ->
  :stopped
  • Loading branch information
scymtym committed Mar 6, 2019
1 parent 4ed962b commit 6515082
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/steps/jenkins-install.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
:not-present)
((and (not queue?) (not queue-backup?))
:fresh)
((and queue? queue-backup?)
(queue?
:stopped)
((and queue-backup? (not queue?))
((and (not queue?) queue-backup?)
:running))))

(defun ensure-jenkins-directory-state (expected directory)
Expand Down Expand Up @@ -237,7 +237,7 @@
(config-file-template *jenkins-user-config-file-template*)
username email password)
"Create a user in an existing Jenkins installation."
(ensure-jenkins-directory-state '(:fresh stopped) destination-directory)
(ensure-jenkins-directory-state '(:fresh :stopped) destination-directory)
(with-trivial-progress (:install/user "~A" username)
(let ((destination-file (jenkins-user-configuration-file
username destination-directory))
Expand Down

0 comments on commit 6515082

Please sign in to comment.