From 0dd0503720771c3f944afd148ee4c17abc8c998c Mon Sep 17 00:00:00 2001 From: Michal Konečný Date: Apr 21 2022 11:02:56 +0000 Subject: Migrate zuul jobs to centralized repository This commit migrates the zuul jobs from this repository to https://pagure.io/fedora-infra/zuul and calls those migrated jobs instead. Signed-off-by: Michal Konečný --- diff --git a/.zuul.yaml b/.zuul.yaml index 0b3dd15..638bbbb 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -1,31 +1,51 @@ --- -- job: - name: pre-commit - run: ci/pre-commit.yaml - nodeset: fedora-34-vm -- job: - name: pytest-rawhide - run: ci/pytest.yaml - nodeset: fedora-rawhide-vm -- job: - name: pytest-f34 - run: ci/pytest.yaml - nodeset: fedora-34-vm -- job: - name: pytest-f33 - run: ci/pytest.yaml - nodeset: fedora-33-vm - project: check: jobs: - - pre-commit - - pytest-rawhide - - pytest-f34 - - pytest-f33 + - fi-pre-commit + - fi-pytest-rawhide: + vars: + dependencies: + - glibc-langpack-de + - glibc-langpack-en + - python3-babel + - python3-koji + - python3-pygit2 + - python3-pytest + - python3-pytest-cov + - python3-pyyaml + - python3-rpm + - fi-pytest-f34: + vars: + dependencies: + - glibc-langpack-de + - glibc-langpack-en + - python3-babel + - python3-koji + - python3-pygit2 + - python3-pytest + - python3-pytest-cov + - python3-pyyaml + - python3-rpm + - fi-pytest-f35: + vars: + dependencies: + - glibc-langpack-de + - glibc-langpack-en + - python3-babel + - python3-koji + - python3-pygit2 + - python3-pytest + - python3-pytest-cov + - python3-pyyaml + - python3-rpm - rpm-mock-build: vars: - mock_config: fedora-34-x86_64 + mock_config: fedora-35-x86_64 build_from_source: true version_from_specfile: true src_name: rpmautospec - nodeset: fedora-34-vm + nodeset: + nodes: + name: test-node + label: zuul-worker-f35 diff --git a/ci/pre-commit.yaml b/ci/pre-commit.yaml deleted file mode 100644 index 1329ee4..0000000 --- a/ci/pre-commit.yaml +++ /dev/null @@ -1,20 +0,0 @@ ---- -- hosts: all - - tasks: - - name: List project directory on the test system - command: "ls -al {{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - - - name: install pip - become: yes - package: - name: python3-pip - state: present - - - name: install pre-commit - command: pip install pre-commit --user - - - name: run pre-commit - command: - chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - cmd: pre-commit run --all diff --git a/ci/pytest.yaml b/ci/pytest.yaml deleted file mode 100644 index 4c5367b..0000000 --- a/ci/pytest.yaml +++ /dev/null @@ -1,26 +0,0 @@ ---- -- hosts: all - - tasks: - - name: List project directory on the test system - command: "ls -al {{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - - - name: install dependencies - become: yes - package: - name: - - glibc-langpack-de - - glibc-langpack-en - - python3-babel - - python3-koji - - python3-pygit2 - - python3-pytest - - python3-pytest-cov - - python3-pyyaml - - python3-rpm - state: present - - - name: run pytest - command: - chdir: "{{ ansible_user_dir }}/{{ zuul.project.src_dir }}" - cmd: python -m pytest