From 2202027d0fee6cfe45192ffafb91fe2ac07d2e67 Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Tue, 29 Oct 2024 09:43:32 +0100 Subject: feat(ansible): Remove python_env Signed-off-by: Peter Mikus Change-Id: Id03fd5fa6cdf9694dc59fb671519e703a8bb8591 --- .../roles/python_env/defaults/main.yaml | 24 -------- .../roles/python_env/tasks/main.yaml | 71 ---------------------- fdio.infra.ansible/sut.yaml | 22 ++----- fdio.infra.ansible/tg.yaml | 10 +-- resources/libraries/python/Constants.py | 2 +- 5 files changed, 11 insertions(+), 118 deletions(-) delete mode 100644 fdio.infra.ansible/roles/python_env/defaults/main.yaml delete mode 100644 fdio.infra.ansible/roles/python_env/tasks/main.yaml diff --git a/fdio.infra.ansible/roles/python_env/defaults/main.yaml b/fdio.infra.ansible/roles/python_env/defaults/main.yaml deleted file mode 100644 index 5c039d2e56..0000000000 --- a/fdio.infra.ansible/roles/python_env/defaults/main.yaml +++ /dev/null @@ -1,24 +0,0 @@ ---- -# file: defaults/main.yaml - -packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower] + packages_by_arch[ansible_machine] }}" - -packages_base: - - "virtualenv" - -packages_by_distro: - ubuntu: - - "python3-all" - - "python3-apt" - - "python3-cffi" - - "python3-cffi-backend" - - "python3-dev" - - "python3-pip" - - "python3-pyelftools" - - "python3-setuptools" - -packages_by_arch: - aarch64: - - [] - x86_64: - - [] diff --git a/fdio.infra.ansible/roles/python_env/tasks/main.yaml b/fdio.infra.ansible/roles/python_env/tasks/main.yaml deleted file mode 100644 index fc4d30d044..0000000000 --- a/fdio.infra.ansible/roles/python_env/tasks/main.yaml +++ /dev/null @@ -1,71 +0,0 @@ ---- -# file: tasks/main.yaml - -- name: "Update package cache (apt)" - ansible.builtin.apt: - update_cache: true - cache_valid_time: 3600 - when: - - ansible_distribution|lower == 'ubuntu' - tags: - - pip-inst-prerequisites - -- name: "Prerequisites" - ansible.builtin.package: - name: "{{ packages | flatten(levels=1) }}" - state: "latest" - tags: - - pip-inst-prerequisites - -- name: "CSIT PIP requirements" - ansible.builtin.pip: - name: - - "ecdsa==0.19.0" - - "paramiko==3.4.1" - - "pycryptodome==3.20.0" - - "python-dateutil==2.9.0" - - "PyYAML==6.0.1" - - "requests==2.32.2" - - "robotframework==7.0.1" - - "scapy==2.4.5" - - "scp==0.15.0" - - "ansible==10.2.0" - - "ansible-core==2.17.2" - - "dill==0.3.8" - - "numpy==2.0.1" - - "scipy==1.14.0" - - "ply==3.11" - - "jsonschema==4.23.0" - - "rfc3339-validator==0.1.4" - - "rfc3987==1.3.8" - - "pylint==3.2.6" - - "astroid==3.2.4" - - "attrs==24.2.0" - - "bcrypt==4.2.0" - - "certifi==2024.7.4" - - "cffi==1.17.0" - - "charset-normalizer==3.3.2" - - "cryptography==43.0.0" - - "idna==3.7" - - "isort==5.13.2" - - "Jinja2==3.1.4" - - "jsonschema-specifications==2023.12.1" - - "MarkupSafe==2.1.5" - - "mccabe==0.7.0" - - "packaging==24.1" - - "platformdirs==4.2.2" - - "ply==3.11" - - "pycparser==2.22" - - "PyNaCl==1.5.0" - - "referencing==0.35.1" - - "resolvelib==1.0.1" - - "rpds-py==0.20.0" - - "six==1.16.0" - - "tomli==2.0.1" - - "tomlkit==0.13.0" - - "typing_extensions==4.12.2" - - "urllib3==2.2.2" - environment: - ANSIBLE_SKIP_CONFLICT_CHECK: 1 - tags: - - pip-inst-pip diff --git a/fdio.infra.ansible/sut.yaml b/fdio.infra.ansible/sut.yaml index f06f7edff1..41327cb515 100644 --- a/fdio.infra.ansible/sut.yaml +++ b/fdio.infra.ansible/sut.yaml @@ -14,8 +14,6 @@ roles: - role: common tags: common -# - role: python_env -# tags: python_env - role: kernel tags: kernel - role: mellanox @@ -54,16 +52,12 @@ tags: user_add - role: common tags: common -# - role: python_env -# tags: python_env + - role: aws + tags: aws - role: vpp tags: vpp - role: docker tags: docker -# - role: dpdk -# tags: dpdk - - role: aws - tags: aws - role: cleanup tags: cleanup - role: calibration @@ -83,16 +77,12 @@ tags: user_add - role: common tags: common -# - role: python_env -# tags: python_env + - role: azure + tags: azure - role: docker tags: docker - role: vpp tags: vpp - - role: dpdk - tags: dpdk - - role: azure - tags: azure - role: cleanup tags: cleanup - role: calibration @@ -112,14 +102,10 @@ tags: user_add - role: common tags: common -# - role: python_env -# tags: python_env - role: docker tags: docker - role: vpp tags: vpp - - role: dpdk - tags: dpdk - role: cleanup tags: cleanup - role: calibration diff --git a/fdio.infra.ansible/tg.yaml b/fdio.infra.ansible/tg.yaml index 3a69a562af..26179c9852 100644 --- a/fdio.infra.ansible/tg.yaml +++ b/fdio.infra.ansible/tg.yaml @@ -52,8 +52,6 @@ tags: docker - role: docker_images tags: docker_images -# - role: dpdk -# tags: dpdk - role: cleanup tags: cleanup - role: calibration @@ -73,10 +71,12 @@ tags: user_add - role: common tags: common - - role: docker - tags: docker - role: azure tags: azure + - role: docker + tags: docker + - role: docker_images + tags: docker_images - role: cleanup tags: cleanup - role: calibration @@ -98,6 +98,8 @@ tags: common - role: docker tags: docker + - role: docker_images + tags: docker_images - role: cleanup tags: cleanup - role: calibration diff --git a/resources/libraries/python/Constants.py b/resources/libraries/python/Constants.py index 3fabe0141b..76bb296325 100644 --- a/resources/libraries/python/Constants.py +++ b/resources/libraries/python/Constants.py @@ -180,7 +180,7 @@ class Constants: QEMU_VM_IMAGE = "/var/lib/vm/image.iso" # QEMU VM DPDK path - QEMU_VM_DPDK = "/opt/dpdk-23.11" + QEMU_VM_DPDK = "/opt/dpdk-24.07" # Docker container SUT image DOCKER_SUT_IMAGE_UBUNTU = "csit_sut-ubuntu2204:local" -- cgit 1.2.3-korg