From fd150b5cf1fd48e0c60c9c8f44a2ee598aaa1714 Mon Sep 17 00:00:00 2001 From: Nicolas Leiva Date: Wed, 21 Feb 2024 14:18:44 -0500 Subject: [PATCH] Fix general-community --- ee-general-community/bindep.txt | 1 - .../execution-environment.yml | 8 +++- ee-general-community/requirements.txt | 5 --- ee-general-community/requirements.yml | 38 +----------------- ee-network-community/bindep.txt | 1 + .../execution-environment.yml | 7 +--- ee-network-community/requirements.txt | 2 +- ee-network-community/requirements.yml | 39 +++++++++++++++++-- 8 files changed, 48 insertions(+), 53 deletions(-) diff --git a/ee-general-community/bindep.txt b/ee-general-community/bindep.txt index 54c56b3..e69de29 100644 --- a/ee-general-community/bindep.txt +++ b/ee-general-community/bindep.txt @@ -1 +0,0 @@ -nmap \ No newline at end of file diff --git a/ee-general-community/execution-environment.yml b/ee-general-community/execution-environment.yml index 803b1df..cd49cfc 100644 --- a/ee-general-community/execution-environment.yml +++ b/ee-general-community/execution-environment.yml @@ -1,5 +1,5 @@ --- -#image_version: 1.1 +#image_version: 1.0 version: 1 build_arg_defaults: @@ -11,3 +11,9 @@ dependencies: galaxy: requirements.yml python: requirements.txt system: bindep.txt + +additional_build_steps: + append: + - ADD https://cdn.teleport.dev/teleport-15.0.2-1.x86_64.rpm /tmp/teleport-15.0.2-1.x86_64.rpm + - RUN chmod u+x /tmp/teleport-15.0.2-1.x86_64.rpm + - RUN microdnf install -y /tmp/teleport-15.0.2-1.x86_64.rpm \ No newline at end of file diff --git a/ee-general-community/requirements.txt b/ee-general-community/requirements.txt index a367b99..af422d7 100644 --- a/ee-general-community/requirements.txt +++ b/ee-general-community/requirements.txt @@ -1,6 +1 @@ -ansible-pylibssh -#pyats[full] -#genie -ntc-templates -python-nmap libdnf5 diff --git a/ee-general-community/requirements.yml b/ee-general-community/requirements.yml index 0ebe29d..abfc74b 100644 --- a/ee-general-community/requirements.yml +++ b/ee-general-community/requirements.yml @@ -1,41 +1,7 @@ collections: - - name: ansible.netcommon - version: 5.1.2 - name: ansible.posix version: 1.5.4 - name: ansible.utils - version: 2.10.3 + version: 3.1.0 - name: community.general - version: 7.1.0 - - name: community.network - version: 5.0.0 - - name: community.yang - version: 1.1.0 - - name: arista.avd - version: 4.1.0 - - name: arista.cvp - version: 3.6.1 - - name: arista.eos - version: 6.0.1 - - name: cisco.aci - version: 2.6.0 - - name: cisco.asa - version: 4.0.1 - - name: cisco.dnac - version: 6.7.3 - - name: cisco.ios - version: 5.0.0 - - name: cisco.iosxr - version: 6.0.0 - - name: cisco.meraki - version: 2.15.2 - - name: cisco.nxos - version: 5.1.0 - - name: f5networks.f5_bigip - version: 1.13.0 - - name: junipernetworks.junos - version: 5.2.0 - - name: netbox.netbox - version: 3.13.0 - - name: paloaltonetworks.panos - version: 2.13.2 + version: 8.3.0 diff --git a/ee-network-community/bindep.txt b/ee-network-community/bindep.txt index e69de29..54c56b3 100644 --- a/ee-network-community/bindep.txt +++ b/ee-network-community/bindep.txt @@ -0,0 +1 @@ +nmap \ No newline at end of file diff --git a/ee-network-community/execution-environment.yml b/ee-network-community/execution-environment.yml index 0a28803..deecb5c 100644 --- a/ee-network-community/execution-environment.yml +++ b/ee-network-community/execution-environment.yml @@ -1,5 +1,5 @@ --- -#image_version: 1.0 +#image_version: 1.2 version: 1 build_arg_defaults: @@ -11,8 +11,3 @@ dependencies: galaxy: requirements.yml python: requirements.txt system: bindep.txt - -additional_build_steps: - append: - - RUN wget https://cdn.teleport.dev/teleport-15.0.2-1.x86_64.rpm - - RUN microdnf install -y teleport-15.0.2-1.x86_64.rpm \ No newline at end of file diff --git a/ee-network-community/requirements.txt b/ee-network-community/requirements.txt index af422d7..957a91f 100644 --- a/ee-network-community/requirements.txt +++ b/ee-network-community/requirements.txt @@ -1 +1 @@ -libdnf5 +libdnf5 \ No newline at end of file diff --git a/ee-network-community/requirements.yml b/ee-network-community/requirements.yml index 271ce06..0ebe29d 100644 --- a/ee-network-community/requirements.yml +++ b/ee-network-community/requirements.yml @@ -1,8 +1,41 @@ collections: + - name: ansible.netcommon + version: 5.1.2 - name: ansible.posix version: 1.5.4 - name: ansible.utils - version: 3.1.0 + version: 2.10.3 - name: community.general - version: 8.3.0 - + version: 7.1.0 + - name: community.network + version: 5.0.0 + - name: community.yang + version: 1.1.0 + - name: arista.avd + version: 4.1.0 + - name: arista.cvp + version: 3.6.1 + - name: arista.eos + version: 6.0.1 + - name: cisco.aci + version: 2.6.0 + - name: cisco.asa + version: 4.0.1 + - name: cisco.dnac + version: 6.7.3 + - name: cisco.ios + version: 5.0.0 + - name: cisco.iosxr + version: 6.0.0 + - name: cisco.meraki + version: 2.15.2 + - name: cisco.nxos + version: 5.1.0 + - name: f5networks.f5_bigip + version: 1.13.0 + - name: junipernetworks.junos + version: 5.2.0 + - name: netbox.netbox + version: 3.13.0 + - name: paloaltonetworks.panos + version: 2.13.2