Merge pull request #394 from jpopelka/zuul

Zuul related refactoring changes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul

.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]

.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

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 }}"

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

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

pre-commit-pb.yaml → 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:

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