Merge remote-tracking branch 'origin/ci-improvements' into integration_2022_wk03_b

2022-01-19 15:42:09 +01:00
parent c9a8b466fb 425bb14900
commit 5c74bca5b5
22 changed files with 139 additions and 244 deletions
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \ 
    cd cmake_targets && \
    mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja -w USRP --verbose-ci
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib all -w USRP --verbose-ci
@@ -35,4 +35,4 @@ COPY . .
 RUN /bin/sh oaienv && \
    cd cmake_targets && \
    mkdir -p log && \
-    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja -w USRP --verbose-ci
+    ./build_oai --eNB --gNB --RU --UE --nrUE --ninja --build-lib all -w USRP --verbose-ci
@@ -69,6 +69,8 @@ COPY --from=enb-build \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
    /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_enb.so \
    /usr/local/lib/

 COPY --from=enb-base \
@@ -76,6 +76,8 @@ COPY --from=enb-build \
     /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
     /oai-ran/cmake_targets/ran_build/build/libdfts.so \
     /oai-ran/cmake_targets/ran_build/build/liboai_iqplayer.so \
+     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+     /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_enb.so \
     /usr/local/lib/

 # Now we are copying from builder-image the UHD files.
@@ -74,6 +74,7 @@ COPY --from=gnb-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/

 COPY --from=gnb-base \
@@ -78,6 +78,7 @@ COPY --from=gnb-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/

 # Now we are copying from builder-image the UHD files.
@@ -73,6 +73,7 @@ COPY --from=lte-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
    /oai-ran/cmake_targets/ran_build/build/libSIMU.so \
    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/

 COPY --from=lte-ue-base \
@@ -80,6 +80,7 @@ COPY --from=lte-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libparams_libconfig.so \
    /oai-ran/cmake_targets/ran_build/build/libSIMU.so \
    /oai-ran/cmake_targets/ran_build/build/libdfts.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
    /usr/local/lib/

 # Now we are copying from builder-image the UHD files.
@@ -76,6 +76,8 @@ COPY --from=nr-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \
    /usr/local/lib/

 COPY --from=nr-ue-base \
@@ -81,6 +81,8 @@ COPY --from=nr-ue-build \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_optim8seg.so \
    /oai-ran/cmake_targets/ran_build/build/libldpc_orig.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv.so \
+    /oai-ran/cmake_targets/ran_build/build/libtelnetsrv_5Gue.so \
    /usr/local/lib/

 # Now we are copying from builder-image the UHD files.