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) --- .../modules/rubbos_client/files/Makefile | 86 ---------- .../modules/rubbos_client/files/build.properties | 16 -- .../modules/rubbos_client/files/config.mk | 36 ----- .../rubbos_client/files/rubbos.properties.template | 85 ---------- .../modules/rubbos_client/files/run_emulator.sh | 16 -- .../rubbos_client/manifests/rubbos_client_off.pp | 103 ------------ .../rubbos_client/manifests/rubbos_client_on.pp | 179 --------------------- 7 files changed, 521 deletions(-) delete mode 100755 testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/build.properties delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/rubbos.properties.template delete mode 100755 testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp delete mode 100644 testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp (limited to 'testsuites/rubbos/puppet_manifests/modules/rubbos_client') diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile deleted file mode 100755 index 77dec805..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/Makefile +++ /dev/null @@ -1,86 +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 -############################################################################## - - -########################### -# RUBBoS Makefile # -########################### - -include config.mk - -############################## -# Environment variables # -############################## - -JAVA = $(JAVA_HOME)/bin/java -JAVAC = $(JAVA_HOME)/bin/javac -JAVACOPTS = -deprecation -JAVACC = $(JAVAC) $(JAVACOPTS) -RMIC = $(JAVA_HOME)/bin/rmic -RMIREGISTRY= $(JAVA_HOME)/bin/rmiregistry -CLASSPATH = .:$(J2EE_HOME)/lib/j2ee.jar:$(JAVA_HOME)/jre/lib/rt.jar -JAVADOC = $(JAVA_HOME)/javadoc - - -######################### -# Servlets version # -######################### -#ServletPrinter -Servlets = Config TimeManagement BrowseCategories Auth RegisterUser RubbosHttpServlet BrowseRegions SearchItemsByCategory SearchItemsByRegion ViewItem ViewBidHistory ViewUserInfo SellItemForm RegisterItem PutCommentAuth PutComment StoreComment BuyNowAuth BuyNow StoreBuyNow PutBidAuth PutBid StoreBid AboutMe - -all_servlets_sources = $(addprefix edu/rice/rubbos/servlets/, $(addsuffix .java, $(Servlets))) -all_servlets_obj = $(addprefix edu/rice/rubbos/servlets/, $(addsuffix .class, $(Servlets))) - -servlets: $(all_servlets_obj) - -clean_servlets: - rm -f edu/rice/rubbos/servlets/*.class - -#################### -# Client # -#################### - -ClientFiles = URLGenerator URLGeneratorPHP RUBBoSProperties Stats \ - TransitionTable ClientEmulator UserSession - -all_client_sources = $(addprefix edu/rice/rubbos/client/, $(addsuffix .java, $(ClientFiles))) -all_client_obj = $(addprefix edu/rice/rubbos/client/, $(addsuffix .class, $(ClientFiles))) edu/rice/rubbos/beans/TimeManagement.class - -client: $(all_client_obj) - -initDB: - ${JAVA} -classpath .:./database edu.rice.rubbos.client.InitDB ${PARAM} - -emulator: - ${JAVA} -classpath Client:Client/rubbos_client.jar:. -Xms256m -Xmx2048m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - -emulatorDebug: - ${JAVA} -classpath Client:Client/rubbos_client.jar:. -Xdebug -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -Xms128m -Xmx1024m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - - -############################ -# Global rules # -############################ - - -all: beans ejb_servlets client javadoc flush_cache - -world: all servlets - -javadoc : - ${JAVADOC} -d ./doc/api -bootclasspath ${CLASSPATH} -version -author -windowtitle "RUBBoS API" -header "RUBBoS (C)2001 Rice University/INRIA
" edu.rice.rubbos.beans edu.rice.rubbos.beans.servlets edu.rice.rubbos.client - -clean: - rm -f core edu/rice/rubbos/beans/*.class edu/rice/rubbos/beans/JOnAS* edu/rice/rubbos/beans/servlets/*.class edu/rice/rubbos/client/*.class edu/rice/rubbos/servlets/*.class - -%.class: %.java - ${JAVACC} -classpath ${CLASSPATH} $< - -flush_cache: bench/flush_cache.c - gcc bench/flush_cache.c -o bench/flush_cache diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/build.properties b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/build.properties deleted file mode 100644 index 77de8ba3..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/build.properties +++ /dev/null @@ -1,16 +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 -############################################################################## - - -src = . -dist =. -classes.dir = ./build -web.dir = ../Servlet_HTML - -j2ee = REPLACED_RUBBOS_APP_TOOLS/j2sdkee1.3.1 diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk deleted file mode 100644 index 407bc25d..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/config.mk +++ /dev/null @@ -1,36 +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 -############################################################################## - -## Environment variables -JAVA = $(JAVA_HOME)/bin/java -JAVAC = $(JAVA_HOME)/bin/javac -JAVACOPTS = -deprecation -JAVACC = $(JAVAC) $(JAVACOPTS) -RMIC = $(JAVA_HOME)/bin/rmic -RMIREGISTRY= $(JAVA_HOME)/bin/rmiregistry -CLASSPATH = .:$(J2EE_HOME)/lib/j2ee.jar:$(JAVA_HOME)/jre/lib/rt.jar:$(CATALINA_HOME)/common/lib/servlet-api.jar -JAVADOC = $(JAVA_HOME)/bin/javadoc -JAR = $(JAVA_HOME)/bin/jar - -GENIC = ${JONAS_ROOT}/bin/unix/GenIC - -MAKE = gmake -CP = /bin/cp -RM = /bin/rm -MKDIR = /bin/mkdir - - -# EJB server: supported values are jonas or jboss -EJB_SERVER = jonas - -# DB server: supported values are MySQL or PostgreSQL -DB_SERVER = MySQL - -%.class: %.java - ${JAVACC} -classpath ${CLASSPATH} $< diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/rubbos.properties.template b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/rubbos.properties.template deleted file mode 100644 index 33aa46e9..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/rubbos.properties.template +++ /dev/null @@ -1,85 +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 -############################################################################## - - -# HTTP server information -httpd_hostname = REPLACED_WEB_SERVER -httpd_port = 8000 - -# C/JDBC server to monitor (if any) -cjdbc_hostname = - -# Precise which version to use. Valid options are : PHP, Servlets, EJB -httpd_use_version = Servlets - -# EJB server information -ejb_server = -ejb_html_path = -ejb_script_path = - -# Servlets server information -servlets_server = REPLACED_APPLICATION_SERVER -servlets_html_path = /rubbos -servlets_script_path = /rubbos/servlet - -# PHP information -php_html_path = /PHP -php_script_path = /PHP - -#Database information -database_master_server = REPLACED_DB_SERVER - -database_slave_servers = -workload_remote_client_nodes = REPLACED_CLIENT_SERVERS -workload_remote_client_command = REPLACED_RUBBOS_APP_TOOLS/jdk1.6.0_27/bin/java -classpath .:REPLACED_RUBBOS_HOME/Client/:REPLACED_RUBBOS_HOME/Client/rubbos_client.jar -Xms512m -Xmx2048m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - -workload_number_of_clients_per_node = REPLACED_NUMBER_OF_CLIENTS_PER_NODE - -# Workload: precise which transition table to use -workload_user_transition_table = REPLACED_RUBBOS_HOME/workload/user_transitions.txt -workload_author_transition_table = REPLACED_RUBBOS_HOME/workload/author_transitions.txt -workload_number_of_columns = 24 -workload_number_of_rows = 26 -workload_maximum_number_of_transitions = 1000 -workload_use_tpcw_think_time = yes -workload_number_of_stories_per_page = 20 - -workload_up_ramp_time_in_ms = 15000 -workload_up_ramp_slowdown_factor = 2 - -workload_session_run_time_in_ms = 60000 - -workload_down_ramp_time_in_ms = 10000 -workload_down_ramp_slowdown_factor = 3 -workload_percentage_of_author = 10 - -# Users policy -database_number_of_authors = 50 -database_number_of_users = 500000 - -# Stories policy -database_story_dictionnary = REPLACED_RUBBOS_HOME/database/dictionary -database_story_maximum_length = 1024 -database_oldest_story_year = 1998 -database_oldest_story_month = 1 - -# Comments policy -database_comment_max_length = 1024 - -# Connection timedout settings -connection_time_out_interval = 300 - -# Monitoring Information -monitoring_debug_level = 1 -monitoring_program = REPLACED_RUBBOS_APP/sysstat-9.0.6/bin/sar -monitoring_options = -u ALL -I SUM -monitoring_sampling_in_seconds = 1 -monitoring_rsh = /usr/bin/ssh -monitoring_scp = /usr/bin/scp -monitoring_gnuplot_terminal = png diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh deleted file mode 100755 index 5e8a6e95..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/files/run_emulator.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -############################################################################## -# 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 -############################################################################## - -## Usage: run_emulator.sh -echo "==> Rubbos emulator start $(date)" - -REPLACED_RUBBOS_APP_TOOLS/jdk1.6.0_27/bin/java -classpath .:REPLACED_RUBBOS_HOME/Client:REPLACED_RUBBOS_HOME/Client/rubbos_client.jar -Xms512m -Xmx2048m -Dhttp.keepAlive=true -Dhttp.maxConnections=1000000 edu.rice.rubbos.client.ClientEmulator - -echo "==> Rubbos emulator end $(date)" diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp deleted file mode 100644 index aeb1f12f..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_off.pp +++ /dev/null @@ -1,103 +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_client::rubbos_client_off { - - include params::rubbos_params - - # Declare some variables - $rubbos_home = $params::rubbos_params::rubbos_home - - # build.properties - file {'${rubbos_home}/build.properties': - ensure => absent, - path => "${rubbos_home}/build.properties", - show_diff => false, - backup => false, - } - - # config.mk - file {'${rubbos_home}/config.mk': - ensure => absent, - path => "${rubbos_home}/config.mk", - show_diff => false, - backup => false, - } - - # Makefile - file {'${rubbos_home}/Makefile': - ensure => absent, - path => "${rubbos_home}/Makefile", - show_diff => false, - backup => false, - } - - # Client/rubbos.properties.template - file {'${rubbos_home}/Client/rubbos.properties.template': - ensure => absent, - path => "${rubbos_home}/Client/rubbos.properties.template", - show_diff => false, - backup => false, - } - - # bench/run_emulator.sh - file {'${rubbos_home}/bench/run_emulator.sh': - ensure => absent, - path => "${rubbos_home}/bench/run_emulator.sh", - show_diff => false, - backup => false, - } - - file {'${rubbos_home}/Client.tar.gz': - ensure => absent, - path => "${rubbos_home}/Client.tar.gz", - backup => false, - } - - file {'${rubbos_home}/Client': - ensure => absent, - path => "${rubbos_home}/Client", - force => true, - recurse => true, - show_diff => false, - backup => false, - } - - file {'${rubbos_home}/workload.tar.gz': - ensure => absent, - path => "${rubbos_home}/workload.tar.gz", - backup => false, - } - - file {'${rubbos_home}/workload': - ensure => absent, - path => "${rubbos_home}/workload", - force => true, - recurse => true, - show_diff => false, - backup => false, - } - - file {'${rubbos_home}/database.tar.gz': - ensure => absent, - path => "${rubbos_home}/database.tar.gz", - backup => false, - } - - file {'${rubbos_home}/database': - ensure => absent, - path => "${rubbos_home}/database", - force => true, - recurse => true, - show_diff => false, - backup => false, - } - -} diff --git a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp b/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp deleted file mode 100644 index 7cda7e14..00000000 --- a/testsuites/rubbos/puppet_manifests/modules/rubbos_client/manifests/rubbos_client_on.pp +++ /dev/null @@ -1,179 +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_client::rubbos_client_on { - - include params::rubbos_params - require rubbos_common::rubbos_common_on - require rubbos_monitor::rubbos_monitor_on - - # Declare some variables - $rubbos_app_tools = $params::rubbos_params::rubbos_app_tools - $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 needed tools - file {'${rubbos_app_tools}/j2sdkee1.3.1.jar.gz': - ensure => file, - path => "${rubbos_app_tools}/j2sdkee1.3.1.jar.gz", - source => "puppet:///modules/rubbos_common/j2sdkee1.3.1.jar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app_tools}/j2sdkee1.3.1.jar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/j2sdkee1.3.1.jar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app_tools}/j2sdkee1.3.1.jar.gz'], - } - - file {'${rubbos_app_tools}/apache-ant-1.6.5.tar.gz': - ensure => file, - path => "${rubbos_app_tools}/apache-ant-1.6.5.tar.gz", - source => "puppet:///modules/rubbos_common/apache-ant-1.6.5.tar.gz", - backup => false, - } - - exec {'tar xzvf ${rubbos_app_tools}/apache-ant-1.6.5.tar.gz': - cwd => "${rubbos_app_tools}", - command => "tar xzvf ${rubbos_app_tools}/apache-ant-1.6.5.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_app_tools}/apache-ant-1.6.5.tar.gz'], - } - - # Prepare client codes and files - file {'${rubbos_home}/Client.tar.gz': - ensure => file, - path => "${rubbos_home}/Client.tar.gz", - source => "puppet:///modules/rubbos_client/Client.tar.gz", - backup => false, - } - - exec {'tar xvzf ${rubbos_home}/Client.tar.gz': - cwd => "${rubbos_home}", - command => "tar xvzf ${rubbos_home}/Client.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_home}/Client.tar.gz'], - } - - file {'${rubbos_home}/workload.tar.gz': - ensure => file, - path => "${rubbos_home}/workload.tar.gz", - source => "puppet:///modules/rubbos_client/workload.tar.gz", - backup => false, - } - - exec {'tar xvzf ${rubbos_home}/workload.tar.gz': - cwd => "${rubbos_home}", - command => "tar xvzf ${rubbos_home}/workload.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_home}/workload.tar.gz'], - } - - file {'${rubbos_home}/database.tar.gz': - ensure => file, - path => "${rubbos_home}/database.tar.gz", - source => "puppet:///modules/rubbos_client/database.tar.gz", - backup => false, - } - - exec {'tar xvzf ${rubbos_home}/database.tar.gz': - cwd => "${rubbos_home}", - command => "tar xvzf ${rubbos_home}/database.tar.gz", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => File['${rubbos_home}/database.tar.gz'], - } - - # build.properties - file {'${rubbos_home}/build.properties': - ensure => file, - path => "${rubbos_home}/build.properties", - source => "puppet:///modules/rubbos_client/build.properties", - show_diff => false, - backup => false, - } - - # config.mk - file {'${rubbos_home}/config.mk': - ensure => file, - path => "${rubbos_home}/config.mk", - source => "puppet:///modules/rubbos_client/config.mk", - show_diff => false, - backup => false, - } - - # Makefile - file {'${rubbos_home}/Makefile': - ensure => file, - path => "${rubbos_home}/Makefile", - source => "puppet:///modules/rubbos_client/Makefile", - show_diff => false, - backup => false, - } - - # Client/rubbos.properties.template - file {'${rubbos_home}/Client/rubbos.properties.template': - ensure => file, - path => "${rubbos_home}/Client/rubbos.properties.template", - source => "puppet:///modules/rubbos_client/rubbos.properties.template", - show_diff => false, - backup => false, - require => Exec['tar xvzf ${rubbos_home}/Client.tar.gz'], - } - - # bench/executable scripts - file {'${rubbos_home}/bench/run_emulator.sh': - ensure => file, - path => "${rubbos_home}/bench/run_emulator.sh", - source => "puppet:///modules/rubbos_client/run_emulator.sh", - backup => false, - } - - # Build rubbos_client.jar - exec {'ant clean': - cwd => "${rubbos_home}/Client", - command => "${rubbos_app_tools}/apache-ant-1.6.5/bin/ant clean", - environment => ["JAVA_HOME=${rubbos_app_tools}/jdk1.6.0_27","ANT_HOME=${rubbos_app_tools}/apache-ant-1.6.5"], - path => [ - "/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin", - "${rubbos_app_tools}/jdk1.6.0_27/bin", - "${rubbos_app_tools}/jdk1.6.0_27/jre/bin", - "${rubbos_app_tools}/apache-ant-1.6.5/bin"], - require => [ - Exec['tar xzvf ${rubbos_app_tools}/j2sdkee1.3.1.jar.gz'], - Exec['tar xzvf ${rubbos_app_tools}/apache-ant-1.6.5.tar.gz'], - File['${rubbos_home}/build.properties'], - File['${rubbos_home}/Makefile'], - File['${rubbos_home}/config.mk'], - Exec['tar xvzf ${rubbos_home}/Client.tar.gz']], - } - - exec {'ant jar': - cwd => "${rubbos_home}/Client", - command => "${rubbos_app_tools}/apache-ant-1.6.5/bin/ant jar", - environment => ["JAVA_HOME=${rubbos_app_tools}/jdk1.6.0_27","ANT_HOME=${rubbos_app_tools}/apache-ant-1.6.5"], - path => [ - "/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin", - "${rubbos_app_tools}/jdk1.6.0_27/bin", - "${rubbos_app_tools}/jdk1.6.0_27/jre/bin", - "${rubbos_app_tools}/apache-ant-1.6.5/bin"], - subscribe => Exec['ant clean'], - } - - # Change owner and group for the Client folder - exec {'chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/Client': - cwd => "${rubbos_home}", - command => "chown -R ${rubbos_os_username}:${rubbos_os_usergroup} ${rubbos_home}/Client", - path => ["/bin","/sbin","/usr/bin","/usr/sbin","/usr/local/bin","/usr/local/sbin"], - require => Exec['ant jar'], - } - -} -- cgit 1.2.3-korg