diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 95c62a4e..61ba29dc 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -9,7 +9,7 @@ repos: - id: black language_version: python3.6 - repo: https://github.com/prettier/prettier - rev: 1.19.1 + rev: 2.0.5 hooks: - id: prettier exclude: tests/integration/test_data/* @@ -29,7 +29,7 @@ repos: - id: flake8 args: [--max-line-length=100] - repo: https://github.com/pre-commit/mirrors-mypy - rev: v0.761 + rev: v0.770 hooks: - id: mypy args: [--no-strict-optional, --ignore-missing-imports] diff --git a/.zuul.yaml b/.zuul.yaml index 1ff812b5..4e3ad7ae 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -20,7 +20,7 @@ nodeset: nodes: - name: test-node - label: cloud-fedora-30 + label: cloud-fedora-31 - job: name: ogr-tests-rpm @@ -40,7 +40,7 @@ name: ogr-pre-commit parent: ogr-parent description: Run pre-commit - run: pre-commit-pb.yaml + run: files/zuul-pre-commit.yaml - job: name: ogr-reverse-dep-packit-tests diff --git a/files/tasks/install-ansible.yaml b/files/tasks/install-ansible.yaml deleted file mode 100644 index 75d5771b..00000000 --- a/files/tasks/install-ansible.yaml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: Install ansible - dnf: - name: - - ansible - state: present - become: true diff --git a/files/tasks/packit-requirements.yaml b/files/tasks/packit-requirements.yaml index e6d3db66..4d9028cf 100644 --- a/files/tasks/packit-requirements.yaml +++ b/files/tasks/packit-requirements.yaml @@ -1,5 +1,12 @@ --- -- name: install packit dependencies via ansible playbooks +- name: Install ansible + dnf: + name: + - ansible + state: present + become: true + +- name: Install packit dependencies via ansible playbooks command: ansible-playbook -e "ansible_python_interpreter=/usr/bin/python3" -v -c local -i localhost, files/zuul-install-requirements-pip.yaml args: chdir: "{{ reverse_dir }}" diff --git a/files/zuul-install-requirements-pip.yaml b/files/zuul-install-requirements-pip.yaml index 1373bcd6..f7a0ed85 100644 --- a/files/zuul-install-requirements-pip.yaml +++ b/files/zuul-install-requirements-pip.yaml @@ -1,5 +1,5 @@ --- -- name: Install dependencies for PIP ogr. +- name: Install dependencies for PIP ogr hosts: all tasks: - include_tasks: tasks/generic-dnf-requirements.yaml diff --git a/files/zuul-install-requirements-rpms.yaml b/files/zuul-install-requirements-rpms.yaml index 33e9d9ba..1a9743b6 100644 --- a/files/zuul-install-requirements-rpms.yaml +++ b/files/zuul-install-requirements-rpms.yaml @@ -1,5 +1,5 @@ --- -- name: Install RPM dependencies for ogr. +- name: Install RPM dependencies for ogr hosts: all tasks: - include_tasks: tasks/zuul-project-setup.yaml diff --git a/pre-commit-pb.yaml b/files/zuul-pre-commit.yaml similarity index 64% rename from pre-commit-pb.yaml rename to files/zuul-pre-commit.yaml index ab7d8943..7f86f1c0 100644 --- a/pre-commit-pb.yaml +++ b/files/zuul-pre-commit.yaml @@ -12,18 +12,10 @@ name: - git-core - python36 - become: true - - name: Install pre-commit PyPI package - pip: - name: pre-commit + - pre-commit become: true tags: - stop-layering - - name: Install pre-commit for the repo - command: pre-commit install - args: - chdir: "{{ project_dir }}" - become: true - name: Run it command: pre-commit run --all-files args: diff --git a/files/zuul-reverse-dep-packit.yaml b/files/zuul-reverse-dep-packit.yaml index 620873b6..4876800d 100644 --- a/files/zuul-reverse-dep-packit.yaml +++ b/files/zuul-reverse-dep-packit.yaml @@ -7,7 +7,6 @@ - include_tasks: tasks/zuul-project-setup.yaml - include_tasks: tasks/generic-dnf-requirements.yaml - include_tasks: tasks/rpm-test-deps.yaml - - include_tasks: tasks/install-ansible.yaml - include_tasks: tasks/packit-requirements.yaml - include_tasks: tasks/install-ogr.yaml - include_tasks: tasks/packit-tests.yaml