honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

jenkin scripts modification 

1) client_tests_url, switch to JDK6
2) build_ranodmization, add jvm options randomization
This commit is contained in:
mrsolo 2013-11-21 12:08:04 -08:00
parent 0d1bebb32c
commit 5cd780846b
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dev-tools/build_randomization.rb
View File

@ -51,16 +51,26 @@ end
# given a jdk directory selection, generate revelant environment variables # given a jdk directory selection, generate revelant environment variables
def get_env_matrix(data_array) def get_env_matrix(data_array)
#refactoring target
es_test_jvm_option1 = get_random_one(['-client', '-server'])
es_test_jvm_option2 = get_random_one(['-XX:+UseConcMarkSweepGC', '-XX:+UseParallelGC', '-XX:+UseSerialGC',
'-XX:+UseG1GC'])
es_test_jvm_option3 = get_random_one(['-XX:+UseCompressedOops', '-XX:-UseCompressedOops'])
es_node_mode = get_random_one(['local', 'network']) es_node_mode = get_random_one(['local', 'network'])
tests_nightly = get_random_one([true, false]) tests_nightly = get_random_one([true, false])
#build_desc = "%s,%s,%s%s %s %s"%[File.basename(x), es_node_mode, tests_nightly, es_test_jvm_option1, es_test_jvm_option2, es_test_jvm_option3]
[*data_array].map do |x| [*data_array].map do |x|
{ {
'PATH' => File.join(x,'bin') + ':' + ENV['PATH'], 'PATH' => File.join(x,'bin') + ':' + ENV['PATH'],
'JAVA_HOME' => x, 'JAVA_HOME' => x,
'BUILD_DESC' => "%s,%s,nightly=%s"%[File.basename(x), es_node_mode, tests_nightly], 'BUILD_DESC' => "%s,%s,%s%s,%s %s"%[File.basename(x), es_node_mode, tests_nightly ? 'nightly,':'',
es_test_jvm_option1[1..-1], es_test_jvm_option2[4..-1], es_test_jvm_option3[4..-1]],
'es.node.mode' => es_node_mode, 'es.node.mode' => es_node_mode,
'tests.nightly' => tests_nightly 'tests.nightly' => tests_nightly,
'ES_TESTS_JVM_OPTION1' => es_test_jvm_option1,
'ES_TESTS_JVM_OPTION2' => es_test_jvm_option2,
'ES_TESTS_JVM_OPTION3' => es_test_jvm_option3,
} }
end end
end end

4
dev-tools/client_tests_urls.prop
View File

@ -15,5 +15,5 @@
# #
# This is used for client testings to pull in master, 090 bits # This is used for client testings to pull in master, 090 bits
# #
URL_MASTER=http://s3-us-west-2.amazonaws.com/build.elasticsearch.org/origin/master/nightly/JDK7/elasticsearch-1.0.0.Beta2-SNAPSHOT.zip URL_MASTER=http://s3-us-west-2.amazonaws.com/build.elasticsearch.org/origin/master/nightly/JDK6/elasticsearch-1.0.0.Beta2-SNAPSHOT.zip
URL_090=http://s3-us-west-2.amazonaws.com/build.elasticsearch.org/origin/0.90/nightly/JDK7/elasticsearch-0.90.8-SNAPSHOT.zip URL_090=http://s3-us-west-2.amazonaws.com/build.elasticsearch.org/origin/0.90/nightly/JDK6/elasticsearch-0.90.8-SNAPSHOT.zip