From 23b627df622eeafafa215ce19764310c1d55dd55 Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Sun, 8 Jan 2017 09:48:31 +0800 Subject: Reorganize the project folders Code from Brahmaputra is no longer maintained, including: - docker - playbooks - scripts - utils They are moved to legacy folder to avoid unnecessary confusion to new developers. Change-Id: Ia50383ca5c3bd82571eb7b2184e7f83e264ff8a7 Signed-off-by: Yujun Zhang --- .../testplan/default/compute/dhrystone_bm.yaml | 33 ---------------- .../testplan/default/compute/dhrystone_vm.yaml | 45 ---------------------- benchmarks/testplan/default/compute/dpi_bm.yaml | 34 ---------------- benchmarks/testplan/default/compute/dpi_vm.yaml | 35 ----------------- .../testplan/default/compute/ramspeed_bm.yaml | 34 ---------------- .../testplan/default/compute/ramspeed_vm.yaml | 45 ---------------------- benchmarks/testplan/default/compute/ssl_bm.yaml | 31 --------------- benchmarks/testplan/default/compute/ssl_vm.yaml | 36 ----------------- .../testplan/default/compute/whetstone_bm.yaml | 33 ---------------- .../testplan/default/compute/whetstone_vm.yaml | 44 --------------------- 10 files changed, 370 deletions(-) delete mode 100644 benchmarks/testplan/default/compute/dhrystone_bm.yaml delete mode 100644 benchmarks/testplan/default/compute/dhrystone_vm.yaml delete mode 100644 benchmarks/testplan/default/compute/dpi_bm.yaml delete mode 100644 benchmarks/testplan/default/compute/dpi_vm.yaml delete mode 100644 benchmarks/testplan/default/compute/ramspeed_bm.yaml delete mode 100644 benchmarks/testplan/default/compute/ramspeed_vm.yaml delete mode 100644 benchmarks/testplan/default/compute/ssl_bm.yaml delete mode 100644 benchmarks/testplan/default/compute/ssl_vm.yaml delete mode 100644 benchmarks/testplan/default/compute/whetstone_bm.yaml delete mode 100644 benchmarks/testplan/default/compute/whetstone_vm.yaml (limited to 'benchmarks/testplan/default/compute') diff --git a/benchmarks/testplan/default/compute/dhrystone_bm.yaml b/benchmarks/testplan/default/compute/dhrystone_bm.yaml deleted file mode 100644 index 64741537..00000000 --- a/benchmarks/testplan/default/compute/dhrystone_bm.yaml +++ /dev/null @@ -1,33 +0,0 @@ - -Scenario: - benchmark: dhrystone - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: - pw: - role: host - machine_2: - ip: - pw: - role: host - - Virtual_Machines: - - -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 - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: ''' diff --git a/benchmarks/testplan/default/compute/dhrystone_vm.yaml b/benchmarks/testplan/default/compute/dhrystone_vm.yaml deleted file mode 100644 index 8f5a4165..00000000 --- a/benchmarks/testplan/default/compute/dhrystone_vm.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: dhrystone - host: virtualmachine_1, virtualmachine_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/benchmarks/testplan/default/compute/dpi_bm.yaml b/benchmarks/testplan/default/compute/dpi_bm.yaml deleted file mode 100644 index 14cb6d0d..00000000 --- a/benchmarks/testplan/default/compute/dpi_bm.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Scenario: - benchmark: dpi - host: machine_1,machine_2 - -Context: - Host_Machines: - machine_1: - ip: - pw: - role: host - machine_2: - ip: - pw: - role: host - 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/benchmarks/testplan/default/compute/dpi_vm.yaml b/benchmarks/testplan/default/compute/dpi_vm.yaml deleted file mode 100644 index 10e86993..00000000 --- a/benchmarks/testplan/default/compute/dpi_vm.yaml +++ /dev/null @@ -1,35 +0,0 @@ -Scenario: - benchmark: dpi - 1Run : virtualmachine_1, virtualmachine_2 - -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: compute2 - 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/benchmarks/testplan/default/compute/ramspeed_bm.yaml b/benchmarks/testplan/default/compute/ramspeed_bm.yaml deleted file mode 100644 index ed8fc700..00000000 --- a/benchmarks/testplan/default/compute/ramspeed_bm.yaml +++ /dev/null @@ -1,34 +0,0 @@ -Scenario: - benchmark: ramspeed - host: machine_1, machine_2 - server: - -Context: - Host_Machines: - machine_1: - ip: - pw: - role: host - machine_2: - ip: - pw: - role: host - - Virtual_Machines: - - -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 - - virtualmachine_1: - availability_zone: - public_network: - OS_image: - flavor: - role: ''' - - diff --git a/benchmarks/testplan/default/compute/ramspeed_vm.yaml b/benchmarks/testplan/default/compute/ramspeed_vm.yaml deleted file mode 100644 index a6a4363f..00000000 --- a/benchmarks/testplan/default/compute/ramspeed_vm.yaml +++ /dev/null @@ -1,45 +0,0 @@ -Scenario: - benchmark: ramspeed - host: virtualmachine_1, virtualmachine_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/benchmarks/testplan/default/compute/ssl_bm.yaml b/benchmarks/testplan/default/compute/ssl_bm.yaml deleted file mode 100644 index cc5a8903..00000000 --- a/benchmarks/testplan/default/compute/ssl_bm.yaml +++ /dev/null @@ -1,31 +0,0 @@ -Scenario: - benchmark: ssl - host: machine_1,machine_2 - -Context: - Host_Machines: - machine_1: - ip: - pw: - role: host - machine_2: - ip: - pw: - role: host - Virtual_Machines: - - -Test_Description: - Test_category: "Compute" - Benchmark: "ssl" - Overview: > - '''This test will run the SSL benchmark in parallel on machine_1 and machine_1. - 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/benchmarks/testplan/default/compute/ssl_vm.yaml b/benchmarks/testplan/default/compute/ssl_vm.yaml deleted file mode 100644 index 37824896..00000000 --- a/benchmarks/testplan/default/compute/ssl_vm.yaml +++ /dev/null @@ -1,36 +0,0 @@ -Scenario: - benchmark: ssl - host: virtualmachine_1, virtualmachine_2 - -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/benchmarks/testplan/default/compute/whetstone_bm.yaml b/benchmarks/testplan/default/compute/whetstone_bm.yaml deleted file mode 100644 index 3c128b60..00000000 --- a/benchmarks/testplan/default/compute/whetstone_bm.yaml +++ /dev/null @@ -1,33 +0,0 @@ -Scenario: - benchmark: whetstone - host: machine_1, machine_2 - - -Context: - Host_Machines: - machine_1: - ip: - pw: - role: host - machine_2: - ip: - pw: - role: host - Virtual_Machines: - - - -Test_Description: - Test_category: "Compute" - Benchmark: "whetstone" - Overview: > - ''' This test will run the whetstone benchmark in parallel on machine_1 and machine_2.\n - if you wish to add a baremetal machine add the following information under the Virtual_Machine tag - - machine_3: - ip: - pw: - role: - ''' - - diff --git a/benchmarks/testplan/default/compute/whetstone_vm.yaml b/benchmarks/testplan/default/compute/whetstone_vm.yaml deleted file mode 100644 index 0f1e8748..00000000 --- a/benchmarks/testplan/default/compute/whetstone_vm.yaml +++ /dev/null @@ -1,44 +0,0 @@ -Scenario: - benchmark: whetstone - host: virtualmachine_1, virtualmachine_1 - 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: "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: - ''' - -- cgit 1.2.3-korg