diff options
| author | Chandan Singh <chandan.devel@gmail.com> | 2018-08-21 13:31:52 +0000 |
|---|---|---|
| committer | Chandan Singh <chandan.devel@gmail.com> | 2018-08-21 13:31:52 +0000 |
| commit | be7533abf18211a37b1895e9cea0bb31401926ff (patch) | |
| tree | b8b723fcf017ef19061fe98db55b88441b93d542 | |
| parent | ce6d5f8c76d3a320105160920ee5c30663c70531 (diff) | |
| parent | 54d152252171e9a4da8b4bfef6a5fcf947fb9d97 (diff) | |
| download | buildstream-be7533abf18211a37b1895e9cea0bb31401926ff.tar.gz | |
Merge branch 'chandan/update-ci-tags-1.2' into 'bst-1.2'
Restrict pylint/pytest versions and bump CI tags
See merge request BuildStream/buildstream!690
| -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 4221ed095..89921d16c 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-" @@ -89,25 +89,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 |