From c4c34f04a0279d792dd17bb52536f99ff7a1bc1d Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Sun, 13 Feb 2022 16:25:24 -0500 Subject: [PATCH 1/4] Add ansible-builder context directories in .gitignore --- .gitignore | 1 + .../2.12-with-ansible5/context/Containerfile | 25 ------------------- .../context/_build/ansible.cfg | 19 -------------- .../context/_build/bindep.txt | 5 ---- .../context/_build/requirements.txt | 2 -- 5 files changed, 1 insertion(+), 51 deletions(-) create mode 100644 .gitignore delete mode 100644 execution-environments/2.12-with-ansible5/context/Containerfile delete mode 100644 execution-environments/2.12-with-ansible5/context/_build/ansible.cfg delete mode 100644 execution-environments/2.12-with-ansible5/context/_build/bindep.txt delete mode 100644 execution-environments/2.12-with-ansible5/context/_build/requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..91de507 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +execution-environments/*/context \ No newline at end of file diff --git a/execution-environments/2.12-with-ansible5/context/Containerfile b/execution-environments/2.12-with-ansible5/context/Containerfile deleted file mode 100644 index 3395847..0000000 --- a/execution-environments/2.12-with-ansible5/context/Containerfile +++ /dev/null @@ -1,25 +0,0 @@ -ARG EE_BASE_IMAGE=quay.io/ansible/ansible-runner:stable-2.12-devel -ARG EE_BUILDER_IMAGE=quay.io/ansible/ansible-builder:latest - -FROM $EE_BASE_IMAGE as galaxy -ARG ANSIBLE_GALAXY_CLI_COLLECTION_OPTS= -USER root - -ADD _build/ansible.cfg ~/.ansible.cfg - -ADD _build /build -WORKDIR /build - - -FROM $EE_BUILDER_IMAGE as builder -ADD _build/requirements.txt requirements.txt -ADD _build/bindep.txt bindep.txt -RUN ansible-builder introspect --sanitize --user-pip=requirements.txt --user-bindep=bindep.txt --write-bindep=/tmp/src/bindep.txt --write-pip=/tmp/src/requirements.txt -RUN assemble - -FROM $EE_BASE_IMAGE -USER root -COPY --from=builder /output/ /output/ -RUN /output/install-from-bindep && rm -rf /output/wheels -RUN pip3 install ansible -RUN dnf -y install epel-release && dnf --enablerepo=epel -y install cowsay && dnf -y remove epel-release diff --git a/execution-environments/2.12-with-ansible5/context/_build/ansible.cfg b/execution-environments/2.12-with-ansible5/context/_build/ansible.cfg deleted file mode 100644 index 9997630..0000000 --- a/execution-environments/2.12-with-ansible5/context/_build/ansible.cfg +++ /dev/null @@ -1,19 +0,0 @@ -[defaults] -# Cows are a reminder that these are not for production use :) -no_cows = 0 - -# profile_tasks adds dates and durations to ansible console output -callback_whitelist = ansible.posix.profile_tasks - -# A bit of tuning -forks = 50 -gathering = smart -fact_caching = jsonfile -fact_caching_connection = tmp/ -fact_caching_timeout = 3600 - -[ssh_connection] -pipelining = True -control_path = %(directory)s/%%h-%%r -ssh_args = -o ControlMaster=auto -o ControlPersist=270s -o ServerAliveInterval=30 -o GSSAPIAuthentication=no -retries = 3 diff --git a/execution-environments/2.12-with-ansible5/context/_build/bindep.txt b/execution-environments/2.12-with-ansible5/context/_build/bindep.txt deleted file mode 100644 index d050b19..0000000 --- a/execution-environments/2.12-with-ansible5/context/_build/bindep.txt +++ /dev/null @@ -1,5 +0,0 @@ -python38 [platform:rpm] -python38-devel [platform:rpm] -python38-pip [platform:rpm] -procps-ng [platform:rpm] -git [default] diff --git a/execution-environments/2.12-with-ansible5/context/_build/requirements.txt b/execution-environments/2.12-with-ansible5/context/_build/requirements.txt deleted file mode 100644 index 2d7d3b0..0000000 --- a/execution-environments/2.12-with-ansible5/context/_build/requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# include ara for optional test and CI reporting -ara From f26771e6f9531c8e75ef78a01a404e4e3f4e531e Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Sun, 13 Feb 2022 16:30:37 -0500 Subject: [PATCH 2/4] Add ansible-navigator files to .gitignore These are created automatically when running navigator. --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 91de507..3f95b52 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ -execution-environments/*/context \ No newline at end of file +execution-environments/*/context +execution-environments/*/ansible-navigator.log +execution-environments/*/*artifact*.json From f60573c5a6fe8e51135280d6ae26e0fc6ad2fb28 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Sun, 13 Feb 2022 16:31:40 -0500 Subject: [PATCH 3/4] Remove cowsay from test-ee:2.12-with-ansible5 --- execution-environments/2.12-with-ansible5/ansible.cfg | 3 --- .../2.12-with-ansible5/execution-environment.yml | 2 -- 2 files changed, 5 deletions(-) diff --git a/execution-environments/2.12-with-ansible5/ansible.cfg b/execution-environments/2.12-with-ansible5/ansible.cfg index 9997630..903ee11 100644 --- a/execution-environments/2.12-with-ansible5/ansible.cfg +++ b/execution-environments/2.12-with-ansible5/ansible.cfg @@ -1,7 +1,4 @@ [defaults] -# Cows are a reminder that these are not for production use :) -no_cows = 0 - # profile_tasks adds dates and durations to ansible console output callback_whitelist = ansible.posix.profile_tasks diff --git a/execution-environments/2.12-with-ansible5/execution-environment.yml b/execution-environments/2.12-with-ansible5/execution-environment.yml index df6b64e..6ca65c8 100644 --- a/execution-environments/2.12-with-ansible5/execution-environment.yml +++ b/execution-environments/2.12-with-ansible5/execution-environment.yml @@ -14,5 +14,3 @@ additional_build_steps: # The ansible package contains a curated set of Ansible collections in addition to ansible-core, include it in the EE # here since it can't be in requirements.txt for now: https://github.com/ansible/ansible-builder/issues/323 - RUN pip3 install ansible - # Cows are a reminder that these are not for production use :) - - RUN dnf -y install epel-release && dnf --enablerepo=epel -y install cowsay && dnf -y remove epel-release From 2742c2bdaac1f09395201dd3a17c567bfcd58956 Mon Sep 17 00:00:00 2001 From: David Moreau Simard Date: Sun, 13 Feb 2022 16:32:43 -0500 Subject: [PATCH 4/4] Pin centos-stream8 coverage to 4.5.4 --- ansible-test/centos-stream8/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible-test/centos-stream8/requirements.txt b/ansible-test/centos-stream8/requirements.txt index 53b4711..2a74898 100644 --- a/ansible-test/centos-stream8/requirements.txt +++ b/ansible-test/centos-stream8/requirements.txt @@ -1,3 +1,3 @@ -coverage +coverage==4.5.4 # include ara for optional test and CI reporting ara