From 8356125cf11caf7685fb9e9825a425738144f923 Mon Sep 17 00:00:00 2001 From: Nick Arellano Date: Sat, 29 Jun 2024 16:58:26 -0500 Subject: [PATCH] feat(ee-cloud): move dependencies into the execution-environment.yaml and bump the cloud.terraform version to 3.0.0 --- environments/cloud/execution-environment.yaml | 14 ++++++++++++-- environments/cloud/requirements.txt | 1 - environments/cloud/requirements.yaml | 18 ------------------ 3 files changed, 12 insertions(+), 21 deletions(-) delete mode 100644 environments/cloud/requirements.txt delete mode 100644 environments/cloud/requirements.yaml diff --git a/environments/cloud/execution-environment.yaml b/environments/cloud/execution-environment.yaml index bcac411..cb9a45f 100644 --- a/environments/cloud/execution-environment.yaml +++ b/environments/cloud/execution-environment.yaml @@ -6,8 +6,18 @@ images: name: registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel9:latest dependencies: - galaxy: requirements.yaml - python: requirements.txt + galaxy: + collections: + - { name: amazon.aws, version: 6.5.0 } + - { name: azure.azcollection, version: 1.10.0 } + - { name: cloud.terraform, version: 3.0.0 } + - { name: community.aws, version: 6.3.0 } + - { name: community.digitalocean, version: 1.24.0 } + - { name: google.cloud, version: 1.2.0 } + - { name: hetzner.hcloud, version: 1.16.0 } + - { name: vultr.cloud, version: 1.10.0 } + python: + - awscli>=1.16.312 additional_build_steps: prepend_final: diff --git a/environments/cloud/requirements.txt b/environments/cloud/requirements.txt deleted file mode 100644 index ed60753..0000000 --- a/environments/cloud/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -awscli>=1.16.312 diff --git a/environments/cloud/requirements.yaml b/environments/cloud/requirements.yaml deleted file mode 100644 index 10192bb..0000000 --- a/environments/cloud/requirements.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -collections: - - name: amazon.aws - version: 6.5.0 - - name: azure.azcollection - version: 1.10.0 - - name: cloud.terraform - version: 2.0.0 - - name: community.aws - version: 6.3.0 - - name: community.digitalocean - version: 1.24.0 - - name: google.cloud - version: 1.2.0 - - name: hetzner.hcloud - version: 1.16.0 - - name: vultr.cloud - version: 1.10.0