Skip to content

Commit

Permalink
modified: .github/tests/build_ee.yml
Browse files Browse the repository at this point in the history
	modified:   .github/workflows/ci_testing.yml
	modified:   .pre-commit-config.yaml
	new file:   LICENSE
	modified:   README.md
	new file:   changelogs/fragments/148-delegation.yml
	modified:   meta/runtime.yml
	modified:   roles/ee_builder/meta/main.yml
	modified:   roles/ee_builder/tasks/00_build_ee.yml
	modified:   roles/ee_builder/tasks/main.yml
	modified:   roles/virtualenv_migrate/README.md
	modified:   roles/virtualenv_migrate/meta/main.yml
  • Loading branch information
djdanielsson committed Jun 18, 2024
2 parents 8ae3428 + 2e31bf5 commit a8c1e6b
Show file tree
Hide file tree
Showing 12 changed files with 693 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/tests/build_ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,4 @@
- RUN yum update -y
- RUN cat /etc/redhat-r*
...

1 change: 1 addition & 0 deletions .github/workflows/ci_testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,4 @@ jobs:
env:
ANSIBLE_HOST_KEY_CHECKING: False
...

6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: end-of-file-fixer
- id: trailing-whitespace
- repo: https://github.com/ansible-community/ansible-lint.git
rev: v6.22.1
rev: v24.6.0
hooks:
# see discussions here about what arguments are used, and behavior
# https://github.com/ansible/ansible-lint/issues/649
Expand All @@ -19,7 +19,7 @@ repos:
args:
- "--profile=production"
- repo: https://github.com/DavidAnson/markdownlint-cli2
rev: v0.11.0
rev: v0.13.0
hooks:
- id: markdownlint-cli2
...
674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,4 @@ More information about contributing can be found in our [Contribution Guidelines

GNU General Public License v3.0 or later.

See [LICENCE](https://www.gnu.org/licenses/gpl-3.0.txt) to see the full text.
See [LICENCE](LICENSE) to see the full text.
4 changes: 4 additions & 0 deletions changelogs/fragments/148-delegation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
bugfixes:
- Fixed an issue where a tempfile was not created locally, but rather on the remote machine
...
2 changes: 1 addition & 1 deletion meta/runtime.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
---
requires_ansible: '>=2.9.6'
requires_ansible: '>=2.14.0'
...
4 changes: 2 additions & 2 deletions roles/ee_builder/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ galaxy_info:
description: Excecution enviroment builder
company: Red Hat

license: license (MIT)
license: GPL-3.0-or-later

min_ansible_version: '2.11'
min_ansible_version: 2.14.0
platforms:
- name: Fedora
versions:
Expand Down
2 changes: 1 addition & 1 deletion roles/ee_builder/tasks/00_build_ee.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
- name: Run the Ansible Builder Program
ansible.builtin.command: >
ansible-builder build -f
{{ ee_builder_dir | default(build_dir.path) }}/execution_environment.yml
execution_environment.yml
-t {{ __execution_environment_definition.name | default( __execution_environment_definition.ee_name )}}{% if __execution_environment_definition.tag is defined %}:{{ __execution_environment_definition.tag }}{% endif %} --container-runtime={{ ee_container_runtime }}
{% if ee_prune_images %} --prune-images{% endif %}
{% if ee_galaxy_keyring is defined %} --galaxy-keyring={{ ee_galaxy_keyring }}{% endif %}
Expand Down
3 changes: 1 addition & 2 deletions roles/ee_builder/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

- name: Push to controller
when: ee_create_controller_def
delegate_to: localhost
block:
- name: Create temporary folder
ansible.builtin.tempfile:
Expand All @@ -19,12 +20,10 @@
src: ee_controller.yaml.j2
dest: "{{ controller_ee.path }}/ee_controller.yaml"
mode: '0644'
delegate_to: localhost

- name: Include templated variable
ansible.builtin.include_vars:
file: "{{ controller_ee.path }}/ee_controller.yaml"
delegate_to: localhost

- name: Display templated variables
ansible.builtin.debug:
Expand Down
4 changes: 2 additions & 2 deletions roles/virtualenv_migrate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ podman on localhost

|Variable Name|Default Value|Required|Description|Example|
|:---:|:---:|:---:|:---:|:---:|
|`venv_migrate_default_ee_url`|`registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel9:latest`|no|"Registry link of the EE you want to compare requirements with"|`localhost/ee:latest`
|`venv_migrate_default_ee_url`|`registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel9:latest`|no|"Registry link of the EE you want to compare requirements with"|`localhost/ee:latest`|
|`registry_username`|None|yes(for default EE value)|username to sign in to the registry|`admin`|
|`registry_password`|None|yes(for default EE value)|password to sign in to the registry|`pass`|
|`ee_collections`|None|No|List of collections to add to the execution environments. Must be in a requirements.yml galaxy format.|``|
|`venv_migrate_show_diff_with_default`|`False`|No|Include default venv with the list of virtual environments scanned.|``|
|`venv_migrate_ee_python_list`|None|No|This is an output variable, if you want to pass the requirements for ee_building|debug:msg="{{ venv_migrate_ee_python_list }}"
|`venv_migrate_ee_python_list`|None|No|This is an output variable, if you want to pass the requirements for ee_building|debug:msg="{{ venv_migrate_ee_python_list }}"|

## Example Playbook

Expand Down
4 changes: 2 additions & 2 deletions roles/virtualenv_migrate/meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ galaxy_info:
# next line and provide a value
# issue_tracker_url: http://example.com/issue/tracker

license: MIT
license: GPL-3.0-or-later

min_ansible_version: '2.9'
min_ansible_version: 2.14.0

platforms:
- name: Fedora
Expand Down

0 comments on commit a8c1e6b

Please sign in to comment.