Changed working dir when running test_udfclient.sh

exasol · Aug 9, 2024 · b9860ac · b9860ac
1 parent a4ee104
commit b9860ac
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/base_test_build_run/Dockerfile
@@ -14,8 +14,10 @@ ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 RUN ./build.sh --lockfile_mode=off --config no-tty -c dbg --config python --config test-binaries-py3
 RUN cp -r -L bazel-bin/* /exaudf
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3_static
+
+WORKDIR /exaudfclient/base
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static
 
 WORKDIR /
 RUN mkdir /exasol_emulator

diff --git a/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-conda/flavor_base/build_run/Dockerfile
@@ -10,7 +10,8 @@ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 RUN ./build.sh --lockfile_mode=off --config no-tty --config optimize --config python --config fast-binary-py3
 RUN cp -r -L bazel-bin/* /exaudf
 
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3
+WORKDIR /exaudfclient/base
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3
 
 WORKDIR /exaudf
 

diff --git a/...ors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile b/...ors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/base_test_build_run/Dockerfile
@@ -14,8 +14,10 @@ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 # We need to build with optimize here, because the debug build fails to run with a runtime linking error regarding protobuf
 RUN ./build.sh --lockfile_mode=off --config no-tty -c dbg --config python --config test-binaries-py3
 RUN cp -r -L bazel-bin/* /exaudf
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3_static
+
+WORKDIR /exaudfclient/base
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static
 
 WORKDIR /
 RUN mkdir /exasol_emulator

diff --git a/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10-cuda-conda/flavor_base/build_run/Dockerfile
@@ -10,7 +10,8 @@ ENV C_INCLUDE_PATH=$C_INCLUDE_PATH:$MAMBA_ROOT_PREFIX/include/
 RUN ./build.sh --lockfile_mode=off --config no-tty --config optimize --config python --config fast-binary-py3
 RUN cp -r -L bazel-bin/* /exaudf
 
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3
+WORKDIR /exaudfclient/base
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3
 
 WORKDIR /exaudf
 

diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/base_test_build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10/flavor_base/base_test_build_run/Dockerfile
@@ -29,8 +29,10 @@ COPY /exaudfclient/ /exaudfclient/
 WORKDIR /exaudfclient/
 RUN ["/bin/bash", "-c", "source /env && bash build.sh --lockfile_mode=off --config no-tty -c dbg --config python --config test-binaries-py3"]
 RUN cp -r -L bazel-bin/* /exaudf
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3_static
+
+WORKDIR /exaudfclient/base
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3_static
 
 WORKDIR /
 RUN mkdir /exasol_emulator

diff --git a/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile b/flavors/template-Exasol-all-python-3.10/flavor_base/build_run/Dockerfile
@@ -28,7 +28,8 @@ WORKDIR /exaudfclient/
 RUN ["/bin/bash", "-c", "source /env && bash build.sh --lockfile_mode=off --config no-tty --config optimize --config python --config fast-binary-py3"]
 RUN cp -r -L bazel-bin/* /exaudf
 
-RUN ./base/test_udfclient.sh /exaudf/exaudfclient_py3
+WORKDIR /exaudfclient/base
+RUN ./test_udfclient.sh /exaudf/exaudfclient_py3
 
 WORKDIR /exaudf