fix image building

Committed-by: [email protected] from Dev container
alibaba · Jan 2, 2025 · 8b983c3 · 8b983c3
1 parent a163cef
commit 8b983c3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/.github/workflows/flex-interactive.yml b/.github/workflows/flex-interactive.yml
@@ -54,7 +54,8 @@ jobs:
     - name: Test gsctl
       env:
         CYPHER_PORT: 7688
-        COORDINATOR_PORT: 8081
+        COORDINATOR_PORT: 8080
+        COORDINATOR_ENDPOINT: "http://127.0.0.1:8080"
       run: |
         # install gsctl
         python3 -m pip install ${GITHUB_WORKSPACE}/python/dist/*.whl

diff --git a/flex/CMakeLists.txt b/flex/CMakeLists.txt
@@ -16,6 +16,7 @@ option(BUILD_ODPS_FRAGMENT_LOADER "Whether to build odps fragment loader" OFF)
 option(USE_PTHASH "Whether to use pthash" OFF)
 option(OPTIMIZE_FOR_HOST "Whether to optimize on host" ON) # Whether to build optimized code on host
 option(USE_STATIC_ARROW "Whether to use static arrow" ON) # Whether to link arrow statically, default is ON
+option(BUILD_WITH_OTEL "Whether to build with opentelemetry-cpp" OFF) # Whether to build with opentelemetry-cpp, default is OFF
 
 #print options
 message(STATUS "Build test: ${BUILD_TEST}")
@@ -164,14 +165,16 @@ endif ()
 find_package(Protobuf REQUIRED)
 include_directories(${Protobuf_INCLUDE_DIRS})
 
-find_package(opentelemetry-cpp CONFIG)
-if (OPENTELEMETRY_CPP_FOUND)
-    message(STATUS "opentelemetry-cpp found")
-    find_package(CURL REQUIRED)
-    add_definitions(-DHAVE_OPENTELEMETRY_CPP)
-else()
-    message(STATUS "opentelemetry-cpp not found, build without opentelemetry-cpp")
-endif ()
+if (BUILD_WITH_OTEL)
+    find_package(opentelemetry-cpp CONFIG)
+    if (OPENTELEMETRY_CPP_FOUND)
+        message(STATUS "opentelemetry-cpp found")
+        find_package(CURL REQUIRED)
+        add_definitions(-DHAVE_OPENTELEMETRY_CPP)
+    else()
+        message(STATUS "opentelemetry-cpp not found, build without opentelemetry-cpp")
+    endif ()
+endif()
 
 # Find Doxygen
 if (BUILD_DOC)

diff --git a/python/graphscope/gsctl/tests/test_interactive.py b/python/graphscope/gsctl/tests/test_interactive.py
@@ -16,6 +16,7 @@
 # limitations under the License.
 #
 
+import os
 import warnings
 
 # Disable warnings
@@ -219,6 +220,8 @@ class ExampleQuery : public CypherReadAppBase<int32_t> {
 
 class TestE2EInteractive(object):
     def setup_class(self):
+        if "COORDINATOR_ENDPOINT" in os.environ:
+            COORDINATOR_ENDPOINT = os.environ["COORDINATOR_ENDPOINT"]
         self.deployment_info = connect_coordinator(COORDINATOR_ENDPOINT)
 
     def test_deployment_info(self):