From e65475cc1db3e38c1a3bfdc51de24d42f30947c8 Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Tue, 23 Mar 2021 18:05:04 +0800
Subject: [PATCH] update docker cluster script

---
 .../clusterEnvSetup/buildClusterEnv.sh        | 41 +++++++++----------
 1 file changed, 20 insertions(+), 21 deletions(-)

diff --git a/tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh b/tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
index 0057a970ca..60c81cd82b 100755
--- a/tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
+++ b/tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh
@@ -68,20 +68,14 @@ function prepareBuild {
     rm -rf $CURR_DIR/../../../../release/*
   fi
 
-  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    
-    echo $CURR_DIR
-    echo $IN_TDINTERNAL
-    echo "generating TDeninger packages"
-    if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
-      pwd
-      ./release.sh -v cluster -n $VERSION >> /dev/null 2>&1
-    else
-      pwd
-      ./release.sh -v edge -n $VERSION >> /dev/null 2>&1
-    fi
+  cd $CURR_DIR/../../../../packaging 
 
-    if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
+  if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
+    if [ ! -e $DOCKER_DIR/TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz ] || [ ! -e $DOCKER_DIR/TDengine-enterprise-arbitrator-$VERSION-Linux-x64.tar.gz ]; then
+              
+      echo "generating TDeninge enterprise packages"
+      ./release.sh -v cluster -n $VERSION >> /dev/null 2>&1
+      
       if [ ! -e $CURR_DIR/../../../../release/TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz ]; then
         echo "no TDengine install package found"
         exit 1
@@ -91,7 +85,17 @@ function prepareBuild {
         echo "no arbitrator install package found"
         exit 1
       fi
-    else
+
+      cd $CURR_DIR/../../../../release
+      mv TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
+      mv TDengine-enterprise-arbitrator-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
+    fi
+  else
+    if [ ! -e $DOCKER_DIR/TDengine-server-$VERSION-Linux-x64.tar.gz ] || [ ! -e $DOCKER_DIR/TDengine-arbitrator-$VERSION-Linux-x64.tar.gz ]; then
+
+      echo "generating TDeninge community packages"
+      ./release.sh -v edge -n $VERSION >> /dev/null 2>&1
+      
       if [ ! -e $CURR_DIR/../../../../release/TDengine-server-$VERSION-Linux-x64.tar.gz ]; then
         echo "no TDengine install package found"
         exit 1
@@ -101,16 +105,11 @@ function prepareBuild {
         echo "no arbitrator install package found"
         exit 1
       fi
-    fi
 
-    cd $CURR_DIR/../../../../release
-    if [[ "$CURR_DIR" == *"$IN_TDINTERNAL"* ]]; then
-      mv TDengine-enterprise-server-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
-      mv TDengine-enterprise-arbitrator-$VERSION-Linux-x64.tar.gz $DOCKER_DIR
-    else
+      cd $CURR_DIR/../../../../release
       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
-- 
GitLab