X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=tasks%2Fdeploy.yml;h=ca1e54ae2adaf67605d8e560b03abdc7f2bc5b0e;hb=b1536bd484c818e8b3e26c271d35306882ef9956;hp=dc00b78448dd0a6f461e93a304ddace006ddc771;hpb=fee73e812e656d2214f92396df2f6044b341d7b7;p=github%2Ffretlink%2Fansible-clever.git

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index dc00b78..ca1e54a 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: "{{ ansible_env.HOME }}/{{ clever_user_path }}clever-set-drain.sh"
+  command: "{{ ansible_env.HOME }}/{{ clever_user_path }}/clever-set-drain.sh"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
@@ -16,43 +16,21 @@
     DOMAIN: "{{ clever_domain | default(domain) }}"
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
-- name: Push Environment
-  shell: "clever env import < {{ clever_app_confdir }}/env"
+- name: Configure Build Instance
+  when: clever_build_flavor is defined
+  command: "clever scale --build-flavor {{ clever_build_flavor }}"
   args:
     chdir: "{{ clever_app_root }}"
   environment:
     CONFIGURATION_FILE: "{{ clever_login_file }}"
-  changed_when: false
-
-#TODO: Improve ssh-key validation
-- name: Accept Clever-Cloud servers
-  shell: "ssh-keyscan -H push-par-clevercloud-customers.services.clever-cloud.com >> ~/.ssh/known_hosts"
-  tags:
-    - skip_ansible_lint
 
-- name: Deploy to Clever-Cloud
-  shell: "clever deploy --force"
+- name: Push Environment
+  shell: "clever env import --json < {{ clever_app_confdir }}/env"
   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_deploy is failed
-    - clever_deploy.stderr is defined
-    - clever_deploy.stderr is search("Failed to read git object")
-  tags:
-    - skip_ansible_lint
+  changed_when: false
 
 - name: Deploy to Clever-Cloud
   shell: "clever deploy --force"
@@ -60,61 +38,44 @@
     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
+  async: 2400 # 40 minutes
+  poll: 0
   ignore_errors: true
+  register: clever_deploy
   tags:
     - skip_ansible_lint
 
-- 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: Wait up to 40 minutes for deployment completion
+  async_status:
+    jid: "{{ clever_deploy.ansible_job_id }}"
+  register: job_result
+  until: job_result.finished
+  ignore_errors: true
+  delay: 30
+  retries: 80 # 40 minutes (80 * 30 secs delay)
 
-- shell: clever activity
-  args:
-    chdir: "{{ clever_app_root }}"
-  environment:
-    CONFIGURATION_FILE: "{{ clever_login_file }}"
-  changed_when: false
-  register: clever_activity_result
+##################################################################
+# Re-deploy only if its the first clever deploy for that project #
+##################################################################
 
-- debug:
-    var: clever_activity_result.stdout_lines
+- name: Retry deploy to clever-cloud
+  include_tasks: redeploy.yml
+  when:
+    - not job_result.rc == 0
+    - job_result.stderr is defined
+    - job_result.stderr is search("Failed to read git object")
 
-- shell: git show -q --format=format:%H HEAD
-  args:
-    chdir: "{{ clever_app_root }}"
-  changed_when: false
-  register: current_commit_sha
+- name: Deploy logs (stdout)
+  debug:
+    var: job_result.stdout_lines
+  when: job_result.stdout_lines is defined
 
-# ####
-# 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: Deploy error logs (stderr)
+  debug:
+    var: job_result.stderr_lines
+  when: job_result.stderr_lines is defined
 
-- name: Fail on deployment errors
+- name: Fail in case of timeout or failure
   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")
+    msg: "Deployment failed. Please check logs above."
+  when: not job_result.finished or not job_result.rc == 0