Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop tito integration #380

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions docs/source/actions.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ Options can be either set on the command line via `-e key=val` or in the `packag

* `build_package_build_system`: which build system should be used, default: `koji`, supported: `koji`, `copr`
* `build_package_koji_command`: when using `koji` build system, which command to use to call it, default: `koji`, supported: `koji`, `brew`, anything else
* `build_package_tito_args`: any args that should be passed to `tito`, default: `''`
* `build_package_scratch`: when building a package, should a scratch build be done, default: `false` (unless you run `obal scratch`, of course)
* `build_package_test`: when building a package with `tito`, should `--test` be passed to it, default: `false`
* `build_package_tito_releaser_args`: any args that should be passed to `tito release`, default: `[]`
* `build_package_wait`: wait for package to be built on the build system, default: `true`
* `build_package_download_logs`: download build logs from the build system after the build has finished, default: `false`
* `diff_package_type`: which build system to query for built packages, default: `koji`, supported: `koji`, `copr`
Expand Down
11 changes: 0 additions & 11 deletions obal/data/module_utils/tito_wrapper.py

This file was deleted.

64 changes: 0 additions & 64 deletions obal/data/modules/tito_build.py

This file was deleted.

59 changes: 0 additions & 59 deletions obal/data/modules/tito_release.py

This file was deleted.

2 changes: 0 additions & 2 deletions obal/data/playbooks/nightly/nightly.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@
- packages
serial: 1
gather_facts: false
vars:
build_package_tito_releaser_args: "{{ nightly_package_tito_releaser_args | default([]) }}"
roles:
- package_variables
tasks:
Expand Down
4 changes: 1 addition & 3 deletions obal/data/playbooks/release/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,5 @@
serial: 1
gather_facts: false
roles:
- role: diff_package
when: not build_package_use_koji_build
- role: build_package
when: (build_package_use_koji_build or diff_package_changed is not defined or diff_package_changed|bool)
when: (diff_package_changed is not defined or diff_package_changed|bool)
1 change: 0 additions & 1 deletion obal/data/playbooks/setup/setup.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
- rpm-build
- koji
- "{{ 'git-annex' if ansible_distribution_major_version == '7' else 'git-annex-standalone' }}"
- tito
- scl-utils
- scl-utils-build
- rpmlint
Expand Down
5 changes: 0 additions & 5 deletions obal/data/roles/build_package/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
---
build_package_build_system: koji
build_package_koji_command: koji
build_package_tito_args: []
build_package_scratch: false
build_package_test: false
build_package_tito_releaser_args: []
build_package_wait: true
build_package_download_logs: false
build_package_download_rpms: false
build_package_waitrepo: false
build_package_koji_whitelist_check: false
build_package_tito_builder:
build_package_use_koji_build: false
build_package_copr_rebuild: false
build_package_skip_failed_build: false
build_package_archive_build_info: false
14 changes: 4 additions & 10 deletions obal/data/roles/build_package/tasks/koji.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,5 @@
---
- name: 'Use tito to build package'
include_tasks: tito_release.yml
when: not build_package_use_koji_build

- when: build_package_use_koji_build
block:
- include_tasks: koji_build.yml
loop: "{{ koji_tags }}"
loop_control:
loop_var: tag
- include_tasks: koji_build.yml
loop: "{{ koji_tags }}"
loop_control:
loop_var: tag
42 changes: 0 additions & 42 deletions obal/data/roles/build_package/tasks/tito_release.yml

This file was deleted.

3 changes: 0 additions & 3 deletions obal/data/roles/build_srpm/defaults/main.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
---
build_srpm_dist:
build_srpm_scl:
build_srpm_tito_build_args: "{{ build_package_tito_releaser_args | default([]) }}"
build_srpm_output_dir: "{{ inventory_dir }}/SRPMs"
build_srpm_tito_args: "{{ build_package_tito_args | default([]) }}"
build_srpm_tito_builder: "{{ build_package_tito_builder | default() }}"
17 changes: 0 additions & 17 deletions obal/data/roles/setup_sources/tasks/git.yml

This file was deleted.

12 changes: 6 additions & 6 deletions obal/data/roles/setup_sources/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
set_fact:
package_dir: "{{ inventory_dir }}/{{ package_base_dir }}/{{ inventory_hostname }}"

- name: 'Setup sources from specfile'
include_tasks: specfile.yml
when: setup_sources_git is not defined
- name: 'Extract Sources from spec'
shell: "spectool --list-files --all {{ spec_file_path }} | awk '{print $2}'"
register: setup_sources_sources
changed_when: false

- name: 'Clone git repository'
include_tasks: git.yml
when: setup_sources_git is defined
- include_tasks: annex.yml
with_items: "{{ setup_sources_sources.stdout_lines | list }}"
8 changes: 0 additions & 8 deletions obal/data/roles/setup_sources/tasks/specfile.yml

This file was deleted.

Empty file removed obal/tito_extensions/__init__.py
Empty file.
Loading
Loading