diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/octopus/octopus.lisp | 17 | ||||
| -rw-r--r-- | lisp/service/octopus-qrs-lsrs-redeploy-service.lisp | 2 |
2 files changed, 17 insertions, 2 deletions
diff --git a/lisp/octopus/octopus.lisp b/lisp/octopus/octopus.lisp index c242d54..61302bf 100644 --- a/lisp/octopus/octopus.lisp +++ b/lisp/octopus/octopus.lisp @@ -71,6 +71,9 @@ (version-control-reference :initarg :version-control-reference :initform nil :accessor version-control-reference) + (channel-id :initarg :channel-id + :initform nil + :accessor channel-id) (project :initarg :project :initform nil :accessor project)) @@ -89,6 +92,9 @@ (environment :initarg :environment :initform nil :accessor environment) + (channel-id :initarg :channel-id + :initform nil + :accessor channel-id) (project :initarg :project :initform nil :accessor project) @@ -176,6 +182,9 @@ as an input filter are stored here for the ride through the queue.") (release-version :initarg :release-version :initform nil :accessor release-version) + (channel-id :initarg :channel-id + :initform nil + :accessor channel-id) (git-commit :initarg :git-commit :initform nil :accessor git-commit) @@ -298,6 +307,7 @@ as an input filter are stored here for the ride through the queue.") :id (cdr (assoc :*id release)) :version (cdr (assoc :*version release)) :version-control-reference (cdr (assoc :*version-control-reference release)) + :channel-id (cdr (assoc :*channel-id release)) :project project)) (lambda (x y) (string< (version x) (version y))))) @@ -341,6 +351,7 @@ as an input filter are stored here for the ride through the queue.") :id (cdr (assoc :*id deployment)) :task-id (cdr (assoc :*task-id deployment)) :environment (environment octopus-deploy-release) + :channel-id (cdr (assoc :*channel-id deployment)) :project (project octopus-deploy-release) :release (release octopus-deploy-release))))) @@ -411,7 +422,9 @@ as an input filter are stored here for the ride through the queue.") (defmethod do-octopus-deploy-release ((octopus-deploy-release octopus-deploy-release)) (let* ((project (get-octopus-project octopus-deploy-release (project-name octopus-deploy-release))) (release (get-octopus-release octopus-deploy-release project (version octopus-deploy-release))) - (environment (car (get-octopus-environments octopus-deploy-release :environment-filter `(,(environment-name octopus-deploy-release)))))) + (environment (car (remove-if-not (lambda (x) + (string= (name x) (environment-name octopus-deploy-release))) + (get-octopus-environments octopus-deploy-release :environment-filter `(,(environment-name octopus-deploy-release))))))) (do-octopus-enqueue-deploy-release (make-instance 'octopus-deploy-release :project-name (project-name octopus-deploy-release) :version (version octopus-deploy-release) @@ -457,6 +470,7 @@ as an input filter are stored here for the ride through the queue.") :id (cdr (assoc :*id deployment)) :task-id (cdr (assoc :*task-id deployment)) :release-version (cdr (assoc :*release-version deployment)) + :channel-id (cdr (assoc :*channel-id deployment)) :completed-time (local-time:to-rfc3339-timestring (local-time:parse-timestring (cdr (assoc :*completed-time deployment)))) :environment environment :project project)) @@ -479,6 +493,7 @@ as an input filter are stored here for the ride through the queue.") :deployment-id (id deployment) :task-id (task-id deployment) :release-version (release-version deployment) + :channel-id (channel-id deployment) :git-commit (cdr (assoc :*git-commit (version-control-reference (release deployment)))) :completed-time (completed-time deployment) :environment-name (name (environment deployment)) diff --git a/lisp/service/octopus-qrs-lsrs-redeploy-service.lisp b/lisp/service/octopus-qrs-lsrs-redeploy-service.lisp index a2d4a18..4796754 100644 --- a/lisp/service/octopus-qrs-lsrs-redeploy-service.lisp +++ b/lisp/service/octopus-qrs-lsrs-redeploy-service.lisp @@ -67,6 +67,6 @@ do (do-octopus-deploy-release (make-instance 'octopus-deploy-release :project-name (project-name deployment) :version (release-version deployment) - :environment-name (session-value :octopus-environment) + :environment-name (environment-name deployment) :stdout (pathname f))) (setf (stdout instance) (uiop:native-namestring (pathname f))))))) |