aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--fdio.infra.ansible/roles/docker_images/files/base/Dockerfile79
-rw-r--r--fdio.infra.ansible/roles/python_env/defaults/main.yaml2
-rw-r--r--fdio.infra.ansible/roles/python_env/tasks/main.yaml81
-rw-r--r--requirements.txt81
4 files changed, 80 insertions, 163 deletions
diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
index 6f859d90d2..88af96bfa8 100644
--- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
+++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile
@@ -92,68 +92,41 @@ RUN mkdir -p /tmp/dumps \
# CSIT PIP pre-cache
RUN pip3 install \
ecdsa==0.18.0 \
- paramiko==2.9.3 \
+ paramiko==3.3.1 \
pycrypto==2.6.1 \
- PyYAML==5.4.1 \
- requests==2.25.1 \
- robotframework==5.0.1 \
+ python-dateutil==2.8.2 \
+ PyYAML==6.0.1 \
+ requests==2.31.0 \
+ robotframework==6.1.1 \
scapy==2.4.5 \
- scp==0.14.4 \
- ansible==5.10.0 \
- ansible-core==2.12.7 \
- dill==0.3.5.1 \
- numpy==1.22.4 \
- scipy==1.8.1 \
- boto3==1.17.78 \
- botocore==1.20.78 \
- hdrhistogram==0.6.1 \
- pandas==1.4.2 \
- plotly==4.1.1 \
- PTable==0.9.2 \
- Sphinx==3.5.4 \
- sphinx-rtd-theme==0.5.2 \
- sphinxcontrib-applehelp==1.0.2 \
- sphinxcontrib-devhelp==1.0.2 \
- sphinxcontrib-htmlhelp==2.0.0 \
- sphinxcontrib-jsmath==1.0.1 \
- sphinxcontrib-programoutput==0.17 \
- sphinxcontrib-qthelp==1.0.3 \
- sphinxcontrib-robotdoc==0.11.0 \
- sphinxcontrib-serializinghtml==1.1.5 \
+ scp==0.14.5 \
+ ansible==8.2.0 \
+ ansible-core==2.15.2 \
+ dill==0.3.7 \
+ numpy==1.25.2 \
+ scipy==1.11.1 \
ply==3.11 \
- jsonschema==4.1.0 \
+ jsonschema==4.18.4 \
rfc3339-validator==0.1.4 \
rfc3987==1.3.8 \
- alabaster==0.7.12 \
- attrs==21.4.0 \
- Babel==2.10.3 \
- bcrypt==3.2.2 \
- certifi==2022.6.15 \
+ attrs==23.1.0 \
+ bcrypt==4.0.1 \
+ certifi==2023.7.22 \
cffi==1.15.1 \
- chardet==4.0.0 \
- cryptography==36.0.2 \
- docutils==0.16 \
- future==0.18.2 \
- idna==2.10 \
- imagesize==1.4.1 \
- Jinja2==3.0.3 \
- jmespath==0.10.0 \
- MarkupSafe==2.1.1 \
- packaging==21.3 \
- pbr==5.9.0 \
+ charset-normalizer==3.2.0 \
+ cryptography==41.0.3 \
+ idna==3.4 \
+ Jinja2==3.1.2 \
+ jsonschema-specifications==2023.7.1 \
+ MarkupSafe==2.1.3 \
+ packaging==23.1 \
pycparser==2.21 \
- Pygments==2.12.0 \
PyNaCl==1.5.0 \
- pyparsing==3.0.9 \
- pyrsistent==0.18.1 \
- python-dateutil==2.8.2 \
- pytz==2022.1 \
- resolvelib==0.5.4 \
- retrying==1.3.3 \
- s3transfer==0.4.2 \
+ referencing==0.30.0 \
+ resolvelib==1.0.1 \
+ rpds-py==0.9.2 \
six==1.16.0 \
- snowballstemmer==2.2.0 \
- urllib3==1.26.10 \
+ urllib3==2.0.4 \
meson==0.64.1
RUN groupadd -g 1000 testuser \
diff --git a/fdio.infra.ansible/roles/python_env/defaults/main.yaml b/fdio.infra.ansible/roles/python_env/defaults/main.yaml
index 294cf3ec32..4b572c0dd0 100644
--- a/fdio.infra.ansible/roles/python_env/defaults/main.yaml
+++ b/fdio.infra.ansible/roles/python_env/defaults/main.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/python_env/defaults/main.yaml
+# file: defaults/main.yaml
packages: "{{ packages_base + packages_by_distro[ansible_distribution|lower][ansible_distribution_release] + packages_by_arch[ansible_machine] }}"
diff --git a/fdio.infra.ansible/roles/python_env/tasks/main.yaml b/fdio.infra.ansible/roles/python_env/tasks/main.yaml
index 96b49cda9b..02850110a9 100644
--- a/fdio.infra.ansible/roles/python_env/tasks/main.yaml
+++ b/fdio.infra.ansible/roles/python_env/tasks/main.yaml
@@ -1,5 +1,5 @@
---
-# file: roles/python_env/tasks/main.yaml
+# file: tasks/main.yaml
- name: Inst - Update package cache (apt)
ansible.builtin.apt:
@@ -21,68 +21,41 @@
ansible.builtin.pip:
name:
- "ecdsa==0.18.0"
- - "paramiko==2.9.3"
+ - "paramiko==3.3.1"
- "pycrypto==2.6.1"
- - "PyYAML==5.4.1"
- - "requests==2.25.1"
- - "robotframework==5.0.1"
+ - "python-dateutil==2.8.2"
+ - "PyYAML==6.0.1"
+ - "requests==2.31.0"
+ - "robotframework==6.1.1"
- "scapy==2.4.5"
- - "scp==0.14.4"
- - "ansible==5.10.0"
- - "ansible-core==2.12.7"
- - "dill==0.3.5.1"
- - "numpy==1.22.4"
- - "scipy==1.8.1"
- - "boto3==1.17.78"
- - "botocore==1.20.78"
- - "hdrhistogram==0.6.1"
- - "pandas==1.4.2"
- - "plotly==4.1.1"
- - "PTable==0.9.2"
- - "Sphinx==3.5.4"
- - "sphinx-rtd-theme==0.5.2"
- - "sphinxcontrib-applehelp==1.0.2"
- - "sphinxcontrib-devhelp==1.0.2"
- - "sphinxcontrib-htmlhelp==2.0.0"
- - "sphinxcontrib-jsmath==1.0.1"
- - "sphinxcontrib-programoutput==0.17"
- - "sphinxcontrib-qthelp==1.0.3"
- - "sphinxcontrib-robotdoc==0.11.0"
- - "sphinxcontrib-serializinghtml==1.1.5"
+ - "scp==0.14.5"
+ - "ansible==8.2.0"
+ - "ansible-core==2.15.2"
+ - "dill==0.3.7"
+ - "numpy==1.25.2"
+ - "scipy==1.11.1"
- "ply==3.11"
- - "jsonschema==4.1.0"
+ - "jsonschema==4.18.4"
- "rfc3339-validator==0.1.4"
- "rfc3987==1.3.8"
- - "alabaster==0.7.12"
- - "attrs==21.4.0"
- - "Babel==2.10.3"
- - "bcrypt==3.2.2"
- - "certifi==2022.6.15"
+ - "attrs==23.1.0"
+ - "bcrypt==4.0.1"
+ - "certifi==2023.7.22"
- "cffi==1.15.1"
- - "chardet==4.0.0"
- - "cryptography==36.0.2"
- - "docutils==0.16"
- - "future==0.18.2"
- - "idna==2.10"
- - "imagesize==1.4.1"
- - "Jinja2==3.0.3"
- - "jmespath==0.10.0"
- - "MarkupSafe==2.1.1"
- - "packaging==21.3"
- - "pbr==5.9.0"
+ - "charset-normalizer==3.2.0"
+ - "cryptography==41.0.3"
+ - "idna==3.4"
+ - "Jinja2==3.1.2"
+ - "jsonschema-specifications==2023.7.1"
+ - "MarkupSafe==2.1.3"
+ - "packaging==23.1"
- "pycparser==2.21"
- - "Pygments==2.12.0"
- "PyNaCl==1.5.0"
- - "pyparsing==3.0.9"
- - "pyrsistent==0.18.1"
- - "python-dateutil==2.8.2"
- - "pytz==2022.1"
- - "resolvelib==0.5.4"
- - "retrying==1.3.3"
- - "s3transfer==0.4.2"
+ - "referencing==0.30.0"
+ - "resolvelib==1.0.1"
+ - "rpds-py==0.9.2"
- "six==1.16.0"
- - "snowballstemmer==2.2.0"
- - "urllib3==1.26.10"
+ - "urllib3==2.0.4"
environment:
ANSIBLE_SKIP_CONFLICT_CHECK: 1
tags:
diff --git a/requirements.txt b/requirements.txt
index 6c34c9ab8f..a4766e1fc6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -18,77 +18,48 @@
#
# CSIT Core dependencies
ecdsa==0.18.0
-paramiko==2.9.3
+paramiko==3.3.1
pycrypto==2.6.1
-PyYAML==5.4.1
-requests==2.25.1
-robotframework==5.0.1
+python-dateutil==2.8.2
+PyYAML==6.0.1
+requests==2.31.0
+robotframework==6.1.1
scapy==2.4.5
-scp==0.14.4
+scp==0.14.5
# IaaC dependencies
-ansible==5.10.0
-ansible-core==2.12.7
+ansible==8.2.0
+ansible-core==2.15.2
# PLRsearch dependencies
-dill==0.3.5.1
-numpy==1.22.4
-scipy==1.8.1
-
-# PAL/DOC dependencies
-boto3==1.17.78
-botocore==1.20.78
-hdrhistogram==0.9.2
-pandas==1.4.2
-plotly==4.1.1
-PTable==0.9.2
-Sphinx==5.1.1
-sphinx-rtd-theme==1.0.0
-sphinxcontrib-applehelp==1.0.2
-sphinxcontrib-devhelp==1.0.2
-sphinxcontrib-htmlhelp==2.0.0
-sphinxcontrib-jsmath==1.0.1
-sphinxcontrib-programoutput==0.17
-sphinxcontrib-qthelp==1.0.3
-sphinxcontrib-robotdoc==0.11.0
-sphinxcontrib-serializinghtml==1.1.5
+dill==0.3.7
+numpy==1.25.2
+scipy==1.11.1
# VPP requirements
ply==3.11
# JSON schema validation
-jsonschema==4.1.0
+jsonschema==4.18.4
rfc3339-validator==0.1.4
rfc3987==1.3.8
# Other PIP freeze dependencies.
-alabaster==0.7.12
-attrs==21.4.0
-Babel==2.10.3
-bcrypt==3.2.2
-certifi==2022.6.15
+attrs==23.1.0
+bcrypt==4.0.1
+certifi==2023.7.22
cffi==1.15.1
-chardet==4.0.0
-cryptography==36.0.2
-docutils==0.16
-future==0.18.2
-idna==2.10
-imagesize==1.4.1
-Jinja2==3.0.3
-jmespath==0.10.0
-MarkupSafe==2.1.1
-packaging==21.3
-pbr==5.9.0
+charset-normalizer==3.2.0
+cryptography==41.0.3
+idna==3.4
+Jinja2==3.1.2
+jsonschema-specifications==2023.7.1
+MarkupSafe==2.1.3
+packaging==23.1
pycparser==2.21
-Pygments==2.12.0
PyNaCl==1.5.0
-pyparsing==3.0.9
-pyrsistent==0.18.1
-python-dateutil==2.8.2
-pytz==2022.1
-resolvelib==0.5.4
-retrying==1.3.3
-s3transfer==0.4.2
+referencing==0.30.0
+resolvelib==1.0.1
+rpds-py==0.9.2
six==1.16.0
-snowballstemmer==2.2.0
-urllib3==1.26.10
+urllib3==2.0.4