From 05fc8e17d3260e0ce0e680484dc0a64fcb879472 Mon Sep 17 00:00:00 2001 From: "zhifeng.jiang" Date: Sat, 6 Aug 2016 13:09:45 +0800 Subject: Fix the download fail and 'sshkey is not defined' problem in CI. modification: Remove the proxy info in zte-pod1 Fix 'sshkey is not defined' problem in CI Change-Id: I291eb03fea3f31cd8b499c6ee86836caa9a0de71 Signed-off-by: zhifeng.jiang --- func/spawn_vm.py | 1 - test_cases/zte-pod1/compute/dhrystone_bm.yaml | 6 ------ test_cases/zte-pod1/compute/dhrystone_vm.yaml | 5 ----- test_cases/zte-pod1/compute/dpi_bm.yaml | 4 ---- test_cases/zte-pod1/compute/dpi_vm.yaml | 5 ----- test_cases/zte-pod1/compute/ramspeed_bm.yaml | 4 ---- test_cases/zte-pod1/compute/ramspeed_vm.yaml | 4 ---- test_cases/zte-pod1/compute/ssl_bm.yaml | 6 ------ test_cases/zte-pod1/compute/ssl_vm.yaml | 4 ---- test_cases/zte-pod1/compute/whetstone_bm.yaml | 6 ------ test_cases/zte-pod1/compute/whetstone_vm.yaml | 4 ---- test_cases/zte-pod1/network/iperf_bm.yaml | 5 ----- test_cases/zte-pod1/network/iperf_vm.yaml | 5 ----- test_cases/zte-pod1/network/iperf_vm_2.yaml | 4 ---- test_cases/zte-pod1/storage/fio_bm.yaml | 4 ---- test_cases/zte-pod1/storage/fio_vm.yaml | 4 ---- 16 files changed, 71 deletions(-) diff --git a/func/spawn_vm.py b/func/spawn_vm.py index ec63230c..15c26861 100644 --- a/func/spawn_vm.py +++ b/func/spawn_vm.py @@ -26,7 +26,6 @@ class SpawnVM(Env_setup): installer = '' def __init__(self, vm_info): - Env_setup.__init__(self) print 'SpawnVM Class initiated' vm_role_ip_dict = vm_info.copy() print 'Generating Heat Template\n' diff --git a/test_cases/zte-pod1/compute/dhrystone_bm.yaml b/test_cases/zte-pod1/compute/dhrystone_bm.yaml index 437dafd8..15a40d42 100644 --- a/test_cases/zte-pod1/compute/dhrystone_bm.yaml +++ b/test_cases/zte-pod1/compute/dhrystone_bm.yaml @@ -17,12 +17,6 @@ Context: Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - - Test_Description: Test_category: "Compute" diff --git a/test_cases/zte-pod1/compute/dhrystone_vm.yaml b/test_cases/zte-pod1/compute/dhrystone_vm.yaml index 6f213426..9e3f2113 100644 --- a/test_cases/zte-pod1/compute/dhrystone_vm.yaml +++ b/test_cases/zte-pod1/compute/dhrystone_vm.yaml @@ -20,11 +20,6 @@ Context: flavor: m1.large role: host - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - Test_Description: Test_category: "Compute" Benchmark: "dhrystone" diff --git a/test_cases/zte-pod1/compute/dpi_bm.yaml b/test_cases/zte-pod1/compute/dpi_bm.yaml index d1c5963e..940307c3 100644 --- a/test_cases/zte-pod1/compute/dpi_bm.yaml +++ b/test_cases/zte-pod1/compute/dpi_bm.yaml @@ -14,10 +14,6 @@ Context: role: host Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: Test_category: "Compute" diff --git a/test_cases/zte-pod1/compute/dpi_vm.yaml b/test_cases/zte-pod1/compute/dpi_vm.yaml index d47b7f31..e61bf79f 100644 --- a/test_cases/zte-pod1/compute/dpi_vm.yaml +++ b/test_cases/zte-pod1/compute/dpi_vm.yaml @@ -20,11 +20,6 @@ Context: role: 1Run flavor: m1.large - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - Test_Description: Test_category: "Compute" Benchmark: "dpi" diff --git a/test_cases/zte-pod1/compute/ramspeed_bm.yaml b/test_cases/zte-pod1/compute/ramspeed_bm.yaml index d9e1f170..f126a19d 100644 --- a/test_cases/zte-pod1/compute/ramspeed_bm.yaml +++ b/test_cases/zte-pod1/compute/ramspeed_bm.yaml @@ -17,10 +17,6 @@ Context: Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: diff --git a/test_cases/zte-pod1/compute/ramspeed_vm.yaml b/test_cases/zte-pod1/compute/ramspeed_vm.yaml index 942aa3fe..7a2ef849 100644 --- a/test_cases/zte-pod1/compute/ramspeed_vm.yaml +++ b/test_cases/zte-pod1/compute/ramspeed_vm.yaml @@ -20,10 +20,6 @@ Context: flavor: m1.large role: host - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: Test_category: "Compute" diff --git a/test_cases/zte-pod1/compute/ssl_bm.yaml b/test_cases/zte-pod1/compute/ssl_bm.yaml index e4f608e6..95d53840 100644 --- a/test_cases/zte-pod1/compute/ssl_bm.yaml +++ b/test_cases/zte-pod1/compute/ssl_bm.yaml @@ -14,12 +14,6 @@ Context: role: host Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - - Test_Description: Test_category: "Compute" Benchmark: "ssl" diff --git a/test_cases/zte-pod1/compute/ssl_vm.yaml b/test_cases/zte-pod1/compute/ssl_vm.yaml index cc97ecfd..60045903 100644 --- a/test_cases/zte-pod1/compute/ssl_vm.yaml +++ b/test_cases/zte-pod1/compute/ssl_vm.yaml @@ -19,10 +19,6 @@ Context: flavor: 'm1.large' role: host - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: Test_category: "Compute" diff --git a/test_cases/zte-pod1/compute/whetstone_bm.yaml b/test_cases/zte-pod1/compute/whetstone_bm.yaml index 6c703de1..bf14ea3a 100644 --- a/test_cases/zte-pod1/compute/whetstone_bm.yaml +++ b/test_cases/zte-pod1/compute/whetstone_bm.yaml @@ -16,12 +16,6 @@ Context: role: host Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - - Test_Description: Test_category: "Compute" Benchmark: "whetstone" diff --git a/test_cases/zte-pod1/compute/whetstone_vm.yaml b/test_cases/zte-pod1/compute/whetstone_vm.yaml index bcde58c1..9f12597f 100644 --- a/test_cases/zte-pod1/compute/whetstone_vm.yaml +++ b/test_cases/zte-pod1/compute/whetstone_vm.yaml @@ -20,10 +20,6 @@ Context: flavor: m1.large role: host - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: Test_category: "Compute" diff --git a/test_cases/zte-pod1/network/iperf_bm.yaml b/test_cases/zte-pod1/network/iperf_bm.yaml index 5b2126fd..e022d4a4 100644 --- a/test_cases/zte-pod1/network/iperf_bm.yaml +++ b/test_cases/zte-pod1/network/iperf_bm.yaml @@ -21,11 +21,6 @@ Context: Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/zte-pod1/network/iperf_vm.yaml b/test_cases/zte-pod1/network/iperf_vm.yaml index f03b5b6f..57e09e02 100644 --- a/test_cases/zte-pod1/network/iperf_vm.yaml +++ b/test_cases/zte-pod1/network/iperf_vm.yaml @@ -27,11 +27,6 @@ Context: role: 2-host flavor: m1.large - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* - Test_Description: Test_category: "network" Benchmark: "iperf" diff --git a/test_cases/zte-pod1/network/iperf_vm_2.yaml b/test_cases/zte-pod1/network/iperf_vm_2.yaml index 649adf8c..c3cd6b35 100644 --- a/test_cases/zte-pod1/network/iperf_vm_2.yaml +++ b/test_cases/zte-pod1/network/iperf_vm_2.yaml @@ -28,10 +28,6 @@ Context: role: 2-host flavor: m1.large - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: Test_category: "network" diff --git a/test_cases/zte-pod1/storage/fio_bm.yaml b/test_cases/zte-pod1/storage/fio_bm.yaml index d07623c5..e940e9ba 100644 --- a/test_cases/zte-pod1/storage/fio_bm.yaml +++ b/test_cases/zte-pod1/storage/fio_bm.yaml @@ -17,10 +17,6 @@ Context: Virtual_Machines: - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: diff --git a/test_cases/zte-pod1/storage/fio_vm.yaml b/test_cases/zte-pod1/storage/fio_vm.yaml index 3e2f9174..65a1e67b 100644 --- a/test_cases/zte-pod1/storage/fio_vm.yaml +++ b/test_cases/zte-pod1/storage/fio_vm.yaml @@ -20,10 +20,6 @@ Context: flavor: m1.large role: host - Proxy_Environment: - http_proxy: http://10.20.0.1:8118 - https_proxy: http://10.20.0.1:8118 - no_proxy: localhost,127.0.0.1,10.20.*,192.168.* Test_Description: Test_category: "Storage" -- cgit 1.2.3-korg