diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-08-21 13:57:00 +0000 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2018-08-21 13:57:00 +0000 |
| commit | 320b95627123eab634b6642e7cd5c5e2083e04cf (patch) | |
| tree | 36e1386fe6aa7b188e2380e6cc0052e284b970c7 | |
| parent | 3a4c147a9096e02f57c6057e0744e0c5c4d50fd2 (diff) | |
| parent | 12d1cec27d55914ed3ba29a4b66e5ee4521aef75 (diff) | |
| download | buildstream-320b95627123eab634b6642e7cd5c5e2083e04cf.tar.gz | |
Merge branch 'chandan/update-ci-tags' into 'master'
Restrict pylint/pytest versions and bump CI tags
See merge request BuildStream/buildstream!689
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | dev-requirements.txt | 3 |
2 files changed, 8 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7f39c09a0..f68571d9c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,4 +1,4 @@ -image: buildstream/testsuite-debian:9-master-112-a9f63c5e +image: buildstream/testsuite-debian:9-master-114-4cab18e3 cache: key: "$CI_JOB_NAME-" @@ -79,25 +79,25 @@ source_dist: - coverage-linux/ tests-debian-9: - image: buildstream/testsuite-debian:9-master-112-a9f63c5e + image: buildstream/testsuite-debian:9-master-114-4cab18e3 <<: *linux-tests tests-fedora-27: - image: buildstream/testsuite-fedora:27-master-112-a9f63c5e + image: buildstream/testsuite-fedora:27-master-114-4cab18e3 <<: *linux-tests tests-fedora-28: - image: buildstream/testsuite-fedora:28-master-112-a9f63c5e + image: buildstream/testsuite-fedora:28-master-114-4cab18e3 <<: *linux-tests tests-ubuntu-18.04: - image: buildstream/testsuite-ubuntu:18.04-master-112-a9f63c5e + image: buildstream/testsuite-ubuntu:18.04-master-114-4cab18e3 <<: *linux-tests 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-112-a9f63c5e + image: buildstream/testsuite-fedora:27-master-114-4cab18e3 stage: test variables: BST_FORCE_BACKEND: "unix" diff --git a/dev-requirements.txt b/dev-requirements.txt index 81429f0ef..ee2db0351 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,6 +1,7 @@ coverage == 4.4.0 pep8 -pytest >= 3.1.0 +pylint == 2.1.1 +pytest >= 3.7 pytest-cov >= 2.5.0 pytest-datafiles pytest-env |