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

do not generate repo.d in run_test

Browse Source
This commit is contained in:
Timofey Turenko
2018-07-25 13:02:20 +03:00
committed by Markus Mäkelä
parent d6be2cb70d
commit d59917673d
8 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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}"
} }
} }