Prepare 4.0.0 release. (#971)

tests/integration/targets/docker_container/tasks/tests/image-ids.yml

@@ -77,6 +77,7 @@
     image: "{{ docker_test_image_alpine }}"
     name: "{{ cname }}"
     state: present
+    image_name_mismatch: ignore
   register: create_5
   check_mode: true
 
@@ -85,6 +86,7 @@
     image: "{{ docker_test_image_alpine }}"
     name: "{{ cname }}"
     state: present
+    image_name_mismatch: ignore
   register: create_6
 
 - name: Cleanup

tests/integration/targets/docker_container/tasks/tests/network.yml

@@ -385,18 +385,16 @@
     networks_cli_compatible: true
   register: networks_7
 
-- name: networks_cli_compatible=yes, networks not specified, purge_networks
+- name: networks_cli_compatible=yes, networks empty, purge_networks
   docker_container:
     image: "{{ docker_test_image_alpine }}"
     command: '/bin/sh -c "sleep 10m"'
     name: "{{ cname }}"
     state: started
     networks_cli_compatible: true
-    purge_networks: true
-    # To replace `purge_networks=true`, we have to specify `networks: []`:
-    #   comparisons:
-    #     networks: strict
-    #   networks: []
+    comparisons:
+      networks: strict
+    networks: []
     force_kill: true
   register: networks_8
 

tests/integration/targets/docker_container/tasks/tests/options.yml

@@ -2290,7 +2290,7 @@
     - interactive_3 is changed
 
 ####################################################################
-## image / image_comparison / ignore_image #########################
+## image / image_comparison ########################################
 ####################################################################
 
 - name: Pull images to make sure ignore_image test succeeds
@@ -2570,7 +2570,8 @@
 - name: ignore_image
   docker_container:
     image: "{{ docker_test_image_hello_world }}"
-    ignore_image: true
+    comparisons:
+      image: ignore
     name: "{{ cname }}"
     state: started
   register: ignore_image
@@ -2579,8 +2580,9 @@
 - name: ignore_image (labels and env differ in image, image_comparison=current-image)
   docker_container:
     image: "{{ docker_test_image_registry_nginx }}"
-    ignore_image: true
     image_comparison: current-image
+    comparisons:
+      image: ignore
     name: "{{ cname }}"
     state: started
   register: ignore_image_2
@@ -2589,8 +2591,9 @@
 - name: ignore_image (labels and env differ in image, image_comparison=desired-image)
   docker_container:
     image: "{{ docker_test_image_registry_nginx }}"
-    ignore_image: true
     image_comparison: desired-image
+    comparisons:
+      image: ignore
     name: "{{ cname }}"
     state: started
     force_kill: true