From c6a29bf6a70d956e5279da0f42b5e051acfa21e6 Mon Sep 17 00:00:00 2001 From: Dmitry Dunaev Date: Wed, 7 Sep 2022 11:33:18 +0300 Subject: [PATCH] [WIFI-10536] Chg: update on Dockerfile with new updates Signed-off-by: Dmitry Dunaev --- docker/Dockerfile | 3 ++- dut_lib_template/setup.py | 2 +- setup_env.bash | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 630e2b7b9..67f6b4990 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,9 +14,10 @@ COPY requirements.txt /wlan-testing/requirements.txt RUN pip3 install -r /wlan-testing/requirements.txt COPY tests /wlan-testing/tests COPY libs /wlan-testing/libs +COPY dut_lib_template /wlan-testing/dut_lib_template COPY setup_env.bash /wlan-testing/setup_env.bash ENV PYTHON=/usr/local/bin/python3 ENV PIP=/usr/local/bin/pip3 -RUN /wlan-testing/setup_env.bash -t $CLOUDSDK_LIBRARY -d $TEST_DEVICE_NAME -n "TIP Automation" -o TIP -e tip-automation@telecominfraproject.com -i "TIP OpenWIFI Library" +RUN /wlan-testing/setup_env.bash -t $CLOUDSDK_LIBRARY -d $TEST_DEVICE_NAME -n "TIP Automation" -o TIP -e tip-automation@telecominfraproject.com -i "TIP OpenWIFI Library" && pip3 freeze WORKDIR /wlan-testing ENTRYPOINT ["/bin/bash"] diff --git a/dut_lib_template/setup.py b/dut_lib_template/setup.py index a121d9d23..ad343a547 100644 --- a/dut_lib_template/setup.py +++ b/dut_lib_template/setup.py @@ -6,7 +6,7 @@ with open("README.md", "r") as fh: setuptools.setup( name='dut_lib_template', version='0.1', - scripts=['dut_lib_template.py', 'controller.py', 'ap_lib.py', 'SetupLibrary.py', 'openwrt_ctl.py'], + scripts=['dut_lib_template.py', 'ap_lib.py', 'SetupLibrary.py', 'openwrt_ctl.py'], author="Shivam Thakur", author_email="shivam.thakur@candelatech.com", description="TIP OpenWIFI 2.X Library", diff --git a/setup_env.bash b/setup_env.bash index 80ee07c16..afc5b0738 100755 --- a/setup_env.bash +++ b/setup_env.bash @@ -95,10 +95,10 @@ then touch tests/imports.py if [ $target == "tip_2x" ] then - cd libs/dut_lib_template + cd dut_lib_template $PYTHON setup.py bdist_wheel $PIP install dist/*.whl --force-reinstall - cd ../../ + cd ../ fi x=$(whoami) echo -e "\"\"\"\nRegistered Target Imports\n\"\"\"\nimport sys\nimport importlib\n\nsys.path.append('/usr/local/bin')\n\nsys.path.append('/home/$x/.local//bin/')\n\nsys.path.append('/home/$x/.local/lib/python3.8/site-packages/')\n\n" >> tests/imports.py