diff --git a/core/config/PipelineConfig.cpp b/core/config/PipelineConfig.cpp index 33cf8ce6df..e0642b6ee1 100644 --- a/core/config/PipelineConfig.cpp +++ b/core/config/PipelineConfig.cpp @@ -357,6 +357,7 @@ bool PipelineConfig::Parse() { mLogstore, mRegion); } + mHasNativeProcessor = true; } else { mHasNativeProcessor = true; } diff --git a/core/dependencies.cmake b/core/dependencies.cmake index 7d35e614a0..d3cf2f042e 100644 --- a/core/dependencies.cmake +++ b/core/dependencies.cmake @@ -414,7 +414,7 @@ macro(link_spl target_name) find_library(LIB_FOUND "libloongcollector_spl.a") if (NOT LIB_FOUND) - message(FATAL_ERROR "Please upgrade your development image to compile SPL feature!") + message(FATAL_ERROR "Please upgrade your development image to compile!") endif() target_link_libraries(${target_name} "libloongcollector_spl.a") diff --git a/docker/Dockerfile.e2e-test b/docker/Dockerfile.e2e-test index e2acd47d42..896acc710f 100644 --- a/docker/Dockerfile.e2e-test +++ b/docker/Dockerfile.e2e-test @@ -1,11 +1,15 @@ -FROM python:3.8 +FROM golang:1.19.10 RUN mkdir -p /tmp/loongcollector WORKDIR /root COPY . ./loongcollector +RUN apt-get update +RUN apt-get -y install python3-setuptools +RUN apt-get -y install python3-pip + WORKDIR /root/loongcollector/test -RUN pip3 install -r requirements.txt +RUN pip3 install -r requirements.txt --break-system-packages CMD ["sh", "-c", "while true; do sleep 3600; done"] \ No newline at end of file diff --git a/test/engine/cleanup/chaos.go b/test/engine/cleanup/chaos.go index f9e171f793..9b31f2f840 100644 --- a/test/engine/cleanup/chaos.go +++ b/test/engine/cleanup/chaos.go @@ -50,6 +50,9 @@ func DestoryAllChaos(ctx context.Context) (context.Context, error) { case "daemonset", "deployment": k8sEnv := setup.Env.(*setup.K8sEnv) chaosDir := filepath.Join("test_cases", "chaos") + if _, err := os.Stat(chaosDir); os.IsNotExist(err) { + return ctx, nil + } err := filepath.Walk(chaosDir, func(path string, info os.FileInfo, err error) error { if err != nil { return err diff --git a/test/engine/setup/docker_compose.go b/test/engine/setup/docker_compose.go index 3a78dfb710..2993b62e13 100644 --- a/test/engine/setup/docker_compose.go +++ b/test/engine/setup/docker_compose.go @@ -125,7 +125,12 @@ func (d *DockerComposeEnv) Clean() error { } func (d *DockerComposeEnv) ExecOnLogtail(command string) (string, error) { - return "", fmt.Errorf("not implemented") + // exec on host of docker compose + fmt.Println(command) + cmd := exec.Command("sh", "-c", command) + output, err := cmd.CombinedOutput() + fmt.Println(string(output)) + return string(output), err } func (d *DockerComposeEnv) ExecOnSource(ctx context.Context, command string) (string, error) {