Skip to content

Commit

Permalink
Merge branch 'nephio-project:main' into catalog_switch
Browse files Browse the repository at this point in the history
  • Loading branch information
radoslawc authored Jun 25, 2024
2 parents a844d7c + 5d74394 commit 31d7bd3
Show file tree
Hide file tree
Showing 5 changed files with 63 additions and 66 deletions.
12 changes: 6 additions & 6 deletions e2e/provision/galaxy-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,20 @@ roles:
- name: andrewrothstein.podman
version: v2.1.1
- name: andrewrothstein.kind
version: v1.2.10
version: v1.2.11
- name: andrewrothstein.kubectl
version: v1.3.4
version: v1.3.7
- name: andrewrothstein.kpt
version: 0.0.3
- name: darkwizard242.cni
version: 2.4.0
version: 2.5.0

collections:
- name: community.general
version: 8.5.0
version: 9.1.0
- name: kubernetes.core
version: 3.0.1
version: 5.0.0
- name: community.docker
version: 3.8.1
version: 3.10.4
- name: ansible.posix
version: 1.5.4
20 changes: 10 additions & 10 deletions e2e/provision/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,33 +8,33 @@ ansible==6.7.0
# via -r requirements.in
ansible-core==2.13.13
# via ansible
certifi==2024.2.2
certifi==2024.6.2
# via requests
cffi==1.16.0
# via
# cryptography
# pynacl
charset-normalizer==3.3.2
# via requests
cryptography==42.0.5
cryptography==42.0.8
# via
# ansible-core
# pyjwt
deprecated==1.2.14
# via pygithub
idna==3.6
idna==3.7
# via requests
jinja2==3.1.3
jinja2==3.1.4
# via ansible-core
jmespath==1.0.1
# via -r requirements.in
markupsafe==2.1.5
# via jinja2
mitogen==0.3.4
mitogen==0.3.7
# via -r requirements.in
packaging==24.0
packaging==24.1
# via ansible-core
pycparser==2.21
pycparser==2.22
# via cffi
pygithub==2.3.0
# via -r requirements.in
Expand All @@ -44,13 +44,13 @@ pynacl==1.5.0
# via pygithub
pyyaml==6.0.1
# via ansible-core
requests==2.31.0
requests==2.32.3
# via pygithub
resolvelib==0.8.1
# via ansible-core
typing-extensions==4.10.0
typing-extensions==4.12.2
# via pygithub
urllib3==2.2.1
urllib3==2.2.2
# via
# pygithub
# requests
Expand Down
1 change: 1 addition & 0 deletions e2e/provision/test-requirements.in
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ molecule-plugins[gce] # MIT
pytest-testinfra # Apache-2.0
yamllint # GPLv3
google-auth # Apache-2.0
requests # Apache-2.0
94 changes: 45 additions & 49 deletions e2e/provision/test-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,114 +1,114 @@
#
# This file is autogenerated by pip-compile with Python 3.10
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --output-file=test-requirements.txt test-requirements.in
#
ansible-compat==4.1.10
ansible-compat==24.6.1
# via
# ansible-lint
# molecule
ansible-core==2.15.4
ansible-core==2.17.1
# via
# ansible-compat
# ansible-lint
# molecule
ansible-lint==6.20.3
ansible-lint==24.6.1
# via -r test-requirements.in
attrs==23.1.0
attrs==23.2.0
# via
# jsonschema
# referencing
black==23.9.1
black==24.4.2
# via ansible-lint
bracex==2.4
# via wcmatch
cachetools==5.3.1
cachetools==5.3.3
# via google-auth
certifi==2023.7.22
certifi==2024.6.2
# via requests
cffi==1.16.0
# via cryptography
charset-normalizer==3.3.0
charset-normalizer==3.3.2
# via requests
click==8.1.7
# via
# black
# click-help-colors
# molecule
click-help-colors==0.9.2
click-help-colors==0.9.4
# via molecule
cryptography==41.0.4
cryptography==42.0.8
# via ansible-core
enrich==1.2.7
# via molecule
exceptiongroup==1.1.3
# via pytest
filelock==3.12.4
filelock==3.15.3
# via ansible-lint
google-auth==2.23.2
google-auth==2.30.0
# via -r test-requirements.in
idna==3.4
idna==3.7
# via requests
importlib-metadata==7.2.0
# via ansible-lint
iniconfig==2.0.0
# via pytest
jinja2==3.1.2
jinja2==3.1.4
# via
# ansible-core
# molecule
jsonschema==4.19.1
jsonschema==4.22.0
# via
# ansible-compat
# ansible-lint
# molecule
jsonschema-specifications==2023.7.1
jsonschema-specifications==2023.12.1
# via jsonschema
markdown-it-py==3.0.0
# via rich
markupsafe==2.1.3
markupsafe==2.1.5
# via jinja2
mdurl==0.1.2
# via markdown-it-py
molecule==6.0.2
molecule==24.6.0
# via
# -r test-requirements.in
# molecule-plugins
molecule-plugins[gce,vagrant]==23.5.0
molecule-plugins[gce,vagrant]==23.5.3
# via -r test-requirements.in
mypy-extensions==1.0.0
# via black
packaging==23.2
packaging==24.1
# via
# ansible-compat
# ansible-core
# ansible-lint
# black
# molecule
# pytest
pathspec==0.11.2
pathspec==0.12.1
# via
# ansible-lint
# black
# yamllint
platformdirs==3.11.0
platformdirs==4.2.2
# via black
pluggy==1.3.0
pluggy==1.5.0
# via
# molecule
# pytest
pyasn1==0.5.0
pyasn1==0.6.0
# via
# pyasn1-modules
# rsa
pyasn1-modules==0.3.0
pyasn1-modules==0.4.0
# via google-auth
pycparser==2.21
pycparser==2.22
# via cffi
pygments==2.16.1
pygments==2.18.0
# via rich
pytest==7.4.2
pytest==8.2.2
# via pytest-testinfra
pytest-testinfra==9.0.0
pytest-testinfra==10.1.1
# via -r test-requirements.in
python-vagrant==1.0.0
# via molecule-plugins
Expand All @@ -119,46 +119,42 @@ pyyaml==6.0.1
# ansible-lint
# molecule
# yamllint
referencing==0.30.2
referencing==0.35.1
# via
# jsonschema
# jsonschema-specifications
requests==2.31.0
# via ansible-lint
requests==2.32.3
# via -r test-requirements.in
resolvelib==1.0.1
# via ansible-core
rich==13.6.0
rich==13.7.1
# via
# ansible-lint
# enrich
# molecule
rpds-py==0.10.3
rpds-py==0.18.1
# via
# jsonschema
# referencing
rsa==4.9
# via google-auth
ruamel-yaml==0.17.33
ruamel-yaml==0.18.6
# via ansible-lint
ruamel-yaml-clib==0.2.7
ruamel-yaml-clib==0.2.8
# via ruamel-yaml
subprocess-tee==0.4.1
subprocess-tee==0.4.2
# via
# ansible-compat
# ansible-lint
tomli==2.0.1
# via
# black
# pytest
typing-extensions==4.8.0
# via black
urllib3==2.0.6
urllib3==2.2.2
# via requests
wcmatch==8.5
wcmatch==8.5.2
# via
# ansible-lint
# molecule
yamllint==1.32.0
yamllint==1.35.1
# via
# -r test-requirements.in
# ansible-lint
zipp==3.19.2
# via importlib-metadata
2 changes: 1 addition & 1 deletion images/molecule/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ FROM python:3.11-slim
ENV USER root

RUN apt-get update && apt-get install -y --no-install-recommends \
openssh-client=1:9.2p1-2+deb12u1 \
openssh-client=1:9.2p1-2+deb12u2 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/* \
&& pip install --no-cache-dir tox==4.11.3

0 comments on commit 31d7bd3

Please sign in to comment.