tests: update docker templates for Molecule 3.0.5

duck-rh · duck-rh · commit 5ae3e835db7b · 2020-07-09T22:06:36.000+09:00
diff --git a/molecule/_resources/create-docker.yml b/molecule/_resources/create-docker.yml
@@ -4,9 +4,6 @@
   connection: local
   gather_facts: false
   no_log: "{{ molecule_no_log }}"
-  vars:
-    molecule_labels:
-      owner: molecule
   tasks:
     - name: Apply global default parameters
       set_fact:
@@ -30,29 +27,14 @@
         - item.registry.credentials is defined
         - item.registry.credentials.username is defined
 
-    - name: Check presence of custom Dockerfiles
-      stat:
-        path: "{{ molecule_scenario_directory + '/' + (item.dockerfile | default( 'Dockerfile.j2')) }}"
-      loop: "{{ final_platforms }}"
-      register: dockerfile_stats
-
     - name: Create Dockerfiles from image names
-      vars:
-        # TODO(ssbarnea): expose module dir so it can also be used by plugins
-        molecule_module_directory: "{{ playbook_dir + '/../../../..' }}"
       template:
-        src: >-
-          {%- if dockerfile_stats.results[i].stat.exists -%}
-          {{ molecule_scenario_directory + '/' + (item.dockerfile | default( 'Dockerfile.j2')) }}
-          {%- else -%}
-          {{ molecule_module_directory + '/data/Dockerfile.j2' }}
-          {%- endif -%}
+        src: "{{ item.dockerfile | default('Dockerfile.j2') }}"
         dest: "{{ molecule_ephemeral_directory }}/Dockerfile_{{ item.image | regex_replace('[^a-zA-Z0-9_]', '_') }}"
-      loop: "{{ final_platforms }}"
-      loop_control:
-        index_var: i
+      with_items: "{{ final_platforms }}"
       when: not item.pre_build_image | default(false)
       register: platforms
+      no_log: item.failed
 
     - name: Discover local Docker images
       docker_image_info:
@@ -63,11 +45,10 @@
         key_path: "{{ item.key_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/key.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
         tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
       with_items: "{{ platforms.results }}"
-      when:
-        - not item.pre_build_image | default(false)
+      when: not item.pre_build_image | default(false)
       register: docker_images
 
-    - name: Build an Ansible compatible image (new)
+    - name: Build an Ansible compatible image
       when:
         - platforms.changed or docker_images.results | map(attribute='images') | select('equalto', []) | list | count >= 0
         - not item.item.pre_build_image | default(false)
@@ -76,8 +57,6 @@
           path: "{{ molecule_ephemeral_directory }}"
           dockerfile: "{{ item.invocation.module_args.dest }}"
           pull: "{{ item.item.pull | default(true) }}"
-          network: "{{ item.item.network_mode | default(omit) }}"
-          args: "{{ item.item.buildargs | default(omit) }}"
         name: "molecule_local/{{ item.item.image }}"
         docker_host: "{{ item.item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
         cacert_path: "{{ item.cacert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/ca.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
@@ -86,6 +65,7 @@
         tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
         force_source: "{{ item.item.force | default(true) }}"
         source: build
+        buildargs: "{{ item.item.buildargs | default(omit) }}"
       with_items: "{{ platforms.results }}"
       loop_control:
         label: "molecule_local/{{ item.item.image }}"
@@ -96,24 +76,9 @@
       delay: 30
 
     - name: Create docker network(s)
-      docker_network:
-        name: "{{ item }}"
-        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
-        cacert_path: "{{ item.cacert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/ca.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
-        cert_path: "{{ item.cert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/cert.pem')  if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
-        key_path: "{{ item.key_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/key.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
-        tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
-        labels: "{{ molecule_labels | combine(item.labels | default({})) }}"
-        state: present
-        # Duck: we need IPv6
-        enable_ipv6: True
-        ipam_config:
-          # RFC 4193
-          - subnet: fdd1:0:0:0::/64
-      with_items: "{{ final_platforms | molecule_get_docker_networks }}"
-      loop_control:
-        label: "{{ item }}"
-      no_log: false
+      action: docker_network
+      args: "{{ docker_network_defaults | default({}) | union(item) }}"
+      with_items: "{{ final_platforms | molecule_get_docker_networks('present') }}"
 
     - name: Determine the CMD directives
       set_fact:
@@ -132,45 +97,37 @@
         cert_path: "{{ item.cert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/cert.pem')  if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
         key_path: "{{ item.key_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/key.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
         tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
-        hostname: "{{ item.hostname | default(item.name) | replace('@NAME@', item.name) }}"
+        hostname: "{{ item.hostname | default(item.name) }}"
         image: "{{ item.pre_build_image | default(false) | ternary('', 'molecule_local/') }}{{ item.image }}"
-        pull: "{{ item.pull | default(omit) }}"
+        pull: "{{ item.pull | default (omit) }}"
         memory: "{{ item.memory | default(omit) }}"
+        memory_swap: "{{ item.memory_swap | default(omit) }}"
         state: started
         recreate: false
         log_driver: json-file
-        command: "{{ (command_directives_dict | default({}))[item.name] | default(omit) }}"
         user: "{{ item.user | default(omit) }}"
+        command: "{{ (command_directives_dict | default({}))[item.name] | default(omit) }}"
         pid_mode: "{{ item.pid_mode | default(omit) }}"
         privileged: "{{ item.privileged | default(omit) }}"
         security_opts: "{{ item.security_opts | default(omit) }}"
-        devices: "{{ item.devices | default(omit) }}"
         volumes: "{{ item.volumes | default(omit) }}"
         tmpfs: "{{ item.tmpfs | default(omit) }}"
         capabilities: "{{ item.capabilities | default(omit) }}"
-        sysctls: "{{ item.sysctls | default(omit) }}"
         exposed_ports: "{{ item.exposed_ports | default(omit) }}"
         published_ports: "{{ item.published_ports | default(omit) }}"
         ulimits: "{{ item.ulimits | default(omit) }}"
         networks: "{{ item.networks | default(omit) }}"
-        network_mode: "{{ item.network_mode | default(omit) }}"
         networks_cli_compatible: "{{ item.networks_cli_compatible | default(true) }}"
+        network_mode: "{{ item.network_mode | default(omit) }}"
         purge_networks: "{{ item.purge_networks | default(omit) }}"
         dns_servers: "{{ item.dns_servers | default(omit) }}"
         etc_hosts: "{{ item.etc_hosts | default(omit) }}"
         env: "{{ item.env | default(omit) }}"
         restart_policy: "{{ item.restart_policy | default(omit) }}"
         restart_retries: "{{ item.restart_retries | default(omit) }}"
-        tty: "{{ item.tty | default(omit) }}"
-        labels: "{{ molecule_labels | combine(item.labels | default({})) }}"
         container_default_behavior: "{{ item.container_default_behavior | default('compatibility' if ansible_version.full is version_compare('2.10', '>=') else omit) }}"
-        # Duck: missing parameters
-        dns_search_domains: "{{ item.dns_search_domains | default(omit) }}"
       register: server
       with_items: "{{ final_platforms }}"
-      loop_control:
-        label: "{{ item.name }}"
-      no_log: false
       async: 7200
       poll: 0
 
@@ -181,3 +138,4 @@
       until: docker_jobs.finished
       retries: 300
       with_items: "{{ server.results }}"
+      no_log: item.failed
diff --git a/molecule/_resources/destroy-docker.yml b/molecule/_resources/destroy-docker.yml
@@ -24,9 +24,6 @@
         container_default_behavior: "{{ item.container_default_behavior | default('compatibility' if ansible_version.full is version_compare('2.10', '>=') else omit) }}"
       register: server
       with_items: "{{ final_platforms }}"
-      loop_control:
-        label: "{{ item.name }}"
-      no_log: false
       async: 7200
       poll: 0
 
@@ -37,17 +34,9 @@
       until: docker_jobs.finished
       retries: 300
       with_items: "{{ server.results }}"
+      no_log: item.failed
 
     - name: Delete docker network(s)
-      docker_network:
-        name: "{{ item }}"
-        docker_host: "{{ item.docker_host | default(lookup('env', 'DOCKER_HOST') or 'unix://var/run/docker.sock') }}"
-        cacert_path: "{{ item.cacert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/ca.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
-        cert_path: "{{ item.cert_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/cert.pem')  if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
-        key_path: "{{ item.key_path | default((lookup('env', 'DOCKER_CERT_PATH') + '/key.pem') if lookup('env', 'DOCKER_CERT_PATH') else omit) }}"
-        tls_verify: "{{ item.tls_verify | default(lookup('env', 'DOCKER_TLS_VERIFY')) or false }}"
-        state: absent
-      with_items: "{{ final_platforms | molecule_get_docker_networks }}"
-      loop_control:
-        label: "{{ item }}"
-      no_log: false
+      action: docker_network
+      args: "{{ docker_network_defaults | default({}) | union(item) }}"
+      with_items: "{{ final_platforms | molecule_get_docker_networks('absent') }}"
diff --git a/molecule/_resources/group_vars/all/common.yml b/molecule/_resources/group_vars/all/common.yml
@@ -16,6 +16,13 @@ platform_base:
     dns_search_domains:
       - example.com
 
+docker_network_defaults:
+  # Duck: we need IPv6
+  enable_ipv6: True
+  ipam_config:
+    # RFC 4193
+    - subnet: fdd1:0:0:0::/64
+
 # TODO: readd yum update when Docker cgroup bug is fixed
 # TODO: btw why is there no dnf update while there's an equivalent in all other distros?
 image_setup: |
