hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-07-27 14:59:49 +03:00
parent cfa07c69ff 5612896b80
commit ab4ae282a4
12 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BUILD/mdbci/copy_repos.sh
View File

@ -38,3 +38,5 @@ $(<${script_dir}/templates/repository-config/deb.json.template)
" 2> /dev/null > ${path_prefix}/${platform}_${platform_version}.json " 2> /dev/null > ${path_prefix}/${platform}_${platform_version}.json
fi fi
cd $dir cd $dir
${mdbci_dir}/mdbci generate-product-repositories --product maxscale_ci --product-version $target

3
BUILD/mdbci/templates/install.json.template
View File

@ -5,7 +5,8 @@
"box" : "$box", "box" : "$box",
"memory_size" : "4096", "memory_size" : "4096",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale",
"version" : "${old_target}"
} }
} }

13
BUILD/mdbci/upgrade_test.sh
View File

@ -33,11 +33,8 @@ if [ -d "install_$box" ]; then
${mdbci_dir}/mdbci destroy $name ${mdbci_dir}/mdbci destroy $name
fi fi
${mdbci_dir}/repository-config/generate_all.sh repo.d
${mdbci_dir}/repository-config/maxscale-release.sh $old_target repo.d
# starting VM for build # starting VM for build
${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json --repo-dir $dir/repo.d generate $name ${mdbci_dir}/mdbci --override --template $MDBCI_VM_PATH/$name.json generate $name
${mdbci_dir}/mdbci up $name --attempts=1 ${mdbci_dir}/mdbci up $name --attempts=1
if [ $? != 0 ] ; then if [ $? != 0 ] ; then
if [ $? != 0 ] ; then if [ $? != 0 ] ; then
@ -61,12 +58,8 @@ export sshopt="$scpopt $sshuser@$IP"
old_version=`ssh $sshopt "maxscale --version" ` old_version=`ssh $sshopt "maxscale --version" `
rm -rf repo.d ${mdbci_dir}/mdbci setup_repo --product maxscale_ci --product-version ${target} $name/maxscale
${mdbci_dir}/repository-config/generate_all.sh repo.d ${mdbci_dir}/mdbci install_product --product maxscale_ci $name/maxscale
${mdbci_dir}/repository-config/maxscale-ci.sh $target repo.d
${mdbci_dir}/mdbci setup_repo --product maxscale --repo-dir $dir/repo.d $name/maxscale
${mdbci_dir}/mdbci install_product --product maxscale $name/maxscale
res=$? res=$?

8
maxscale-system-test/mdbci/create_config.sh
View File

@ -7,12 +7,6 @@ export script_dir="$(dirname $(readlink -f $0))"
. ${script_dir}/set_run_test_variables.sh . ${script_dir}/set_run_test_variables.sh
${mdbci_dir}/repository-config/generate_all.sh repo.d
${mdbci_dir}/repository-config/maxscale-ci.sh $target repo.d
export repo_dir=$dir/repo.d/
export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null` export provider=`${mdbci_dir}/mdbci show provider $box --silent 2> /dev/null`
export backend_box=${backend_box:-"centos_7_"$provider} export backend_box=${backend_box:-"centos_7_"$provider}
@ -33,7 +27,7 @@ fi
$(<${script_dir}/templates/${template}.json.template) $(<${script_dir}/templates/${template}.json.template)
" 2> /dev/null > ${MDBCI_VM_PATH}/${name}.json " 2> /dev/null > ${MDBCI_VM_PATH}/${name}.json
${mdbci_dir}/mdbci --override --template ${MDBCI_VM_PATH}/${name}.json --repo-dir ${repo_dir} generate $name ${mdbci_dir}/mdbci --override --template ${MDBCI_VM_PATH}/${name}.json generate $name
mkdir ${MDBCI_VM_PATH}/$name/cnf mkdir ${MDBCI_VM_PATH}/$name/cnf
cp -r ${script_dir}/cnf/* ${MDBCI_VM_PATH}/$name/cnf/ cp -r ${script_dir}/cnf/* ${MDBCI_VM_PATH}/$name/cnf/

9
maxscale-system-test/mdbci/run_test_snapshot.sh
View File

@ -43,8 +43,6 @@ done
touch ${snapshot_lock_file} touch ${snapshot_lock_file}
echo $JOB_NAME-$BUILD_NUMBER >> ${snapshot_lock_file} echo $JOB_NAME-$BUILD_NUMBER >> ${snapshot_lock_file}
export repo_dir=$dir/repo.d/
${mdbci_dir}/mdbci snapshot revert --path-to-nodes $name --snapshot-name $snapshot_name ${mdbci_dir}/mdbci snapshot revert --path-to-nodes $name --snapshot-name $snapshot_name
if [ $? != 0 ]; then if [ $? != 0 ]; then
@ -60,14 +58,11 @@ fi
. ${script_dir}/set_env.sh "$name" . ${script_dir}/set_env.sh "$name"
${mdbci_dir}/repository-config/maxscale-ci.sh $target repo.d
${mdbci_dir}/mdbci sudo --command 'yum remove maxscale -y' $name/maxscale ${mdbci_dir}/mdbci sudo --command 'yum remove maxscale -y' $name/maxscale
${mdbci_dir}/mdbci sudo --command 'yum clean all' $name/maxscale ${mdbci_dir}/mdbci sudo --command 'yum clean all' $name/maxscale
${mdbci_dir}/mdbci setup_repo --product maxscale $name/maxscale --repo-dir $repo_dir ${mdbci_dir}/mdbci setup_repo --product maxscale_ci --product-version ${target} $name/maxscale
${mdbci_dir}/mdbci install_product --product maxscale $name/maxscale --repo-dir $repo_dir ${mdbci_dir}/mdbci install_product --product maxscale_ci $name/maxscale
checkExitStatus $? "Error installing Maxscale" $snapshot_lock_file checkExitStatus $? "Error installing Maxscale" $snapshot_lock_file

3
maxscale-system-test/mdbci/templates/big.json.template
View File

@ -145,7 +145,8 @@
"hostname" : "maxscale", "hostname" : "maxscale",
"box" : "centos_7_aws_large", "box" : "centos_7_aws_large",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
} }

3
maxscale-system-test/mdbci/templates/big15.json.template
View File

@ -222,7 +222,8 @@
"hostname" : "maxscale", "hostname" : "maxscale",
"box" : "centos_7_aws_large", "box" : "centos_7_aws_large",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
} }

3
maxscale-system-test/mdbci/templates/default.json.template
View File

@ -110,7 +110,8 @@
"box" : "${box}", "box" : "${box}",
"memory_size" : "${vm_memory}", "memory_size" : "${vm_memory}",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
} }

3
maxscale-system-test/mdbci/templates/nogalera.json.template
View File

@ -58,7 +58,8 @@
"box" : "${box}", "box" : "${box}",
"memory_size" : "${vm_memory}", "memory_size" : "${vm_memory}",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
} }

3
maxscale-system-test/mdbci/templates/performance.json.template
View File

@ -60,7 +60,8 @@
"box" : "###box###", "box" : "###box###",
"memory_size" : "2048", "memory_size" : "2048",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
} }

6
maxscale-system-test/mdbci/templates/twomaxscales.json.template
View File

@ -58,7 +58,8 @@
"box" : "${box}", "box" : "${box}",
"memory_size" : "${vm_memory}", "memory_size" : "${vm_memory}",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
}, },
@ -69,7 +70,8 @@
"box" : "${box}", "box" : "${box}",
"memory_size" : "${vm_memory}", "memory_size" : "${vm_memory}",
"product" : { "product" : {
"name": "maxscale" "name" : "maxscale_ci",
"version" : "${target}"
} }
} }

6
maxscale-system-test/utilities.cmake
View File

@ -4,6 +4,9 @@ function(add_template name template)
set(CNF_TEMPLATES "${CNF_TEMPLATES}{\"${name}\",\"${template}\"}," CACHE INTERNAL "") set(CNF_TEMPLATES "${CNF_TEMPLATES}{\"${name}\",\"${template}\"}," CACHE INTERNAL "")
endfunction() endfunction()
# Default test timeout
set(TIMEOUT 900)
# This functions adds a source file as an executable, links that file against # This functions adds a source file as an executable, links that file against
# the common test core and creates a test from it. The first parameter is the # the common test core and creates a test from it. The first parameter is the
# source file, the second is the name of the executable and the test and the # source file, the second is the name of the executable and the test and the
@ -26,6 +29,7 @@ function(add_test_executable source name template)
get_property(prev_labels TEST ${name} PROPERTY LABELS) get_property(prev_labels TEST ${name} PROPERTY LABELS)
set_property(TEST ${name} PROPERTY LABELS ${label} ${prev_labels}) set_property(TEST ${name} PROPERTY LABELS ${label} ${prev_labels})
endforeach() endforeach()
set_property(TEST ${name} PROPERTY TIMEOUT ${TIMEOUT})
endfunction() endfunction()
# Same as add_test_executable, but do not add executable into tests list # Same as add_test_executable, but do not add executable into tests list
@ -39,6 +43,7 @@ endfunction()
function(add_test_derived name executable template) function(add_test_derived name executable template)
add_template(${name} ${template}) add_template(${name} ${template})
add_test(NAME ${name} COMMAND ${CMAKE_BINARY_DIR}/${executable} ${name} WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) add_test(NAME ${name} COMMAND ${CMAKE_BINARY_DIR}/${executable} ${name} WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_property(TEST ${name} PROPERTY TIMEOUT ${TIMEOUT})
list(REMOVE_AT ARGV 0 1 2) list(REMOVE_AT ARGV 0 1 2)
@ -61,6 +66,7 @@ function(add_test_script name script template labels)
get_property(prev_labels TEST ${name} PROPERTY LABELS) get_property(prev_labels TEST ${name} PROPERTY LABELS)
set_property(TEST ${name} PROPERTY LABELS ${label} ${prev_labels}) set_property(TEST ${name} PROPERTY LABELS ${label} ${prev_labels})
endforeach() endforeach()
set_property(TEST ${name} PROPERTY TIMEOUT ${TIMEOUT})
endfunction() endfunction()
# Label a list of tests as heavy, long running tests # Label a list of tests as heavy, long running tests