X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fdeploy.yml;h=74232a627547d8a4ec0ca8eef396a580df337e28;hb=65bc951fa5da2499e50d0de72ed4fd43ac5ea0c8;hp=ae7e5f6471320cda444623e836f3daf6423d94b8;hpb=e1ffebc7abc311393dfca85495a5c90ffe6dad04;p=github%2Ffretlink%2Fansible-clever.git

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index ae7e5f6..74232a6 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -1,6 +1,6 @@
 - name: Configure Drain
   when: syslog_server is defined or clever_syslog_server is defined
-  command: clever-set-drain.sh
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-drain.sh"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
@@ -9,7 +9,7 @@
 
 - name: Configure Domain
   when: domain is defined or clever_domain is defined
-  command: clever-set-domain.sh
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-domain.sh"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
@@ -30,11 +30,15 @@
   tags:
     - skip_ansible_lint
 
-- name: Push to Clever-Cloud to trigger deployment
-  command: "git push --force git+ssh://git@push-par-clevercloud-customers.services.clever-cloud.com/{{ clever_app }}.git HEAD:refs/heads/master"
+- name: Deploy to Clever-Cloud
+  shell: "clever deploy --force"
   args:
     chdir: "{{ clever_app_root }}"
-  register: clever_git_push
+  environment:
+    CONFIGURATION_FILE: "{{ clever_login_file }}"
+  register: clever_deploy
+  async: 900 # 15 minutes timeout
+  poll: 30
   ignore_errors: true
   tags:
     - skip_ansible_lint
@@ -44,35 +48,79 @@
   args:
     chdir: "{{ clever_app_root }}"
   when:
-    - clever_git_push is failed
-    - clever_git_push.stderr is search("shallow update not allowed")
+    - clever_deploy is failed
+    - clever_deploy.stderr is defined
+    - clever_deploy.stderr is search("Failed to read git object")
   tags:
     - skip_ansible_lint
 
-- name: Push to Clever-Cloud to trigger deployment
-  command: "git push --force git+ssh://git@push-par-clevercloud-customers.services.clever-cloud.com/{{ clever_app }}.git HEAD:refs/heads/master"
+- name: Deploy to Clever-Cloud
+  shell: "clever deploy --force"
   args:
     chdir: "{{ clever_app_root }}"
-  when: clever_git_push is failed
+  environment:
+    CONFIGURATION_FILE: "{{ clever_login_file }}"
+  when: clever_deploy is failed
+  register: clever_deploy
+  async: 900 # 15 minutes timeout
+  poll: 30
+  ignore_errors: true
   tags:
     - skip_ansible_lint
 
-- name: Watch deployment status
-  command: "clever-wait-deploy.sh"
+- name: Return deployment logs
+  debug:
+    var: clever_deploy.stdout
+  when: clever_deploy.stdout is defined
+
+- name: Return deployment errors
+  debug:
+    var: clever_deploy.stderr
+  when:
+    - clever_deploy is failed
+    - clever_deploy.stderr is defined
+
+- name: Retrieve clever activity
+  command: clever activity
   args:
     chdir: "{{ clever_app_root }}"
-  async: 900
-  poll: 0
-  register: long_command
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
-  changed_when: False
+  changed_when: false
+  register: clever_activity_result
 
-# Waits up to 15 minutes
-- name: Wait for deployment completion
-  async_status:
-    jid: "{{ long_command.ansible_job_id }}"
-  register: job_result
-  until: job_result.finished
-  delay: 30
-  retries: 30
+- name: Display clever activity
+  debug:
+    var: clever_activity_result.stdout_lines
+
+- name: Get current commit sha
+  command: git show -q --format=format:%H HEAD
+  args:
+    chdir: "{{ clever_app_root }}"
+    warn: False
+  changed_when: false
+  register: current_commit_sha
+
+# ####
+# Expects all configuration to be located in the project's repository.
+# Making a git commit bound to the same *configuration* and *executable* version.
+# ##
+- name: Fail if current commit is not the last deployed one
+  fail:
+    msg: "The clever deployment failed! Please check latest deploy activity logs above."
+  when:
+    - clever_deploy is failed
+    - clever_deploy.stderr is defined
+    - clever_deploy.stderr is search("application is up-to-date")
+    - |
+      (current_commit_sha.stdout_lines[-1] not in clever_activity_result.stdout_lines[-1])
+      or
+      (clever_activity_valid_deploy_keyword not in clever_activity_result.stdout_lines[-1])
+
+- name: Fail on any other deployment errors
+  fail:
+    msg: "The clever deployment failed! Please check logs above."
+  when:
+    - clever_deploy is failed
+    - clever_deploy.stderr is defined
+    - clever_deploy.stderr is not search("application is up-to-date")