From 11c81d90581606c0bde98e04a4f739eed4bcbf6d Mon Sep 17 00:00:00 2001 From: Nauman_Ahad Date: Thu, 7 Jan 2016 13:09:45 +0500 Subject: Slight changes to the run_qtip.sh script Modifications needed in run_qtip.sh for Jenkins Jobs to run. Docker file changed too. get_env.sh script location changed too. Testcases for dell-us-deploying-bm-3 lab added along with the default testcase directory Change-Id: I293febda0ddd3d56d1c455fde220dc78a57b6c18 Signed-off-by: Nauman_Ahad --- .../compute/.whetstone_serial.yaml.swp | Bin 12288 -> 0 bytes .../compute/dhrystone_parallel.yaml | 45 --------------------- .../dell_santa_clara/compute/dhrystone_serial.yaml | 35 ---------------- .../dell_santa_clara/compute/dpi_parallel.yaml | 36 ----------------- .../dell_santa_clara/compute/dpi_serial.yaml | 35 ---------------- .../dell_santa_clara/compute/ssl_parallel.yaml | 37 ----------------- .../dell_santa_clara/compute/ssl_serial.yaml | 33 --------------- .../compute/whetstone_parallel.yaml | 45 --------------------- .../dell_santa_clara/compute/whetstone_serial.yaml | 35 ---------------- 9 files changed, 301 deletions(-) delete mode 100644 test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp delete mode 100644 test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml delete mode 100644 test_cases/dell_santa_clara/compute/dhrystone_serial.yaml delete mode 100644 test_cases/dell_santa_clara/compute/dpi_parallel.yaml delete mode 100644 test_cases/dell_santa_clara/compute/dpi_serial.yaml delete mode 100644 test_cases/dell_santa_clara/compute/ssl_parallel.yaml delete mode 100644 test_cases/dell_santa_clara/compute/ssl_serial.yaml delete mode 100644 test_cases/dell_santa_clara/compute/whetstone_parallel.yaml delete mode 100644 test_cases/dell_santa_clara/compute/whetstone_serial.yaml (limited to 'test_cases/dell_santa_clara/compute') diff --git a/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp b/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp deleted file mode 100644 index bbfd3be2..00000000 Binary files a/test_cases/dell_santa_clara/compute/.whetstone_serial.yaml.swp and /dev/null differ diff --git a/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml b/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml deleted file mode 100644 index 29de6d6f..00000000 --- a/test_cases/dell_santa_clara/compute/dhrystone_parallel.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: dhrystone - host: machine_1, machine_2 - server: blakc - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - virtualmachine_2: - availability_zone: compute2 - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - -Test_Description: - Test_category: "Compute" - Benchmark: "dhrystone" - Overview: > - '''This test will run the dhrystone benchmark in parallel on machine_1 and machine_2.\n - if you wish to add a virtual machine add the following information under the Virtual_Machine tag - machine_1: - ip: 172.18.0.16 - pw: Op3nStack - role: host - machine_2: - ip: 172.18.0.15 - pw: Op3nStack - role: host - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: - ''' - diff --git a/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml b/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml deleted file mode 100644 index e15e8ecc..00000000 --- a/test_cases/dell_santa_clara/compute/dhrystone_serial.yaml +++ /dev/null @@ -1,35 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1, machine_2, virtualmachine_1 - server: - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.16 - pw: Op3nStack - role: host - Virtual_Machines: - virtualmachine_1: - availability_zone: nova - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: server - -Test_Description: - Test_category: "Compute" - Benchmark: "dhrystone" - Overview: > - ''' This test will run the dhrystone benchmark in serial on machine_1 and machine_2.\n - if you wish to add a virtual machine add the following information under the Virtual_Machine tag - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: ''' - - diff --git a/test_cases/dell_santa_clara/compute/dpi_parallel.yaml b/test_cases/dell_santa_clara/compute/dpi_parallel.yaml deleted file mode 100644 index 0f6afdce..00000000 --- a/test_cases/dell_santa_clara/compute/dpi_parallel.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: dpi - 1Run : virtualmachine_1, virtualmachine_2 - 2Run: - -Context: - Host_Machines: - - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'net04_ext' - role: 1Run - flavor: m1.large - virtualmachine_2: - availability_zone: compute4 - OS_image: QTIP_CentOS - public_network: 'net04_ext' - role: 1Run - flavor: m1.large - -Test_Description: - Test_category: "Compute" - Benchmark: "dpi" - Overview: > - '''This test will run the DPI benchmark in parallel on virutalmachine_1 and virtualmachine_2.\n - if you wish to add a host machine add the following information under the Host_Machine tag - - machine_1: - ip: - pw: - role: - ''' - diff --git a/test_cases/dell_santa_clara/compute/dpi_serial.yaml b/test_cases/dell_santa_clara/compute/dpi_serial.yaml deleted file mode 100644 index b39597a2..00000000 --- a/test_cases/dell_santa_clara/compute/dpi_serial.yaml +++ /dev/null @@ -1,35 +0,0 @@ -Scenario: - benchmark: dpi - host: virtualmachine_1 - server: virtualmachine_2 - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.17 - pw: Op3nStack - role: 1host - machine_2: - ip: 172.18.0.16 - pw: Op3nStack - role: 1host - Virtual_Machines: -Test_Description: - Test_category: "Compute" - Benchmark: "dpi" - Overview: > - '''This test will run the DPI benchmark in serial on virutalmachine_1 and virtualmachine_2.\n - if you wish to add a host machine add the following information under the Host_Machine tag - virtualmachine_2: - availability_zone: compute1 - OS_image: QTIP_CentOS - public_network: 'provider_network' - - role: 1host - flavor: m1.large - machine_1: - ip: - pw: - role: - ''' - diff --git a/test_cases/dell_santa_clara/compute/ssl_parallel.yaml b/test_cases/dell_santa_clara/compute/ssl_parallel.yaml deleted file mode 100644 index eb46d8d8..00000000 --- a/test_cases/dell_santa_clara/compute/ssl_parallel.yaml +++ /dev/null @@ -1,37 +0,0 @@ -Scenario: - benchmark: ssl - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'net04_ext' - OS_image: 'QTIP_CentOS' - flavor: 'm1.large' - role: host - virtualmachine_2: - availability_zone: compute2 - public_network: 'net04_ext' - OS_image: 'QTIP_CentOS' - flavor: 'm1.large' - role: host - - -Test_Description: - Test_category: "Compute" - Benchmark: "ssl" - Overview: > - '''This test will run the SSL benchmark in parallel on virtualmachine_1 and machine_1.\n - if you wish to add a virtual machine add the following information under the Virtual_Machine tag - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: - ''' diff --git a/test_cases/dell_santa_clara/compute/ssl_serial.yaml b/test_cases/dell_santa_clara/compute/ssl_serial.yaml deleted file mode 100644 index 4d92526e..00000000 --- a/test_cases/dell_santa_clara/compute/ssl_serial.yaml +++ /dev/null @@ -1,33 +0,0 @@ -Scenario: - benchmark: ssl - 1Run: machine_1 - 2Run: virtualmachine_1 - -Context: - Host_Machines: - machine_1: - ip: 10.20.0.7 - pw: r00tme - role: 1Run - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: net04_ext - OS_image: QTIP_Centos - flavor: m1.large - role: 1Run -Test_Description: - Test_category: "Compute" - Benchmark: "ssl" - Overview: > - '''This test will run the SSL benchmark in serial on virtualmachine_1 and machine_1. - The Test will run first on the Host_Machine and then on the Virtual Machine. - if you wish to add a virtual machine add the following information under the Virtual_Machine tag - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: - ''' diff --git a/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml b/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml deleted file mode 100644 index 48bc7230..00000000 --- a/test_cases/dell_santa_clara/compute/whetstone_parallel.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: whetstone - host: machine_1, virtualmachine_1 - server: - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.76 - pw: r00tme - role: host - machine_2: - ip: 172.18.0.75 - pw: r00tme - role: host - - Virtual_Machines: - virtualmachine_1: - availability_zone: compute1 - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - -Test_Description: - Test_category: "Compute" - Benchmark: "dhrystone" - Overview: > - '''This test will run the whetstone benchmark in parallel on machine_1 and machine_2.\n - if you wish to add a virtual machine add the following information under the Virtual_Machine tag - virtualmachine_1: - availability_zone: nova - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: host - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: - ''' - diff --git a/test_cases/dell_santa_clara/compute/whetstone_serial.yaml b/test_cases/dell_santa_clara/compute/whetstone_serial.yaml deleted file mode 100644 index 25cefbf8..00000000 --- a/test_cases/dell_santa_clara/compute/whetstone_serial.yaml +++ /dev/null @@ -1,35 +0,0 @@ - -Scenario: - benchmark: whetstone - host: machine_1, - server: virtualmachine_1 - -Context: - Host_Machines: - machine_1: - ip: 172.18.0.16 - pw: Op3nStack - role: host - Virtual_Machines: - virtualmachine_1: - availability_zone: nova - public_network: 'net04_ext' - OS_image: QTIP_CentOS - flavor: m1.large - role: server - -Test_Description: - Test_category: "Compute" - Benchmark: "whetstone" - Overview: > - ''' This test will run the whetstone benchmark in serial on machine_1 and machine_2.\n - if you wish to add a virtual machine add the following information under the Virtual_Machine tag - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: ''' - - -- cgit 1.2.3-korg