Merge pull request #6921 from taosdata/release/ver-2.0.20.9

modify all release scripts to adding "beta" in package name

alert/release.sh

@@ -7,8 +7,9 @@ set -e
 cpuType=amd64    # [armv6l | arm64 | amd64 | 386]
 osType=linux   # [linux | darwin | windows]
 version=""
+verType=stable   # [stable, beta]
 declare -A archMap=(["armv6l"]="arm" ["arm64"]="arm64" ["amd64"]="x64" ["386"]="x86")
-while getopts "h:c:o:n:" arg
+while getopts "h:c:o:n:V:" arg
 do
   case $arg in
     c)
@@ -23,6 +24,10 @@ do
       #echo "version=$OPTARG"
       version=$(echo $OPTARG)
       ;;
+     V)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;
     h)
       echo "Usage: `basename $0` -c [armv6l | arm64 | amd64 | 386] -o [linux | darwin | windows]"
       exit 0
@@ -55,6 +60,22 @@ cp alert alert.cfg install_driver.sh ./TDengine-alert/.
 cp ../../../debug/build/lib/libtaos.so.${version} ./TDengine-alert/driver/.
 chmod 777 ./TDengine-alert/install_driver.sh
 
-tar -I 'gzip -9' -cf ${startdir}/TDengine-alert-${version}-${osType^}-${archMap[${cpuType}]}.tar.gz TDengine-alert/
+tar -I 'gzip -9' -cf ${scriptdir}/TDengine-alert-${version}-${osType^}-${archMap[${cpuType}]}.tar.gz TDengine-alert/
 rm -rf ./TDengine-alert
 
+
+
+# mv package to comminuty/release/
+pkg_name=TDengine-alert-${version}-${osType^}-${archMap[${cpuType}]}
+
+if [ "$verType" == "beta" ]; then
+  pkg_name=TDengine-alert-${version}-${verType}-${osType^}-${archMap[${cpuType}]}
+elif [ "$verType" == "stable" ]; then
+  pkg_name=${pkg_name}
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
+
+cd ${scriptdir}/../release/
+mv ${scriptdir}/TDengine-alert-${version}-${osType^}-${archMap[${cpuType}]}.tar.gz  ${pkg_name}.tar.gz

cmake/version.inc

@@ -4,7 +4,7 @@ PROJECT(TDengine)
 IF (DEFINED VERNUMBER)
   SET(TD_VER_NUMBER ${VERNUMBER})
 ELSE ()
-  SET(TD_VER_NUMBER "2.0.20.8")
+  SET(TD_VER_NUMBER "2.0.20.9")
 ENDIF ()
 
 IF (DEFINED VERCOMPATIBLE)

packaging/deb/makedeb.sh

@@ -123,7 +123,7 @@ else
 fi
 
 if [ "$verType" == "beta" ]; then
-  debname=${debname}-${verType}".deb"
+  debname="TDengine-server-"${tdengine_ver}-${verType}-${osType}-${cpuType}".deb"
 elif [ "$verType" == "stable" ]; then
   debname=${debname}".deb"
 else
@@ -131,6 +131,8 @@ else
   exit 1
 fi
 
+
+
 # make deb package
 dpkg -b ${pkg_dir} $debname
 echo "make deb package success!"

packaging/docker/dockerManifest.sh

@@ -5,22 +5,28 @@ set -e
 # dockerbuild.sh 
 #             -n [version number]
 #             -p [xxxx]
+#             -V [stable | beta]
 
 # set parameters by default value
-verNumber=""
+version=""
 passWord=""
+verType=""
 
-while getopts "hn:p:" arg
+while getopts "hn:p:V:" arg
 do
   case $arg in
     n)
-      #echo "verNumber=$OPTARG"
+      #echo "version=$OPTARG"
-      verNumber=$(echo $OPTARG)
+      version=$(echo $OPTARG)
       ;;
     p)
       #echo "passWord=$OPTARG"
       passWord=$(echo $OPTARG)
       ;;
+    V)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;    
     h)
       echo "Usage: `basename $0` -n [version number] "
       echo "                      -p [password for docker hub] "
@@ -33,13 +39,34 @@ do
   esac
 done
 
-echo "verNumber=${verNumber}"
+echo "version=${version}"
 
-#docker manifest create -a tdengine/tdengine:${verNumber} tdengine/tdengine-amd64:${verNumber} tdengine/tdengine-aarch64:${verNumber} tdengine/tdengine-aarch32:${verNumber}
+#docker manifest rm tdengine/tdengine
-docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
+#docker manifest rm tdengine/tdengine:${version}
+if [ "$verType" == "beta" ]; then
+  docker manifest create -a tdengine/tdengine-beta:${version} tdengine/tdengine-amd64-beta:${version} tdengine/tdengine-aarch64-beta:${version} tdengine/tdengine-aarch32-beta:${version}
+  docker manifest create -a tdengine/tdengine-beta:latest tdengine/tdengine-amd64-beta:latest tdengine/tdengine-aarch64-beta:latest tdengine/tdengine-aarch32-beta:latest
+  docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
+  docker manifest push tdengine/tdengine-beta:latest
+  docker manifest push tdengine/tdengine-beta:${version}
 
-docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
+elif [ "$verType" == "stable" ]; then
+  docker manifest create -a tdengine/tdengine:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
+  docker manifest create -a tdengine/tdengine:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
+  docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
+  docker manifest push tdengine/tdengine:latest
+    docker manifest push tdengine/tdengine:${version}
 
-docker manifest push tdengine/tdengine:latest
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
 
-# how set latest version ???
+# docker manifest create -a tdengine/${dockername}:${version} tdengine/tdengine-amd64:${version} tdengine/tdengine-aarch64:${version} tdengine/tdengine-aarch32:${version}
+# docker manifest create -a tdengine/${dockername}:latest tdengine/tdengine-amd64:latest tdengine/tdengine-aarch64:latest tdengine/tdengine-aarch32:latest
+
+# docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
+
+# docker manifest push tdengine/tdengine:latest
+
+# # how set latest version ???

packaging/docker/dockerbuild.sh

@@ -1,20 +1,24 @@
 #!/bin/bash
+#
+
 set -e
 #set -x
 
 # dockerbuild.sh 
 #             -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...]  
-#             -f [pkg file]
 #             -n [version number]
 #             -p [password for docker hub]
+#             -V [stable | beta]
+#             -f [pkg file]
 
 # set parameters by default value
-cpuType=amd64
+cpuType=""
-verNumber=""
+version=""
 passWord=""
 pkgFile=""
+verType="stable"
 
-while getopts "hc:n:p:f:" arg
+while getopts "hc:n:p:f:V:" arg
 do
   case $arg in
     c)
@@ -22,8 +26,8 @@ do
       cpuType=$(echo $OPTARG)
       ;;
     n)
-      #echo "verNumber=$OPTARG"
+      #echo "version=$OPTARG"
-      verNumber=$(echo $OPTARG)
+      version=$(echo $OPTARG)
       ;;
     p)
       #echo "passWord=$OPTARG"
@@ -33,11 +37,17 @@ do
       #echo "pkgFile=$OPTARG"
       pkgFile=$(echo $OPTARG)
       ;;
+    V)
+      #echo "verType=$OPTARG"
+      verType=$(echo $OPTARG)
+      ;;
     h)
-      echo "Usage: `basename $0` -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] "      
+      echo "Usage: `basename $0`  -c [aarch32 | aarch64 | amd64 | x86 | mips64 ...] "
-      echo "                      -f [pkg file] "      
       echo "                      -n [version number] "
       echo "                      -p [password for docker hub] "
+      echo "                      -V [stable | beta] "
+      echo "                      -f [pkg file] "
+
       exit 0
       ;;
     ?) #unknow option 
@@ -47,17 +57,44 @@ do
   esac
 done
 
-echo "cpuType=${cpuType} verNumber=${verNumber} pkgFile=${pkgFile} "
+# if [ "$verType" == "beta" ]; then
+#   pkgFile=TDengine-server-${version}-Linux-${cpuType}-${verType}.tar.gz
+# elif [ "$verType" == "stable" ]; then
+#   pkgFile=TDengine-server-${version}-Linux-${cpuType}.tar.gz
+# else
+#   echo "unknow verType, nor stabel or beta"
+#   exit 1
+
+if [ "$verType" == "beta" ]; then
+  dockername=${cpuType}-${verType}
+elif [ "$verType" == "stable" ]; then
+  dockername=${cpuType}
+else
+  echo "unknow verType, nor stabel or beta"
+  exit 1
+fi
+
+
+echo "cpuType=${cpuType} version=${version} pkgFile=${pkgFile} verType=${verType} "
 echo "$(pwd)"
 echo "====NOTES: ${pkgFile} must be in the same directory as dockerbuild.sh===="
 
-dirName=${pkgFile%-Linux*}
+scriptDir=$(dirname $(readlink -f $0))
-#echo "dirName=${dirName}"
+comunityArchiveDir=/nas/TDengine/v$version/community   # community version’package directory
+cd ${scriptDir}
+cp -f ${comunityArchiveDir}/${pkgFile}  .
 
-docker build --rm -f "Dockerfile" -t tdengine/tdengine-${cpuType}:${verNumber} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
+dirName=${pkgFile%-Linux*}
+echo "dirName=${dirName}"
+
+
+docker build --rm -f "Dockerfile" -t tdengine/tdengine-${dockername}:${version} "." --build-arg pkgFile=${pkgFile} --build-arg dirName=${dirName}
 docker login -u tdengine -p ${passWord}  #replace the docker registry username and password
-docker push tdengine/tdengine-${cpuType}:${verNumber}
+docker push tdengine/tdengine-${dockername}:${version}
 
 # set this version to latest version
-docker tag tdengine/tdengine-${cpuType}:${verNumber} tdengine/tdengine-${cpuType}:latest
+docker tag tdengine/tdengine-${dockername}:${version} tdengine/tdengine-${dockername}:latest
-docker push tdengine/tdengine-${cpuType}:latest
+docker push tdengine/tdengine-${dockername}:latest
+
+
+rm -f ${pkgFile}

packaging/rpm/makerpm.sh

@@ -73,7 +73,7 @@ else
 fi
 
 if [ "$verType" == "beta" ]; then
-  rpmname=${rpmname}-${verType}".rpm"
+  rpmname="TDengine-server-"${tdengine_ver}-${verType}-${osType}-${cpuType}".rpm"
 elif [ "$verType" == "stable" ]; then
   rpmname=${rpmname}".rpm"
 else

packaging/tools/makearbi.sh

@@ -47,24 +47,28 @@ mkdir -p ${install_dir}/init.d && cp ${init_file_tarbitrator_rpm} ${install_dir}
 
 cd ${release_dir} 
 
-if [ "$verMode" == "cluster" ]; then
+#  install_dir has been distinguishes  cluster from  edege, so comments this code
-  pkg_name=${install_dir}-${osType}-${cpuType}
+pkg_name=${install_dir}-${osType}-${cpuType}
-elif [ "$verMode" == "edge" ]; then
+
-  pkg_name=${install_dir}-${osType}-${cpuType}
+# if [ "$verMode" == "cluster" ]; then
-else
+#   pkg_name=${install_dir}-${osType}-${cpuType}
-  echo "unknow verMode, nor cluster or edge"
+# elif [ "$verMode" == "edge" ]; then
-  exit 1
+#   pkg_name=${install_dir}-${osType}-${cpuType}
-fi
+# else
+#   echo "unknow verMode, nor cluster or edge"
+#   exit 1
+# fi
 
 if [ "$verType" == "beta" ]; then
-  pkg_name=${pkg_name}-${verType}
+  pkg_name=${install_dir}-${verType}-${osType}-${cpuType} 
-elif [ "$verType" == "stable" ]; then 
+elif [ "$verType" == "stable" ]; then
-  pkg_name=${pkg_name} 
+  pkg_name=${pkg_name}
 else
   echo "unknow verType, nor stabel or beta"
   exit 1
 fi
 
+
 tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
 exitcode=$?
 if [ "$exitcode" != "0" ]; then

packaging/tools/makeclient.sh

@@ -41,10 +41,10 @@ fi
 
 if [ "$osType" != "Darwin" ]; then
   if [ "$pagMode" == "lite" ]; then
-    #strip ${build_dir}/bin/taosd
+    #strip ${build_dir}/bin/taosd 
     strip ${build_dir}/bin/taos
     bin_files="${build_dir}/bin/taos ${script_dir}/remove_client.sh"
-  else
+  else  
     bin_files="${build_dir}/bin/taos ${build_dir}/bin/taosdump ${build_dir}/bin/taosdemo \
                ${script_dir}/remove_client.sh ${script_dir}/set_core.sh ${script_dir}/get_client.sh ${script_dir}/taosd-dump-cfg.gdb"
   fi
@@ -139,7 +139,7 @@ if [[ "$pagMode" != "lite" ]] && [[ "$cpuType" != "aarch32" ]]; then
   cp -r ${examples_dir}/C#     ${install_dir}/examples
 fi
 # Copy driver
-mkdir -p ${install_dir}/driver
+mkdir -p ${install_dir}/driver 
 cp ${lib_files} ${install_dir}/driver
 
 # Copy connector
@@ -168,14 +168,26 @@ fi
 
 # exit 1
 
-cd ${release_dir}
+cd ${release_dir} 
 
-if [ "$verMode" == "cluster" ]; then
+#  install_dir has been distinguishes  cluster from  edege, so comments this code
-  pkg_name=${install_dir}-${osType}-${cpuType}
+pkg_name=${install_dir}-${osType}-${cpuType}
-elif [ "$verMode" == "edge" ]; then
+
-  pkg_name=${install_dir}-${osType}-${cpuType}
+# if [ "$verMode" == "cluster" ]; then
+#   pkg_name=${install_dir}-${osType}-${cpuType}
+# elif [ "$verMode" == "edge" ]; then
+#   pkg_name=${install_dir}-${osType}-${cpuType}
+# else
+#   echo "unknow verMode, nor cluster or edge"
+#   exit 1
+# fi
+
+if [ "$verType" == "beta" ]; then
+  pkg_name=${install_dir}-${verType}-${osType}-${cpuType} 
+elif [ "$verType" == "stable" ]; then
+  pkg_name=${pkg_name}
 else
-  echo "unknow verMode, nor cluster or edge"
+  echo "unknow verType, nor stabel or beta"
   exit 1
 fi
 
@@ -183,15 +195,6 @@ if [ "$pagMode" == "lite" ]; then
   pkg_name=${pkg_name}-Lite
 fi
 
-if [ "$verType" == "beta" ]; then
-  pkg_name=${pkg_name}-${verType}
-elif [ "$verType" == "stable" ]; then
-  pkg_name=${pkg_name}
-else
-  echo "unknow verType, nor stable or beta"
-  exit 1
-fi
-
 if [ "$osType" != "Darwin" ]; then
     tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
 else

packaging/tools/makepkg.sh

@@ -203,21 +203,20 @@ fi
 
 cd ${release_dir}
 
-if [ "$verMode" == "cluster" ]; then
+#  install_dir has been distinguishes  cluster from  edege, so comments this code
-  pkg_name=${install_dir}-${osType}-${cpuType}
+pkg_name=${install_dir}-${osType}-${cpuType}
-elif [ "$verMode" == "edge" ]; then
-  pkg_name=${install_dir}-${osType}-${cpuType}
-else
-  echo "unknow verMode, nor cluster or edge"
-  exit 1
-fi
 
-if [ "$pagMode" == "lite" ]; then
+# if [ "$verMode" == "cluster" ]; then
-  pkg_name=${pkg_name}-Lite
+#   pkg_name=${install_dir}-${osType}-${cpuType}
-fi
+# elif [ "$verMode" == "edge" ]; then
+#   pkg_name=${install_dir}-${osType}-${cpuType}
+# else
+#   echo "unknow verMode, nor cluster or edge"
+#   exit 1
+# fi
 
 if [ "$verType" == "beta" ]; then
-  pkg_name=${pkg_name}-${verType}
+  pkg_name=${install_dir}-${verType}-${osType}-${cpuType} 
 elif [ "$verType" == "stable" ]; then
   pkg_name=${pkg_name}
 else
@@ -225,6 +224,10 @@ else
   exit 1
 fi
 
+if [ "$pagMode" == "lite" ]; then
+  pkg_name=${pkg_name}-Lite
+fi
+
 tar -zcv -f "$(basename ${pkg_name}).tar.gz" $(basename ${install_dir}) --remove-files || :
 exitcode=$?
 if [ "$exitcode" != "0" ]; then

snap/snapcraft.yaml

@@ -1,6 +1,6 @@
 name: tdengine
 base: core18
-version: '2.0.20.8'
+version: '2.0.20.9'
 icon: snap/gui/t-dengine.svg
 summary: an open-source big data platform designed and optimized for IoT. 
 description: |
@@ -72,7 +72,7 @@ parts:
       - usr/bin/taosd
       - usr/bin/taos
       - usr/bin/taosdemo
-      - usr/lib/libtaos.so.2.0.20.5
+      - usr/lib/libtaos.so.2.0.20.9
       - usr/lib/libtaos.so.1
       - usr/lib/libtaos.so