Skip to content

Commit

Permalink
V3 update (#115)
Browse files Browse the repository at this point in the history
* update tests

* fix default options

* update tests
  • Loading branch information
sean-m-sullivan committed Jun 28, 2023
1 parent 64d2d1e commit e7e4831
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 73 deletions.
31 changes: 0 additions & 31 deletions .github/tests/ee_builder/ee_builder.yml

This file was deleted.

38 changes: 0 additions & 38 deletions .github/tests/ee_builder/ee_builder_base.yml

This file was deleted.

4 changes: 3 additions & 1 deletion .github/workflows/ci_testing.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
---
name: Run Test of EE utilities
on: [push, pull_request]
on:
push:
pull_request:

jobs:
Integration-test:
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,5 @@ collections/*

# Ignore test directory
test

galaxy.yml
2 changes: 1 addition & 1 deletion roles/ee_builder/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ Best practice is to use the default images, unless needing to pull from another
|`ee_container_policy`||no|str|The container image validation policy to use with podman. Can be one of 'ignore_all', 'system','signature_required'.|ignore_all|
|`ee_verbosity`|0|no|int|Options Increase the output verbosity, can be from 0-3.||
|`ee_prune_images`|true|no|bool|To enable or disable pruning the images after building.||
|`ee_stream`|upstream unless ee_base_registry_username is defined then downstream|no|str|What stream to pull images from either upstream or downstream.||
|`ee_stream`|upstream unless ee_base_registry_username is defined then downstream|no|str|What stream to pull images from either upstream or downstream. Also changes package manager used for downstream to microdnf to avoid errors.||
|`ee_update_base_images`|false|no|bool|Whether to pull down images, this forces an update to avoid stale images.||
|`ee_base_image`|registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel9:latest|no|str|Build arg specifies parent image for the execution environment. Use the images option to override this for an individual list item.||
|`ee_base_registry_username`|ee_registry_username|no|str|Username to use when authenticating to base registries. If neither ee or base registry provided will be omitted.||
Expand Down
3 changes: 1 addition & 2 deletions roles/ee_builder/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ ansible_cfg_file: ansible.cfg
ee_list: []

# Major section Options
ee_build_options:
package_manager_path: /usr/bin/microdnf # This is set because the default images and redhat images require microdnf
ee_build_options: "{{ __ee_dnf_fix[ee_stream] }}"
ee_build_arg_defaults:
ANSIBLE_GALAXY_CLI_COLLECTION_OPTS: '-vv'

Expand Down
5 changes: 5 additions & 0 deletions roles/ee_builder/vars/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,9 @@ __ee_stream_images:
base_image: quay.io/ansible/ansible-runner:latest
downstream:
base_image: registry.redhat.io/ansible-automation-platform-24/ee-minimal-rhel9:latest

__ee_dnf_fix:
upstream: {}
downstream:
package_manager_path: /usr/bin/microdnf # This is set because the default images and redhat images require microdnf
...

0 comments on commit e7e4831

Please sign in to comment.