Merge branch 'jjardon/ci_fedora28' into 'master'

Add job to run tests in fedora 28

See merge request BuildStream/buildstream!643

3 files changed, 12 insertions, 12 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0cfb433fc..7f39c09a0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,4 +1,4 @@
-image: buildstream/testsuite-debian:9-master-102-9067e269
+image: buildstream/testsuite-debian:9-master-112-a9f63c5e
 
 cache:
   key: "$CI_JOB_NAME-"
@@ -79,11 +79,15 @@ source_dist:
     - coverage-linux/
 
 tests-debian-9:
-  image: buildstream/testsuite-debian:9-master-102-9067e269
+  image: buildstream/testsuite-debian:9-master-112-a9f63c5e
   <<: *linux-tests
 
 tests-fedora-27:
-  image: buildstream/testsuite-fedora:27-master-102-9067e269
+  image: buildstream/testsuite-fedora:27-master-112-a9f63c5e
+  <<: *linux-tests
+
+tests-fedora-28:
+  image: buildstream/testsuite-fedora:28-master-112-a9f63c5e
   <<: *linux-tests
 
 tests-ubuntu-18.04:
@@ -93,7 +97,7 @@ tests-ubuntu-18.04:
 tests-unix:
   # Use fedora here, to a) run a test on fedora and b) ensure that we
   # can get rid of ostree - this is not possible with debian-8
-  image: buildstream/testsuite-fedora:27-master-102-9067e269
+  image: buildstream/testsuite-fedora:27-master-112-a9f63c5e
   stage: test
   variables:
     BST_FORCE_BACKEND: "unix"
@@ -214,6 +218,7 @@ coverage:
   dependencies:
   - tests-debian-9
   - tests-fedora-27
+  - tests-fedora-28
   - tests-unix
   - source_dist
 
diff --git a/dev-requirements.txt b/dev-requirements.txt
index d3d4ab64a..81429f0ef 100644
--- a/dev-requirements.txt
+++ b/dev-requirements.txt
@@ -1,5 +1,3 @@
-# Pin coverage to 4.2 for now, we're experiencing
-# random crashes with 4.4.2
 coverage == 4.4.0
 pep8
 pytest >= 3.1.0
@@ -8,5 +6,4 @@ pytest-datafiles
 pytest-env
 pytest-pep8
 pytest-pylint
-# Provide option to run tests in parallel, less reliable
 pytest-xdist
diff --git a/setup.py b/setup.py
index 700d9df96..35b8245c9 100755
--- a/setup.py
+++ b/setup.py
@@ -221,10 +221,8 @@ def get_cmdclass():
 #####################################################
 #               Gather requirements                 #
 #####################################################
-setup_requires = set(['pytest-runner'])
 with open('dev-requirements.txt') as dev_reqs:
-    dev_requires = set([line for line in dev_reqs.read().split('\n')
-                        if not line.strip().startswith('#')])
+    dev_requires = dev_reqs.read().splitlines()
 
 
 #####################################################
@@ -269,6 +267,6 @@ setup(name='BuildStream',
           'grpcio >= 1.10',
       ],
       entry_points=bst_install_entry_points,
-      setup_requires=list(setup_requires),
-      tests_require=list(dev_requires - setup_requires),
+      setup_requires=['pytest-runner'],
+      tests_require=dev_requires,
       zip_safe=False)