From ef2d5282306a277e591aa3c355277c6f158d8e76 Mon Sep 17 00:00:00 2001 From: Stamatis Katsaounis Date: Mon, 4 Mar 2019 16:12:10 +0200 Subject: Replace subprocess commands with Docker SDK JIRA: DOVETAIL-752 This patch replaces all python subprocess commands with the Docker SDK relevant commands. Change-Id: Iac7caffd80a863a8a022247d735b2a7f2792e49d Signed-off-by: Stamatis Katsaounis --- etc/conf/bottlenecks_config.yml | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'etc/conf/bottlenecks_config.yml') diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml index 8a0a39bc..eb067c4a 100644 --- a/etc/conf/bottlenecks_config.yml +++ b/etc/conf/bottlenecks_config.yml @@ -8,7 +8,7 @@ {% set build_tag = build_tag or '' %} {% set cacert_volume = '' %} {% if cacert %} - {% set cacert_volume = ' -v ' + cacert + ':' + cacert %} + {% set cacert_volume = cacert + ':' + cacert %} {% endif %} {% set openrc_file = '/tmp/admin_rc.sh' %} {% set result_dir = '/home/opnfv/bottlenecks/results' %} @@ -19,18 +19,24 @@ bottlenecks: image_name: opnfv/bottlenecks docker_tag: latest - opts: '-id --privileged=true' + opts: + detach: true + stdin_open: true + privileged: true shell: '/bin/bash' - envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable - -e OUTPUT_FILE={{testcase}}.out -e CI_DEBUG={{debug}} - -e BUILD_TAG={{build_tag}}-{{testcase}}' + envs: + - 'DEPLOY_SCENARIO={{deploy_scenario}}' + - 'Yardstick_TAG=stable' + - 'OUTPUT_FILE={{testcase}}.out' + - 'CI_DEBUG={{debug}}' + - 'BUILD_TAG={{build_tag}}-{{testcase}}' volumes: - - '-v /var/run/docker.sock:/var/run/docker.sock' - - '-v {{dovetail_home}}/results/bottlenecks:/tmp' - - '-v {{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' + - '/var/run/docker.sock:/var/run/docker.sock' + - '{{dovetail_home}}/results/bottlenecks:/tmp' + - '{{dovetail_home}}/pre_config/env_config.sh:{{openrc_file}}' - {{cacert_volume}} - - '-v {{dovetail_home}}/images:{{images_dir}}' - - '-v {{dovetail_home}}/results:{{result_dir}}' + - '{{dovetail_home}}/images:{{images_dir}}' + - '{{dovetail_home}}/results:{{result_dir}}' pre_condition: - 'cp {{images_dir}}/ubuntu-16.04-server-cloudimg-amd64-disk1.img {{image_file}}' cmds: -- cgit 1.2.3-korg