Skip to content
This repository was archived by the owner on Apr 30, 2020. It is now read-only.

Commit db8feaf

Browse files
committed
1 parent 16ca638 commit db8feaf

File tree

5 files changed

+21
-10
lines changed

5 files changed

+21
-10
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
FROM fedora
22

33
RUN dnf -y install --setopt=install_weak_deps=false --setopt=tsflags=nodocs \
4-
--setopt=deltarpm=false python2-rpm python3-rpm tox python2-dnf \
5-
python3-dnf mock --allowerasing --best && dnf clean all
4+
--setopt=deltarpm=false python3-rpm tox python3-dnf \
5+
mock --allowerasing --best && dnf clean all
66

77
ENV LANG=C.UTF-8 LC_ALL=C.UTF-8
88

README.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Tests
5050

5151
This task is covered with functional and integration tests.
5252
You can run them using `tox <https://tox.readthedocs.io/>`__, but
53-
you will need ``mock``, ``python{2,3}-rpm`` and ``python{2,3}-dnf`` installed.
53+
you will need ``mock``, ``python3-rpm`` and ``python3-dnf`` installed.
5454
For mock configuration see
5555
`mock setup <https://github.com/rpm-software-management/mock/wiki#setup>`__
5656
instructions. Use the following command to run the test suite::

mock.cfg

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,14 @@ config_opts['rpmbuild_networking'] = True
66
config_opts['use_nspawn'] = False
77
config_opts['root'] = 'taskotron-python-versions-master'
88
config_opts['plugin_conf']['root_cache_opts']['dir'] = "%(cache_topdir)s/taskotron-python-versions/root_cache/"
9+
config_opts['yum.conf'] += """
10+
[kparal-taskotron-dev]
11+
name=kparal-taskotron-dev
12+
baseurl=https://copr-be.cloud.fedoraproject.org/results/kparal/taskotron-dev/fedora-$releasever-$basearch/
13+
type=rpm-md
14+
skip_if_unavailable=False
15+
gpgcheck=1
16+
gpgkey=https://copr-be.cloud.fedoraproject.org/results/kparal/taskotron-dev/pubkey.gpg
17+
repo_gpgcheck=0
18+
enabled=1
19+
"""

tests.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
name: "{{ item }}"
1717
state: latest
1818
with_items:
19-
- rpm-python
20-
- python2-dnf
21-
- python2-libarchive-c
22-
- python-bugzilla
19+
- python3-rpm
20+
- python3-dnf
21+
- python3-libarchive-c
22+
- python3-bugzilla
2323
- libtaskotron-core
2424
- libtaskotron-fedora
2525
register: dnf_output
@@ -66,13 +66,13 @@
6666
- block:
6767
- name: Download RPMs from Koji
6868
shell: >
69-
python2 download_rpms.py {{ taskotron_item }} {{ workdir.path }}
69+
python3 download_rpms.py {{ taskotron_item }} {{ workdir.path }}
7070
{{ test_arches | join(',') }}
7171
&> {{ artifacts }}/test.log
7272
7373
- name: Run task
7474
shell: >
75-
python2 python_versions_check.py {{ taskotron_item }} {{ workdir.path }}
75+
python3 python_versions_check.py {{ taskotron_item }} {{ workdir.path }}
7676
{{ artifacts }} {{ testcase }} {{ test_arches | join(',') }}
7777
&>> {{ artifacts }}/test.log
7878
always:

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py27,py3,integration,style
2+
envlist = py3,integration,style
33
skipsdist = True
44

55
[testenv]

0 commit comments

Comments
 (0)