X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fdeploy.yml;h=81e2bb7eafc9db95efd510b5504ece6a9fdb21bd;hb=51b0de07287fc1e2e8f0d4dacfbb89f12a5ce6a9;hp=4b3f48b61077089db2e30f55c28312caf3378748;hpb=da999d16b410b3b6892c4ffa692c1a860d1e2781;p=github%2Ffretlink%2Fansible-clever.git

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 4b3f48b..81e2bb7 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -1,19 +1,25 @@
 - name: Configure Drain
-  when: syslog_server is defined
-  command: clever-set-drain.sh
+  when: syslog_server is defined or clever_syslog_server is defined
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-drain.sh"
+  args:
+    chdir: "{{ clever_app_root }}"
   environment:
-    SYSLOG_UDP_SERVER: "{{ syslog_server }}"
+    SYSLOG_UDP_SERVER: "{{ clever_syslog_server | default(syslog_server) }}"
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Configure Domain
-  when: domain is defined
-  command: clever-set-domain.sh
+  when: domain is defined or clever_domain is defined
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-domain.sh"
+  args:
+    chdir: "{{ clever_app_root }}"
   environment:
-    DOMAIN: "{{ domain }}"
+    DOMAIN: "{{ clever_domain | default(domain) }}"
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Push Environment
   shell: "clever env import < {{ clever_app_confdir }}/env"
+  args:
+    chdir: "{{ clever_app_root }}"
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
   changed_when: false
@@ -24,41 +30,95 @@
   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"
-  register: clever_git_push
+- name: Deploy to Clever-Cloud
+  shell: "clever deploy --force"
+  args:
+    chdir: "{{ clever_app_root }}"
+  environment:
+    CONFIGURATION_FILE: "{{ clever_login_file }}"
+  register: clever_deploy
+  async: 900 # 15 minutes timeout
+  poll: 30
   ignore_errors: true
   tags:
     - skip_ansible_lint
 
 - name: First time push to Clever-Cloud needs a full git clone
   command: "git fetch --unshallow"
+  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"
-  when: clever_git_push is failed
+- name: Deploy to Clever-Cloud
+  shell: "clever deploy --force"
+  args:
+    chdir: "{{ clever_app_root }}"
+  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
-  async: 900
-  poll: 0
-  register: long_command
+- 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 }}"
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
-  changed_when: False
+  changed_when: false
+  register: clever_activity_result
+
+- 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
 
-# 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
+# ####
+# 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")
+    - clever_activity_valid_deploy_keyword in clever_activity_result.stdout_lines[-1]
+    - current_commit_sha.stdout_lines[-1] in clever_activity_result.stdout_lines[-1]
+
+- name: Fail on 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")