Merge pull request #155 from thom311/th/external-ktoolbox

[th/external-ktoolbox] ktoolbox: move package to a separate pip module

.github/workflows/lint-test.yml

@@ -7,14 +7,17 @@ on:
     branches:
 
 jobs:
-  check3_11:
+  check:
+    strategy:
+      matrix:
+        version: [ "3.11", "3.12" ]
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python
       uses: actions/setup-python@v4
       with:
-        python-version: '3.11'
+        python-version: ${{matrix.version}}
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -40,39 +43,4 @@ jobs:
     - name: Run tests with Pytest
       run: |
        pytest --version
-       pytest
-
-  check3_9:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v3
-    - name: Set up Python
-      uses: actions/setup-python@v4
-      with:
-        python-version: '3.9'
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        python -m pip install black==22.12.0
-        python -m pip install flake8
-        python -m pip install mypy
-        python -m pip install pytest
-        python -m pip install types-PyYAML>=6.0.1
-        python -m pip install types-paramiko
-        python -m pip install -r requirements.txt
-    - name: Check code formatting with Black
-      run: |
-       black --version
-       black --check --diff .
-    - name: flake8
-      run: |
-       flake8 --version
-       flake8
-    - name: Type check with Mypy
-      run: |
-       mypy --version
-       mypy --strict --config-file mypy.ini ktoolbox/
-    - name: Run tests with Pytest
-      run: |
-       pytest --version
-       pytest ktoolbox/
+       pytest -vvv

Containerfile

@@ -35,24 +35,19 @@ RUN dnf install \
         wget \
         -y
 
+
 RUN python3.11 -m venv /opt/pyvenv3.11
 RUN /opt/pyvenv3.11/bin/python -m pip install --upgrade pip
 RUN /opt/pyvenv3.11/bin/python -m pip install \
-        PyYAML>=6.0.1 \
-        dataclasses \
-        jc \
-        jinja2 \
-        paramiko \
-        pyserial \
         pytest
-RUN ln -s /opt/pyvenv3.11/bin/python /usr/bin/python-pyvenv3.11
-
-COPY \
-    ktoolbox/README.md \
-    ktoolbox/*.py \
-    /opt/ocp-tft/ktoolbox/
-
-RUN echo -e "#!/bin/bash\ncd /opt/ocp-tft/ && exec /opt/pyvenv3.11/bin/python -m ktoolbox.netdev \"\$@\"" > /usr/bin/ocp-tft-netdev && chmod +x /usr/bin/ocp-tft-netdev
+COPY requirements.txt /tmp/
+RUN /opt/pyvenv3.11/bin/python -m pip install -r /tmp/requirements.txt && \
+    rm -rf /tmp/requirements.txt
+RUN \
+    echo -e "#/bin/sh\nexec /opt/pyvenv3.11/bin/python \"\$@\"" > /usr/bin/python-pyvenv3.11 && \
+    chmod +x /usr/bin/python-pyvenv3.11 && \
+    echo -e "#!/bin/sh\ncd /opt/ocp-tft/ && exec /opt/pyvenv3.11/bin/python -m ktoolbox.netdev \"\$@\"" > /usr/bin/ocp-tft-netdev && \
+    chmod +x /usr/bin/ocp-tft-netdev
 
 RUN mkdir -p /etc/ocp-traffic-flow-tests && echo "ocp-traffic-flow-tests" > /etc/ocp-traffic-flow-tests/data