Merge pull request #177 from idealista/hotfix/175

#175 add error handling in deploy playbook

Author: antonioarenzanapulido

.travis.yml

@@ -11,46 +11,58 @@ env:
   global:
   - PY_COLOR=1
   - ANSIBLE_FORCE_COLOR=1
-  - secure: HtmIvdq+Yf0Iu88HYzl90Cg2+aFgp5lga+HQNTALEI5XTlB+m2p/QkR3nIsFeCmpSQrRJJuLD9f7XYaLMeEbbsDbj4KkmDMa4EzpLq2EN50ljPnCbvEGs9sw3QywJwA7loeQlujQ94d3FFb6uqO88cIHAw3/wR7Uhn2GBCRlFID8oQYaUnIdU20NsZX2UAqO+5VMzJCPJJcOKQoOuphZCucqgnvZ2b+Ap7xBlA8BnbMDbpcHd49GSfLACNBSh1FahiIfV5st8WZwiNnjGTm7bbinPmKvg3rTCBg9xO4u6ioBs9bQyODAAH+N2IZHsQ3Fenle3voSyJ5e+MYHEQTemc0evuQV7Ur8Rzz6rQ1uF3UunooxyszU6xg84MfFHHX5tv/xUb+WcFuITFRZvlOqXzNEYOD2etqWz13/9RSmfeSWihmJicAlKrn5eJOhvp7/ylcN2z5WHWV+3n7awZEhTcMRWCtDkXZ4ni7LpInGsD0P70iyyWleawJX9+vWiBEhWbD/HB8NREDWKDBQ8udB3x0nzsuGidgBR6j/ck+CjYn3OCy33v05cCJtf0YGItjdKvdK2GDmrGoNdfvYoc22GC2sMfsWlAkv715j/CnqGU/1d7Tf+jC9kPsF8T5SvImWMIhYo/XKgRL/InQSOmUq7659z3lQ2eKBKTDtNX1pSAk=
-  - secure: iDwnM7B1yrglkhI8eb5FpJZLn7siOaAcRSRN2gJYc+e3aWb4Wr2s5Fbs2Y7MOuziub+CDD9l1PREOqzuEnaSjwz20o7eauD/msedZdDJFGxSxIdBModPqqD9GMZgC8z2iP+erlFERhL+jSZmeArEX40zR1ZYzPO58DlwNb5J4+w+JD76gY1FxWLS2tPl6nvhqtFh0gWLZwzJB9sdnlxfXCLOcvdYt+5izHaWpGLlmWKPFvHu6knN2fvBeDyglfLRvTkEsQ9U2ROixoOoz4cQY1e/rJhrMBMfVkpBCb8ps+RdcTN3zvGE3rF2T/o6OGQa4HyrmH1QP7nhW6KFssaW3+938LBPHnICuFOEovfrdnopqiupkS05j0Ee0pf9XPc8n+dqN+rG+BtKjieSLlvfoDuQTiUUSqCFw4y74OVt9ZjoUWODo9Mv2iwM5r11+WS2Zbb+H5NSszxuI1QQ70tH8IbDp9oBDab9VJwg6edrga+KmWFkH+KUmXaLv/W8i3oqFOd/nLiqayJRIWOn/h1PWjfSUBGpYdrDmRg203p3nUfb9yjPNRbM+IcpBwNgW+Nb3oSSEyiiLQyaZ6AOHDxHRB5LR5wyNi/w3v7qj07v/lRChHwbH7bO0Eubxv0utyLIOiOiEdxlGoINQx0qqareQxBBocm4P5HaL5z5ewlTH/g=
-  - secure: cKmHo2WLSiXZJCllKUGyWpgs5OkxCqE3stnDH9GnPYvIRWBNexrJj+Ye2OXFWfKHcLH07SAgsWai+N0S+rcOg9qu6CAiVLg9TGitZjXfacSKvJK4JFkpqouimDSHP0mFokcDGm74GwU3PZb3jR0Rb89AFb78CTfTIPye0hP/E72xZCF+YekPZCJw7IoqR2zTZSSBgHwpMv5HbyKM1zWK/P3zUCnOFfxE3ygLKbGsc1DTHFDZo2scVI2nUP/PlP4T0uqkEf/7Jnm0FJGr10IltT0G0zC7OP1zr9kCsyLZkkjWldPd6YHIuCBxj6Swe81AVZHqjJFKp6auNivl8XZKeTOyV4kRjjz+hkPRKQSMq1LuOUSQk3OL75CI40doOGeppVQXE/BAp4ADAsHrbUGWEE6n7Hh/MifrXDY4TU9FksVHhOQIemyYs8W89H9EyNxErr9YpzuP8a2VqAIwO7v4zuxB2M1wephKs6ZEdcloaJ0rqowB0++Ee7oAWTssYG9YVZPasl005KQLUGN29KpNW7vC+49jERkRN30oGrW009lvf0g2rnvSxrbcdE47Hh+uCD0riopLtZYWaRdq+kgkqVgXDMgEyqOp5R1EHGFLQarOr5Q1mlVc30s+cIHB/kolw8Ik04d3LFhPJUc7BFSMNpTvTpIkw2sMFS/efH4XHlM=
   jobs:
   - DOCKER_IMAGE_BASE=debian:stretch-slim DOCKER_TAG_TO_PUBLISH=8-stretch-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 JDK_VERSION=8u322-b06-1~deb9u1 DOCKER_TAG_TO_PUBLISH=8u322-stretch-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=11 JDK_VERSION=11.0.6+10-1~bpo9+1 DOCKER_TAG_TO_PUBLISH=11.0.6-stretch-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=8 JDK_VERSION=8u322-b06-1~deb9u1
+    DOCKER_TAG_TO_PUBLISH=8u322-stretch-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:stretch-slim JDK_MAJOR=11 JDK_VERSION=11.0.6+10-1~bpo9+1
+    DOCKER_TAG_TO_PUBLISH=11.0.6-stretch-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:buster-slim DOCKER_TAG_TO_PUBLISH=11-buster-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VERSION=11.0.14+9-1~deb10u1 DOCKER_TAG_TO_PUBLISH=11.0.14-buster-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_MAJOR=11 JDK_VERSION=11.0.14+9-1~deb10u1
+    DOCKER_TAG_TO_PUBLISH=11.0.14-buster-openjdk-headless
   - DOCKER_IMAGE_BASE=debian:bullseye-slim DOCKER_TAG_TO_PUBLISH=11-bullseye-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=11 JDK_VERSION=11.0.14+9-1~deb11u1 DOCKER_TAG_TO_PUBLISH=11.0.14-bullseye-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_MAJOR=11 JDK_VERSION=11.0.14+9-1~deb11u1
+    DOCKER_TAG_TO_PUBLISH=11.0.14-bullseye-openjdk-headless
   - DOCKER_IMAGE_BASE=ubuntu:xenial DOCKER_TAG_TO_PUBLISH=9-xenial-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:xenial JDK_MAJOR=8 JDK_VERSION=8u292-b10-0ubuntu1~16.04.1 DOCKER_TAG_TO_PUBLISH=8u292-xenial-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:xenial JDK_MAJOR=8 JDK_VERSION=8u292-b10-0ubuntu1~16.04.1
+    DOCKER_TAG_TO_PUBLISH=8u292-xenial-openjdk-headless
   - DOCKER_IMAGE_BASE=ubuntu:xenial JDK_MAJOR=9 JDK_VERSION=9~b114-0ubuntu1 DOCKER_TAG_TO_PUBLISH=9b114-xenial-openjdk-headless
   - DOCKER_IMAGE_BASE=ubuntu:bionic DOCKER_TAG_TO_PUBLISH=11-bionic-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.13+8-0ubuntu1~18.04 DOCKER_TAG_TO_PUBLISH=11.0.13-bionic-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u312-b07-0ubuntu1~18.04 DOCKER_TAG_TO_PUBLISH=8u312-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=11 JDK_VERSION=11.0.13+8-0ubuntu1~18.04
+    DOCKER_TAG_TO_PUBLISH=11.0.13-bionic-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:bionic JDK_MAJOR=8 JDK_VERSION=8u312-b07-0ubuntu1~18.04
+    DOCKER_TAG_TO_PUBLISH=8u312-bionic-openjdk-headless
   - DOCKER_IMAGE_BASE=ubuntu:focal DOCKER_TAG_TO_PUBLISH=17-focal-openjdk-headless
   - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=17 JDK_VERSION=17.0.1+12-1~20.04 DOCKER_TAG_TO_PUBLISH=17.0.1-focal-openjdk-headless
-  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u312-b07-0ubuntu1~20.04 DOCKER_TAG_TO_PUBLISH=8u312-focal-openjdk-headless
+  - DOCKER_IMAGE_BASE=ubuntu:focal JDK_MAJOR=8 JDK_VERSION=8u312-b07-0ubuntu1~20.04
+    DOCKER_TAG_TO_PUBLISH=8u312-focal-openjdk-headless
   - DOCKER_IMAGE_BASE=centos:7 JDK_MAJOR=11 JDK_VERSION=11.0.12.0.7 DOCKER_TAG_TO_PUBLISH=11.0.12.0.7-centos7-openjdk-headless
-  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_MAJOR=11 JDK_VERSION=11.0.13.0.8 DOCKER_TAG_TO_PUBLISH=11.0.13.0.8-centos8-openjdk-headless
-  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3 DOCKER_TAG_TO_PUBLISH=8u292-bullseye-adoptopenjdk-headless
-  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3 DOCKER_TAG_TO_PUBLISH=8u292-buster-adoptopenjdk-headless
-  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292_b10 DOCKER_TAG_TO_PUBLISH=8u292-centos8-adoptopenjdk-headless
-  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1 DOCKER_TAG_TO_PUBLISH=8u302-bullseye-corretto-headless
-  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1 DOCKER_TAG_TO_PUBLISH=8u302-buster-corretto-headless
-  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1.8.0_302.b08 DOCKER_TAG_TO_PUBLISH=8u302-centos8-corretto-headless
-
+  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_MAJOR=11 JDK_VERSION=11.0.13.0.8
+    DOCKER_TAG_TO_PUBLISH=11.0.13.0.8-centos8-openjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3
+    DOCKER_TAG_TO_PUBLISH=8u292-bullseye-adoptopenjdk-headless
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=adoptopenjdk JDK_MAJOR=8 JDK_VERSION=8u292-b10-3
+    DOCKER_TAG_TO_PUBLISH=8u292-buster-adoptopenjdk-headless
+  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_VENDOR=adoptopenjdk JDK_MAJOR=8
+    JDK_VERSION=8u292_b10 DOCKER_TAG_TO_PUBLISH=8u292-centos8-adoptopenjdk-headless
+  - DOCKER_IMAGE_BASE=debian:bullseye-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
+    DOCKER_TAG_TO_PUBLISH=8u302-bullseye-corretto-headless
+  - DOCKER_IMAGE_BASE=debian:buster-slim JDK_VENDOR=corretto JDK_MAJOR=1.8.0 JDK_VERSION=1:8.302.08-1
+    DOCKER_TAG_TO_PUBLISH=8u302-buster-corretto-headless
+  - DOCKER_IMAGE_BASE=quay.io/centos/centos:stream8 JDK_VENDOR=corretto JDK_MAJOR=1.8.0
+    JDK_VERSION=1.8.0_302.b08 DOCKER_TAG_TO_PUBLISH=8u302-centos8-corretto-headless
 script:
 - pipenv run molecule test --scenario-name=${JDK_VENDOR:-default}
 notifications:
   webhooks:
   - https://galaxy.ansible.com/api/v1/notifications/
 deploy:
   provider: script
-  script: ANSIBLE_ROLES_PATH=../ pipenv run ansible-playbook dockerhub/main.yml --extra-vars "docker_hub_email=${DOCKER_EMAIL} docker_hub_username=${DOCKER_USERNAME} docker_hub_password=${DOCKER_PASSWORD} docker_image_base=${DOCKER_IMAGE_BASE} jdk_version=${JDK_VERSION} jdk_major=${JDK_MAJOR} jdk_vendor=${JDK_VENDOR}  docker_tag=${DOCKER_TAG_TO_PUBLISH}"
-
+  script: ANSIBLE_ROLES_PATH=../ pipenv run ansible-playbook dockerhub/main.yml --extra-vars
+    "docker_hub_email=${DOCKER_EMAIL} docker_hub_username=${DOCKER_USERNAME} docker_hub_password='${DOCKER_PASSWORD}'
+    docker_image_base=${DOCKER_IMAGE_BASE} jdk_version=${JDK_VERSION} jdk_major=${JDK_MAJOR}
+    jdk_vendor=${JDK_VENDOR}  docker_tag=${DOCKER_TAG_TO_PUBLISH}"
   on:
     branch: master
     tags: true
     condition: "$JDK_VERSION"
-

CHANGELOG.md

@@ -10,6 +10,8 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
 - *[#160](https://github.com/idealista/java_role/issues/160) Remove packer for playbook for the task of pushing images to Dockerhub* @aren-pulid0
 - *[#165](https://github.com/idealista/java_role/issues/165) Add JAVA_HOME as ENV in docker image* @aren-pulid0
 - *[#167](https://github.com/idealista/java_role/issues/167) Support for multiarch images* @aren-pulid0
+- *[#175](https://github.com/idealista/java_role/issues/175) Error handling on deploy playbook @aren-pulid0
+
 
 ## [7.0.2](https://github.com/idealista/java_role/tree/7.0.2) (2021-08-19)
 [Full Changelog](https://github.com/idealista/java_role/compare/7.0.1...7.0.2)

dockerhub/Dockerfile.j2

@@ -1,12 +1,7 @@
 FROM {{ docker_image_base }}
 
-RUN rm -rf /var/lib/apt/lists/* && apt-get update \
-    && apt-get install -y sudo systemd init systemd-sysv \
-    && apt-get autoremove -y && apt-get clean
-    
-RUN mkdir -p /usr/share/man/man1
 
-RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates && apt-get clean; \
+RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get upgrade -y && apt-get install -y python3 sudo bash ca-certificates systemd init systemd-sysv && apt-get clean; \
     elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python36 sudo python3-dnf bash && dnf clean all; \
     elif [ $(command -v yum) ]; then yum makecache fast && yum update -y && yum install -y python sudo yum-plugin-ovl bash && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
     elif [ $(command -v zypper) ]; then zypper refresh && zypper update -y && zypper install -y python sudo bash python-xml && zypper clean -a; \

dockerhub/deploy_images.yml

@@ -1,26 +1,30 @@
 ---
 
-- name: Get JAVA_HOME variable
-  community.docker.docker_container_exec:
-    container: "{{ 'jdk' + '-' + item }}"
-    command: grep -i -o 'JAVA_HOME.*' /etc/profile.d/jdk.sh
-  register: java_home
+- name: Commit environment variables into containers
+  block:
+    - name: Get JAVA_HOME variable
+      community.docker.docker_container_exec:
+        container: "{{ 'jdk' + '-' + item }}"
+        command: grep -i -o 'JAVA_HOME.*' /etc/profile.d/jdk.sh
+      register: java_home
 
-- set_fact: java_home="{{ java_home.stdout }}"
+    - set_fact: java_home="{{ java_home.stdout }}"
 
-- name: Commit container JAVA_HOME variable to image
-  command: docker commit --change "ENV {{ java_home }}" {{ 'jdk' + '-' + item }} idealista/jdk:{{ docker_tag + '-' + item}}
+    - name: Commit container JAVA_HOME variable to image
+      command: docker commit --change "ENV {{ java_home }}" {{ 'jdk' + '-' + item }} idealista/jdk:{{ docker_tag + '-' + item}}
 
-- name: Log into Docker Hub
-  docker_login:
-    email: "{{ docker_hub_email }}"
-    username: "{{ docker_hub_username }}"
-    password: "{{ docker_hub_password }}"
+    - name: Log into Docker Hub
+      docker_login:
+        email: "{{ docker_hub_email }}"
+        username: "{{ docker_hub_username }}"
+        password: "{{ docker_hub_password }}"
 
-- name: Tag and push to Docker Hub
-  command: docker push idealista/jdk:{{ docker_tag + '-' + item }}
+    - name: Tag and push to Docker Hub
+      command: docker push idealista/jdk:{{ docker_tag + '-' + item }}
 
-- name: Remove the container
-  docker_container:
-    name: "{{ 'jdk' + '-' + item }}"
-    state: absent
+    - name: Remove the container
+      docker_container:
+        name: "{{ 'jdk' + '-' + item }}"
+        state: absent
+
+  when: "failed_architectures is not defined or failed_architectures | join('|') | regex_search(item) != item"

dockerhub/execute_role.yml

@@ -0,0 +1,12 @@
+---
+
+- name: Execute role
+  block:
+    - include_role:
+        name: java_role
+  rescue:
+    - set_fact:
+        failed_execution:  True
+    - debug:
+        msg: "The container {{ ansible_nodename }} couldn't execute roles correctly."
+    

dockerhub/group_vars/all/main.yml

@@ -0,0 +1 @@
+dockerhub_image_architectures: ['amd64', 'arm64']

dockerhub/main.yml

@@ -1,7 +1,6 @@
 ---
 - name: Create Dockerfile, images and build containers
   hosts: localhost
-  connection: local
   gather_facts: false
   tasks:
     - name: Create Dockerfile
@@ -24,29 +23,36 @@
 
     - name: Build containers
       include_tasks: build_containers.yml
-      with_items: ['amd64', 'arm64']
+      with_items: "{{ dockerhub_image_architectures }}"
 
 
 - name: Execute Java role in Docker containers
   hosts: jdk_containers
-  connection: local
+  connection: localhost
+  gather_facts: True
   vars:
     - java_jdk_vendor: "{{ jdk_vendor if jdk_vendor is defined and jdk_vendor is not sameas None and jdk_vendor != '' else 'openjdk' }}"
     - java_open_jdk_version: "{{ jdk_version if jdk_version is defined and jdk_version is not sameas None and jdk_version != '' }}"
     - java_open_jdk_version_major: "{{ jdk_major if jdk_major is defined and jdk_major is not sameas None and jdk_major != ''}}"
-  roles:
-    - java_role
-
+  tasks:
+    - name: Execute role
+      include_tasks: execute_role.yml
 
 - name: Deploy images to DockerHub
   hosts: localhost
   connection: local
-  gather_facts: false
+  gather_facts: True
   tasks:
 
+    - name: Check failed containers
+      set_fact:
+        failed_architectures:  "{{ failed_architectures + [ item ] }}"
+      with_items: "{{ groups['jdk_containers'] }}"
+      when: "{{ hostvars[item]['failed_execution'] is defined and hostvars[item]['failed_execution'] == True }}"
+
     - name: Deploy images
       include_tasks: deploy_images.yml
-      with_items: ['amd64', 'arm64']
+      with_items: "{{ dockerhub_image_architectures }}"
 
 
 - name: Deploy multiarch manifest to DockerHub and cleanup
@@ -56,12 +62,21 @@
   tasks:
 
     - name: Create manifest
-      command: docker manifest create idealista/jdk:{{ docker_tag }}
-                --amend idealista/jdk:{{ docker_tag + '-amd64' }}
-                --amend idealista/jdk:{{ docker_tag + '-arm64' }}
+      command: docker manifest create idealista/jdk:{{ docker_tag }} 
+                {% for architecture in dockerhub_image_architectures %}
+                  {% if failed_architectures is not defined or not failed_architectures | join('|') | regex_search(architecture) %}
+                    --amend idealista/jdk:{{ docker_tag + '-' + architecture }}
+                  {% endif %}
+                {% endfor %}
 
     - name: Push manifest
       command: docker manifest push idealista/jdk:{{ docker_tag }}
 
     - name: Delete builder
       command: docker buildx rm multiarch
+
+    - name: Example using fail and when together
+      fail:
+        msg: Atleast one of the architectures could not be uploaded see logs for more information.
+      when: failed_architectures is defined and failed_architectures | length != 0
+