From fb9e1a726d3a598494fd38330848ef676219a47a Mon Sep 17 00:00:00 2001 From: liyin Date: Mon, 8 May 2017 09:04:32 +0000 Subject: Delete testcase of rubbos and vstf. JIRA:BOTTLENECK-167 This patch will delete vstf and rubbos testcase code. Include some testcase config file, if there will be someone who want to use this testcase maybe B or C version code will contain those testcase. if you use the D version code to run this two testcase we will info you that: Rubbos testsuite is not updating anymore. This entrance for running Rubbos within Bottlenecks is no longer supported. Change-Id: I04e4042ff3998b3696df2ed47a9ffab6f1620ec3 Signed-off-by: liyin (cherry picked from commit 6a8257127b3dce1f18a650afe6921a34b6c6f5b8) --- .../rubbos_monitor/manifests/rubbos_monitor_off.pp | 53 ---------- .../rubbos_monitor/manifests/rubbos_monitor_on.pp | 110 --------------------- 2 files changed, 163 deletions(-) delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp (limited to 'testsuites/rubbos/puppet_manifests/modules/rubbos_monitor') diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp deleted file mode 100644 index b7072311..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_off.pp +++ /dev/null @@ -1,53 +0,0 @@ -############################################################################# -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -class rubbos_monitor::rubbos_monitor_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_app = $params::rubbos_params::rubbos_app - $rubbos_home = $params::rubbos_params::rubbos_home - - # Make uninstall sysstat - exec {'make uninstall sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "make uninstall", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - onlyif => "test -d ${rubbos_app}/sysstat-9.0.6", - } - - # Remove sysstat-9.0.6 folder - file {'${rubbos_app}/sysstat-9.0.6': - ensure => absent, - path => "${rubbos_app}/sysstat-9.0.6", - force => true, - recurse => true, - backup => false, - require => Exec['make uninstall sysstat'], - } - - # Remove bench folder - file {'${rubbos_home}/bench.tar.gz': - ensure => absent, - path => "${rubbos_home}/bench.tar.gz", - backup => false, - } - - file {'${rubbos_home}/bench': - ensure => absent, - path => "${rubbos_home}/bench", - force => true, - recurse => true, - backup => false, - show_diff => false, - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp deleted file mode 100644 index b9dad5e1..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_monitor/manifests/rubbos_monitor_on.pp +++ /dev/null @@ -1,110 +0,0 @@ -############################################################################# -# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - - -class rubbos_monitor::rubbos_monitor_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - - # Declare some variables - $rubbos_app = $params::rubbos_params::rubbos_app - $rubbos_home = $params::rubbos_params::rubbos_home - $rubbos_os_username = $params::rubbos_params::rubbos_os_username - $rubbos_os_usergroup = $params::rubbos_params::rubbos_os_usergroup - - # Prepare the bench folder and related files - file {'${rubbos_home}/bench.tar.gz': - ensure => file, - path => "${rubbos_home}/bench.tar.gz", - source => "puppet:///modules/rubbos_monitor/bench.tar.gz", - backup => false, - } - - exec {'tar zxvf ${rubbos_home}/bench.tar.gz': - cwd => "${rubbos_home}", - command => "tar zxvf ${rubbos_home}/bench.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - subscribe => File['${rubbos_home}/bench.tar.gz'], - } - - file {'flush_cache': - ensure => file, - path => "${rubbos_home}/bench/flush_cache", - source => "puppet:///modules/rubbos_monitor/flush_cache", - backup => false, - mode => 0755, - require => Exec['tar zxvf ${rubbos_home}/bench.tar.gz'], - } - - # Change owner and group for the bench folder - exec {'chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/bench': - cwd => "${rubbos_home}", - command => "chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/bench", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['flush_cache'], - } - - # Prepare cpu_mem.sh - file {'cpu_mem.sh': - ensure => file, - path => "${rubbos_app}/cpu_mem.sh", - source => "puppet:///modules/rubbos_monitor/cpu_mem.sh", - backup => false, - mode => 0755, - owner => "${rubbos_os_username}", - group => "${rubbos_os_usergroup}", - } - - # Prepare monitoring tool - file {'${rubbos_app}/sysstat-9.0.6.tar.gz': - ensure => file, - path => "${rubbos_app}/sysstat-9.0.6.tar.gz", - source => "puppet:///modules/rubbos_monitor/sysstat-9.0.6.tar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app}/sysstat-9.0.6.tar.gz': - cwd => "${rubbos_app}", - command => "tar xzvf ${rubbos_app}/sysstat-9.0.6.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app}/sysstat-9.0.6.tar.gz'], - } - - # Build and install sysstat - exec {'configure sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "${rubbos_app}/sysstat-9.0.6/configure --prefix=${rubbos_app}/sysstat-9.0.6 --disable-nls", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['tar xzvf ${rubbos_app}/sysstat-9.0.6.tar.gz'], - } - - exec {'make sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "make", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['configure sysstat'], - } - - exec {'make install sysstat': - cwd => "${rubbos_app}/sysstat-9.0.6", - command => "make install", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['make sysstat'], - } - - # Change owner and group for the sysstat - exec {'chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_app}/sysstat-9.0.6': - cwd => "${rubbos_app}", - command => "chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_app}/sysstat-9.0.6", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['make install sysstat'], - } - -} -- cgit 1.2.3-korg