Fix assignments in docker tests. (#57249)
This commit is contained in:
parent
1515afd92c
commit
7cd229aa97
23 changed files with 27 additions and 27 deletions
|
@ -4,7 +4,7 @@
|
||||||
cname: "{{ cname_prefix ~ '-comparisons' }}"
|
cname: "{{ cname_prefix ~ '-comparisons' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname]"
|
cnames: "{{ cnames + [cname] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## value ###########################################################
|
## value ###########################################################
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
cname: "{{ cname_prefix ~ '-iid' }}"
|
cname: "{{ cname_prefix ~ '-iid' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname]"
|
cnames: "{{ cnames + [cname] }}"
|
||||||
|
|
||||||
- name: Pull images
|
- name: Pull images
|
||||||
docker_image:
|
docker_image:
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
nname_2: "{{ cname_prefix ~ '-network-2' }}"
|
nname_2: "{{ cname_prefix ~ '-network-2' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname, cname_h1]"
|
cnames: "{{ cnames + [cname, cname_h1] }}"
|
||||||
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
|
dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
|
||||||
|
|
||||||
- name: Create networks
|
- name: Create networks
|
||||||
docker_network:
|
docker_network:
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
cname_h3: "{{ cname_prefix ~ '-options-h3' }}"
|
cname_h3: "{{ cname_prefix ~ '-options-h3' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname, cname_h1, cname_h2, cname_h3]"
|
cnames: "{{ cnames + [cname, cname_h1, cname_h2, cname_h3] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## auto_remove #####################################################
|
## auto_remove #####################################################
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
cname: "{{ cname_prefix ~ '-45700' }}"
|
cname: "{{ cname_prefix ~ '-45700' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname]"
|
cnames: "{{ cnames + [cname] }}"
|
||||||
|
|
||||||
- name: Start container
|
- name: Start container
|
||||||
docker_container:
|
docker_container:
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
cname: "{{ cname_prefix ~ '-hi' }}"
|
cname: "{{ cname_prefix ~ '-hi' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname]"
|
cnames: "{{ cnames + [cname] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## Creation ########################################################
|
## Creation ########################################################
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering image name
|
- name: Registering image name
|
||||||
set_fact:
|
set_fact:
|
||||||
inames: "{{ inames }} + [iname, iname_1]"
|
inames: "{{ inames + [iname, iname_1] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## build.args ######################################################
|
## build.args ######################################################
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
nname_2: "{{ name_prefix ~ '-network-2' }}"
|
nname_2: "{{ name_prefix ~ '-network-2' }}"
|
||||||
- name: Registering container and network names
|
- name: Registering container and network names
|
||||||
set_fact:
|
set_fact:
|
||||||
cnames: "{{ cnames }} + [cname_1, cname_2, cname_3]"
|
cnames: "{{ cnames + [cname_1, cname_2, cname_3] }}"
|
||||||
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
|
dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
|
||||||
|
|
||||||
- name: Create containers
|
- name: Create containers
|
||||||
docker_container:
|
docker_container:
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
- name: Registering network names
|
- name: Registering network names
|
||||||
set_fact:
|
set_fact:
|
||||||
dnetworks: "{{ dnetworks }} + [nname_ipam_0, nname_ipam_1, nname_ipam_2, nname_ipam_3]"
|
dnetworks: "{{ dnetworks + [nname_ipam_0, nname_ipam_1, nname_ipam_2, nname_ipam_3] }}"
|
||||||
|
|
||||||
|
|
||||||
#################### network-ipam-0 deprecated ####################
|
#################### network-ipam-0 deprecated ####################
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
nname_1: "{{ name_prefix ~ '-network-1' }}"
|
nname_1: "{{ name_prefix ~ '-network-1' }}"
|
||||||
- name: Registering network name
|
- name: Registering network name
|
||||||
set_fact:
|
set_fact:
|
||||||
dnetworks: "{{ dnetworks }} + [nname_1]"
|
dnetworks: "{{ dnetworks + [nname_1] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## internal ########################################################
|
## internal ########################################################
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
nname_1: "{{ name_prefix ~ '-network-1' }}"
|
nname_1: "{{ name_prefix ~ '-network-1' }}"
|
||||||
- name: Registering network name
|
- name: Registering network name
|
||||||
set_fact:
|
set_fact:
|
||||||
dnetworks: "{{ dnetworks }} + [nname_1]"
|
dnetworks: "{{ dnetworks + [nname_1] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## overlay #########################################################
|
## overlay #########################################################
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
nname_2: "{{ name_prefix ~ '-network-foobar' }}"
|
nname_2: "{{ name_prefix ~ '-network-foobar' }}"
|
||||||
- name: Registering container and network names
|
- name: Registering container and network names
|
||||||
set_fact:
|
set_fact:
|
||||||
dnetworks: "{{ dnetworks }} + [nname_1, nname_2]"
|
dnetworks: "{{ dnetworks + [nname_1, nname_2] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
|
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
config_names: "{{ config_names }} + [config_name_1, config_name_2]"
|
config_names: "{{ config_names + [config_name_1, config_name_2] }}"
|
||||||
|
|
||||||
- docker_config:
|
- docker_config:
|
||||||
name: "{{ config_name_1 }}"
|
name: "{{ config_name_1 }}"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## logging.driver ##################################################
|
## logging.driver ##################################################
|
||||||
|
|
|
@ -6,8 +6,8 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
volume_names: "{{ volume_names }} + [volume_name_1, volume_name_2]"
|
volume_names: "{{ volume_names + [volume_name_1, volume_name_2] }}"
|
||||||
|
|
||||||
- docker_volume:
|
- docker_volume:
|
||||||
name: "{{ volume_name }}"
|
name: "{{ volume_name }}"
|
||||||
|
|
|
@ -8,8 +8,8 @@
|
||||||
|
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
network_names: "{{ network_names }} + [network_name_1, network_name_2]"
|
network_names: "{{ network_names + [network_name_1, network_name_2] }}"
|
||||||
|
|
||||||
- docker_network:
|
- docker_network:
|
||||||
name: "{{ network_name }}"
|
name: "{{ network_name }}"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
|
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## limits.cpus #####################################################
|
## limits.cpus #####################################################
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
|
|
||||||
###################################################################
|
###################################################################
|
||||||
## restart_config.condition #######################################
|
## restart_config.condition #######################################
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
|
|
||||||
###################################################################
|
###################################################################
|
||||||
## rollback_config.delay ############################################
|
## rollback_config.delay ############################################
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
|
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
secret_names: "{{ secret_names }} + [secret_name_1, secret_name_2]"
|
secret_names: "{{ secret_names + [secret_name_1, secret_name_2] }}"
|
||||||
|
|
||||||
- docker_secret:
|
- docker_secret:
|
||||||
name: "{{ secret_name_1 }}"
|
name: "{{ secret_name_1 }}"
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
|
|
||||||
- name: Registering service name
|
- name: Registering service name
|
||||||
set_fact:
|
set_fact:
|
||||||
service_names: "{{ service_names }} + [service_name]"
|
service_names: "{{ service_names + [service_name] }}"
|
||||||
|
|
||||||
###################################################################
|
###################################################################
|
||||||
## update_config.delay ############################################
|
## update_config.delay ############################################
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
vname: "{{ name_prefix ~ '-basic' }}"
|
vname: "{{ name_prefix ~ '-basic' }}"
|
||||||
- name: Registering container name
|
- name: Registering container name
|
||||||
set_fact:
|
set_fact:
|
||||||
vnames: "{{ vnames }} + [vname]"
|
vnames: "{{ vnames + [vname] }}"
|
||||||
|
|
||||||
####################################################################
|
####################################################################
|
||||||
## basic ###########################################################
|
## basic ###########################################################
|
||||||
|
|
Loading…
Reference in a new issue