From 9c4ab70b1bafb624f7f71d748467a36d4eab6478 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Fri, 24 Dec 2021 20:06:28 +0800
Subject: [PATCH] Feature/sangshuduo/td 12505 taosadapter internal (#9373)

* [TD-12505]<feature>(taosAdapter): taosadapter internal

* update taosadapter to support taosadapter internal

* (taosAdapter) update Jenkinsfile
---
 Jenkinsfile                | 1 +
 cmake/define.inc           | 4 +++-
 packaging/release.sh       | 4 ++++
 src/plugins/CMakeLists.txt | 2 ++
 src/plugins/taosadapter    | 2 +-
 5 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 35a2bf8260..03af9ba244 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -367,6 +367,7 @@ pipeline {
               else{
                 sh'''
                   cd ${WKC}
+                  git reset --hard HEAD~10
                   git fetch
                   git checkout ${CHANGE_BRANCH}
                   git pull
diff --git a/cmake/define.inc b/cmake/define.inc
index 9e39dc9463..00fd015b4c 100755
--- a/cmake/define.inc
+++ b/cmake/define.inc
@@ -136,7 +136,6 @@ IF (TD_ALPINE)
   MESSAGE(STATUS "aplhine is defined")
 ENDIF ()
 
-
 IF ("${BUILD_HTTP}" STREQUAL "")
   IF (TD_LINUX)
     IF (TD_ARM_32)
@@ -153,6 +152,9 @@ ELSEIF (${BUILD_HTTP} MATCHES "false")
   SET(TD_BUILD_HTTP FALSE)
 ELSEIF (${BUILD_HTTP} MATCHES "true")
   SET(TD_BUILD_HTTP TRUE)
+ELSEIF (${BUILD_HTTP} MATCHES "internal")
+  SET(TD_BUILD_HTTP FALSE)
+  SET(TD_BUILD_TAOSA_INTERNAL TRUE)
 ELSE ()
   SET(TD_BUILD_HTTP TRUE)
 ENDIF ()
diff --git a/packaging/release.sh b/packaging/release.sh
index 866a21e552..38e5dd929e 100755
--- a/packaging/release.sh
+++ b/packaging/release.sh
@@ -418,6 +418,10 @@ else
     BUILD_HTTP=false
 fi
 
+if [[ "$verMode" == "cluster" ]]; then
+    BUILD_HTTP=internal
+fi
+
 if [[ "$pagMode" == "full" ]]; then
     BUILD_TOOLS=true
 else
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
index c7221a6d30..765c7195cb 100644
--- a/src/plugins/CMakeLists.txt
+++ b/src/plugins/CMakeLists.txt
@@ -8,6 +8,8 @@ IF (TD_BUILD_HTTP)
   MESSAGE("${Yellow} use original embedded httpd ${ColourReset}")
   MESSAGE("")
   ADD_SUBDIRECTORY(http)
+ELSEIF(TD_BUILD_TAOSA_INTERNAL)
+  MESSAGE("${Yellow} use taosa internal as httpd ${ColourReset}")
 ELSE ()
   MESSAGE("")
   MESSAGE("${Green} use taosadapter as httpd ${ColourReset}")
diff --git a/src/plugins/taosadapter b/src/plugins/taosadapter
index 11d1e02255..273b5219f8 160000
--- a/src/plugins/taosadapter
+++ b/src/plugins/taosadapter
@@ -1 +1 @@
-Subproject commit 11d1e02255edfeeaa8d5b1f45abfa9637332ce65
+Subproject commit 273b5219f8bcc604e43beebc6f1f95abed85170a
-- 
GitLab