xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[TD-3413]<test>: make docker cluster support enterprise

This commit is contained in:
Ping Xiao 2021-03-22 14:19:49 +08:00
parent 3b4a2ecce9
commit 720661366a
2 changed files with 44 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/pytest/cluster/clusterEnvSetup/basic.py
View File

@ -96,7 +96,7 @@ parser.add_argument(
'-v', '-v',
'--version', '--version',
action='store', action='store',
default='2.0.17.1', default='2.0.18.1',
type=str, type=str,
help='the version of the cluster to be build, Default is 2.0.17.1') help='the version of the cluster to be build, Default is 2.0.17.1')
parser.add_argument( parser.add_argument(

55
tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
View File

@ -1,6 +1,7 @@
#!/bin/bash #!/bin/bash
echo "Executing buildClusterEnv.sh" echo "Executing buildClusterEnv.sh"
CURR_DIR=`pwd` CURR_DIR=`pwd`
IN_TDINTERNAL="community"
if [ $# != 6 ]; then if [ $# != 6 ]; then
echo "argument list need input : " echo "argument list need input : "
@ -68,23 +69,48 @@ function prepareBuild {
fi fi
if [ ! -e $DOCKER_DIR/TDengine-server-$VERSION-Linux-x64.tar.gz ] || [ ! -e $DOCKER_DIR/TDengine-arbitrator-$VERSION-Linux-x64.tar.gz ]; then if [ ! -e $DOCKER_DIR/TDengine-server-$VERSION-Linux-x64.tar.gz ] || [ ! -e $DOCKER_DIR/TDengine-arbitrator-$VERSION-Linux-x64.tar.gz ]; then
cd $CURR_DIR/../../../../packaging cd $CURR_DIR/../../../../packaging
echo $CURR_DIR
echo $IN_TDINTERNAL
echo "generating TDeninger packages" echo "generating TDeninger packages"
./release.sh -v edge -n $VERSION >> /dev/null if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
pwd
if [ ! -e $CURR_DIR/../../../../release/TDengine-server-$VERSION-Linux-x64.tar.gz ]; then ./release.sh -v cluster -n $VERSION >> /dev/null 2>&1
echo "no TDengine install package found" else
exit 1 pwd
./release.sh -v edge -n $VERSION >> /dev/null 2>&1
fi fi
if [ ! -e $CURR_DIR/../../../../release/TDengine-arbitrator-$VERSION-Linux-x64.tar.gz ]; then if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
echo "no arbitrator install package found" if [ ! -e $CURR_DIR/../../../../release/TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz ]; then
exit 1 echo "no TDengine install package found"
exit 1
fi
if [ ! -e $CURR_DIR/../../../../release/TDengine-enterprise-arbitrator-$VERSION-Linux-x64.tar.gz ]; then
echo "no arbitrator install package found"
exit 1
fi
else
if [ ! -e $CURR_DIR/../../../../release/TDengine-server-$VERSION-Linux-x64.tar.gz ]; then
echo "no TDengine install package found"
exit 1
fi
if [ ! -e $CURR_DIR/../../../../release/TDengine-arbitrator-$VERSION-Linux-x64.tar.gz ]; then
echo "no arbitrator install package found"
exit 1
fi
fi fi
cd $CURR_DIR/../../../../release cd $CURR_DIR/../../../../release
mv TDengine-server-$VERSION-Linux-x64.tar.gz $DOCKER_DIR if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
mv TDengine-arbitrator-$VERSION-Linux-x64.tar.gz $DOCKER_DIR mv TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
mv TDengine-enterprise-arbitrator-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
else
mv TDengine-server-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
mv TDengine-arbitrator-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
fi
fi fi
rm -rf $DOCKER_DIR/*.yml rm -rf $DOCKER_DIR/*.yml
@ -99,7 +125,12 @@ function clusterUp {
cd $DOCKER_DIR cd $DOCKER_DIR
docker_run="PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose -f docker-compose.yml " if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
docker_run="PACKAGE=TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine--enterprisearbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-enterprise-server-$VERSION DIR2=TDengine-enterprise-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose -f docker-compose.yml "
else
docker_run="PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz TARBITRATORPKG=TDengine-arbitrator-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION DIR2=TDengine-arbitrator-$VERSION VERSION=$VERSION DATADIR=$DOCKER_DIR docker-compose -f docker-compose.yml "
fi
if [ $NUM_OF_NODES -ge 2 ];then if [ $NUM_OF_NODES -ge 2 ];then
echo "create $NUM_OF_NODES dnodes" echo "create $NUM_OF_NODES dnodes"
for((i=3;i<=$NUM_OF_NODES;i++)) for((i=3;i<=$NUM_OF_NODES;i++))