From 98d85ace2b7655b21cf3d8c8205d18633e972760 Mon Sep 17 00:00:00 2001 From: Sean Sullivan Date: Wed, 25 Jan 2023 08:28:52 -0500 Subject: [PATCH] Update testing and CI (#68) * update * update * update tests and fix ci --- .ansible-lint | 3 +- .github/tests/ee_builder.yaml | 4 +- .github/workflows/ci_testing.yaml | 2 +- roles/ee_builder/README.md | 2 + roles/virtualenv_migrate/tasks/01_ee_diff.yml | 40 +++++++++---------- 5 files changed, 27 insertions(+), 24 deletions(-) diff --git a/.ansible-lint b/.ansible-lint index d349bd4..c7de0e1 100644 --- a/.ansible-lint +++ b/.ansible-lint @@ -13,7 +13,8 @@ use_default_rules: true # https://github.com/ansible/ansible-lint/issues/808 # with verbosity set to 1, its dumping 'unknown file type messages' # verbosity: 1 -skip_list: [] +skip_list: + - meta-unsupported-ansible kinds: - playbooks: "**/examples/*.{yml,yaml}" - tasks: "**/examples/tasks/*.yml" diff --git a/.github/tests/ee_builder.yaml b/.github/tests/ee_builder.yaml index f1d7927..286f3b3 100644 --- a/.github/tests/ee_builder.yaml +++ b/.github/tests/ee_builder.yaml @@ -13,8 +13,8 @@ ee_list: - name: custom_ee alt_name: Custom EE - ee_base_image: 1registry.redhat.io/ansible-automation-platform-23/ee-supported-rhel8:latest - ee_builder_image: 1registry.redhat.io/ansible-automation-platform-23/ansible-builder-rhel8:latest + ee_base_image: registry.redhat.io/ansible-automation-platform-23/ee-supported-rhel8:latest + ee_builder_image: registry.redhat.io/ansible-automation-platform-23/ansible-builder-rhel8:latest tag: 1-11-21-2 # base_image bindep: diff --git a/.github/workflows/ci_testing.yaml b/.github/workflows/ci_testing.yaml index 1f178e9..435bed4 100644 --- a/.github/workflows/ci_testing.yaml +++ b/.github/workflows/ci_testing.yaml @@ -22,7 +22,7 @@ jobs: run: ansible-galaxy collection install containers.podman -f - name: Docker login - run: docker login -u="redhat_cop+github_action" -p="${{ secrets.quay_token }}" quay.io + run: docker login -u="redhat_cop+github_action" -p=${{ secrets.QUAY_TOKEN }} quay.io - name: Build EE run: ansible-playbook .github/tests/build_ee.yml -e "ee_registry_username=redhat_cop+github_action" -e "ee_registry_password=${{ secrets.quay_token }}" --connection=local -e "ee_registry_dest=quay.io/redhat_cop/config_as_code_ee" -vvv diff --git a/roles/ee_builder/README.md b/roles/ee_builder/README.md index bb315bf..43de856 100644 --- a/roles/ee_builder/README.md +++ b/roles/ee_builder/README.md @@ -148,6 +148,8 @@ ansible-playbook playbook.yml - awxkit # For import and export modules collections: - name: awx.awx + type: url + source: https://galaxy.ansible.com/download/awx-awx-21.11.0.tar.gz - name: redhat_cop.controller_configuration - name: redhat_cop.ah_configuration prepend: diff --git a/roles/virtualenv_migrate/tasks/01_ee_diff.yml b/roles/virtualenv_migrate/tasks/01_ee_diff.yml index f4329da..156e394 100644 --- a/roles/virtualenv_migrate/tasks/01_ee_diff.yml +++ b/roles/virtualenv_migrate/tasks/01_ee_diff.yml @@ -2,28 +2,28 @@ - name: Diff with EE requirements delegate_to: localhost block: - - name: Diff | Download the default EE on localhost - containers.podman.podman_image: - name: "{{ venv_migrate_default_ee_url }}" - username: "{{ venv_migrate_registry_username }}" - password: "{{ venv_migrate_registry_password }}" + - name: Diff | Download the default EE on localhost + containers.podman.podman_image: + name: "{{ venv_migrate_default_ee_url }}" + username: "{{ venv_migrate_registry_username }}" + password: "{{ venv_migrate_registry_password }}" - - name: Diff | Get pip list from Default EE - ansible.builtin.command: "podman run --rm -it {{ venv_migrate_default_ee_url }} bash -c \"/bin/pip3 freeze\"" - register: __venv_migrate_ee_pip_list_output - changed_when: false + - name: Diff | Get pip list from Default EE + ansible.builtin.command: "podman run --rm -it {{ venv_migrate_default_ee_url }} bash -c \"/bin/pip3 freeze\"" + register: __venv_migrate_ee_pip_list_output + changed_when: false - - name: Diff | Retain the EE pip list without package versions - ansible.builtin.set_fact: - __venv_migrate_ee_pip_list: "{{ __venv_migrate_ee_pip_list_output.stdout.split('\n') | map('regex_replace', '(\\w+)==([\\d+\\.]+).*', '\\1') | list }}" + - name: Diff | Retain the EE pip list without package versions + ansible.builtin.set_fact: + __venv_migrate_ee_pip_list: "{{ __venv_migrate_ee_pip_list_output.stdout.split('\n') | map('regex_replace', '(\\w+)==([\\d+\\.]+).*', '\\1') | list }}" - - name: Diff | Check what's extra in venv and create a requirement list for the new EE and set to ee_python variable - ansible.builtin.set_fact: - venv_migrate_ee_python_list: "{{ venv_migrate_ee_python_list | d([]) + [{item.item: (item.stdout_lines | difference(__venv_migrate_ee_pip_list))}] }}" - loop: "{{ __venv_migrate_combined_requirements_ser }}" - no_log: true + - name: Diff | Check what's extra in venv and create a requirement list for the new EE and set to ee_python variable + ansible.builtin.set_fact: + venv_migrate_ee_python_list: "{{ venv_migrate_ee_python_list | d([]) + [{item.item: (item.stdout_lines | difference(__venv_migrate_ee_pip_list))}] }}" + loop: "{{ __venv_migrate_combined_requirements_ser }}" + no_log: true - - name: Diff | Show the packages that are extra from default EEs in custom venvs. - ansible.builtin.debug: - msg: "{{ venv_migrate_ee_python_list }}" + - name: Diff | Show the packages that are extra from default EEs in custom venvs. + ansible.builtin.debug: + msg: "{{ venv_migrate_ee_python_list }}" ...