diff --git a/.github/tests/build_ee.yml b/.github/tests/build_ee.yml index 7539cac..24307df 100644 --- a/.github/tests/build_ee.yml +++ b/.github/tests/build_ee.yml @@ -6,7 +6,7 @@ pre_tasks: - name: Validate that ansible-builder is installed on target system block: - - name: Try command + - name: Try command # noqa command-instead-of-shell ansible.builtin.shell: ansible-builder --version register: r_builder changed_when: false @@ -22,7 +22,7 @@ state: present become: true rescue: - - name: Install ansible-builder from pip + - name: Install ansible-builder from pip # noqa package-latest ansible.builtin.pip: name: - ansible-builder @@ -35,9 +35,15 @@ name: ee_builder vars: ee_pull_collections_from_hub: false + ee_container_runtime: podman + ee_base_image: quay.io/centos/centos:stream9 ee_list: - name: config_as_code_ee dependencies: + ansible_core: + package_pip: ansible-core + ansible_runner: + package_pip: ansible-runner system: - unzip python: @@ -45,18 +51,14 @@ - netaddr galaxy: collections: - - name: infra.controller_configuration - - name: infra.ah_configuration - - name: infra.ee_utilities - - name: infra.aap_utilities - - name: infra.eda_configuration - type: git - source: https://github.com/redhat-cop/eda_configuration.git - - name: awx.awx + - infra.controller_configuration + - infra.ah_configuration + - infra.eda_configuration + - infra.ee_utilities + - infra.aap_utilities + - awx.awx build_steps: append_final: - - RUN true && microdnf clean all && microdnf upgrade --refresh && microdnf clean all && true + - RUN yum update -y - RUN cat /etc/redhat-r* - options: - package_manager_path: /usr/bin/microdnf ... diff --git a/.github/workflows/ci_testing.yaml b/.github/workflows/ci_testing.yml similarity index 68% rename from .github/workflows/ci_testing.yaml rename to .github/workflows/ci_testing.yml index 6b15440..51da620 100644 --- a/.github/workflows/ci_testing.yaml +++ b/.github/workflows/ci_testing.yml @@ -1,24 +1,24 @@ --- name: Run Test of EE utilities -on: - push: - pull_request: +on: [push] jobs: Integration-test: - name: Run Test of EE utilities runs-on: ubuntu-latest steps: - name: Checkout uses: actions/checkout@v3 - - uses: actions/setup-python@v4 + - uses: actions/setup-python@v5 with: python-version: '3.x' + - name: Install podman + run: sudo apt -y install podman + - name: Install Ansible and Ansible Builder - run: pip install --upgrade ansible-core ansible-builder + run: pip install --upgrade setuptools ansible-core ansible-builder - name: Move ansible.cfg to root run: mv .github/files/ansible.cfg . @@ -26,12 +26,8 @@ jobs: - name: Install Dependencies run: ansible-galaxy collection install containers.podman -f - - name: Docker login - uses: docker/login-action@v3 - with: - registry: quay.io - username: redhat_cop+github_action - password: ${{ secrets.quay_token }} + - name: podman login + run: podman login quay.io --username redhat_cop+github_action --password ${{ secrets.quay_token }} - 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/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml index 8bb44e0..68489d7 100644 --- a/.github/workflows/pre-commit.yml +++ b/.github/workflows/pre-commit.yml @@ -3,7 +3,6 @@ # See .pre-commit-config.yaml for what hooks are executed name: pre-commit tests - on: pull_request: push: diff --git a/.github/workflows/update_pre_commit.yml b/.github/workflows/update_pre_commit.yml index edbd052..8477150 100644 --- a/.github/workflows/update_pre_commit.yml +++ b/.github/workflows/update_pre_commit.yml @@ -3,7 +3,6 @@ # See .pre-commit-config.yaml for what hooks are executed name: Update pre-commit configuration - on: schedule: - cron: "0 5 * * *"