finnball pushed to branch master at BuildGrid / buildgrid
Commits:
-
719646e0
by James Ennis at 2018-07-30T09:57:02Z
-
80568d4e
by James Ennis at 2018-07-30T09:57:02Z
-
e8221e63
by James Ennis at 2018-07-30T09:57:02Z
2 changed files:
Changes:
| 1 |
-image: buildstream/buildstream-fedora:master-81-06ae434
|
|
| 1 |
+# Use a debian image with python 3.5 (and pip3) pre-installed
|
|
| 2 |
+image: python:3.5-stretch
|
|
| 2 | 3 |
|
| 3 | 4 |
variables:
|
| 4 | 5 |
BGD: bgd --verbose
|
| ... | ... | @@ -8,6 +9,7 @@ stages: |
| 8 | 9 |
- post
|
| 9 | 10 |
|
| 10 | 11 |
before_script:
|
| 12 |
+ - pip3 install setuptools
|
|
| 11 | 13 |
- export PATH=~/.local/bin:${PATH}
|
| 12 | 14 |
- pip3 install --user -e .
|
| 13 | 15 |
|
| ... | ... | @@ -31,30 +33,19 @@ before_script: |
| 31 | 33 |
- ${BGD} bot --host=0.0.0.0 dummy &
|
| 32 | 34 |
- ${BGD} execute --host=0.0.0.0 request --wait-for-completion
|
| 33 | 35 |
|
| 34 |
-tests-debian:
|
|
| 35 |
- image: buildstream/buildstream-debian
|
|
| 36 |
- <<: *linux-tests
|
|
| 37 |
- |
|
| 38 |
-# Need to yum install until we have our own image
|
|
| 39 |
-tests-fedora:
|
|
| 36 |
+tests-debian-stretch:
|
|
| 40 | 37 |
<<: *linux-tests
|
| 41 |
- script:
|
|
| 42 |
- - yum -y install clang libffi-devel openssl-devel python3-devel
|
|
| 43 |
- - python3 setup.py test
|
|
| 44 |
- - mkdir -p coverage/
|
|
| 45 |
- - cp .coverage.* coverage/coverage."${CI_JOB_NAME}"
|
|
| 46 | 38 |
|
| 47 | 39 |
run-dummy-job-debian:
|
| 48 | 40 |
image: buildstream/buildstream-debian
|
| 49 | 41 |
<<: *dummy-job
|
| 50 | 42 |
|
| 51 |
-run-dummy-job-fedora:
|
|
| 52 |
- <<: *dummy-job
|
|
| 53 | 43 |
|
| 54 | 44 |
coverage:
|
| 55 | 45 |
stage: post
|
| 56 | 46 |
coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/'
|
| 57 | 47 |
script:
|
| 48 |
+ - pip3 install coverage==4.4.0
|
|
| 58 | 49 |
- mkdir report
|
| 59 | 50 |
- cd report
|
| 60 | 51 |
- cp ../coverage/coverage.* .
|
| ... | ... | @@ -62,14 +53,14 @@ coverage: |
| 62 | 53 |
- coverage combine --rcfile=../.coveragerc -a coverage.*
|
| 63 | 54 |
- coverage report --rcfile=../.coveragerc -m
|
| 64 | 55 |
dependencies:
|
| 65 |
- - tests-fedora
|
|
| 56 |
+ - tests-debian-stretch
|
|
| 66 | 57 |
|
| 67 | 58 |
# Deploy, only for merges which land on master branch.
|
| 68 | 59 |
#
|
| 69 | 60 |
pages:
|
| 70 | 61 |
stage: post
|
| 71 | 62 |
dependencies:
|
| 72 |
- - tests-fedora
|
|
| 63 |
+ - tests-debian-stretch
|
|
| 73 | 64 |
script:
|
| 74 | 65 |
- mv coverage/ public/
|
| 75 | 66 |
artifacts:
|
| ... | ... | @@ -41,7 +41,6 @@ setup( |
| 41 | 41 |
description="A remote execution service",
|
| 42 | 42 |
packages=setuptools.find_packages(),
|
| 43 | 43 |
install_requires=[
|
| 44 |
- 'setuptools',
|
|
| 45 | 44 |
'protobuf',
|
| 46 | 45 |
'grpcio',
|
| 47 | 46 |
'Click',
|
| ... | ... | @@ -54,13 +53,9 @@ setup( |
| 54 | 53 |
''',
|
| 55 | 54 |
setup_requires=['pytest-runner'],
|
| 56 | 55 |
tests_require=['pep8',
|
| 57 |
- 'boto3',
|
|
| 58 |
- 'botocore',
|
|
| 59 | 56 |
'moto',
|
| 60 | 57 |
'coverage == 4.4.0',
|
| 61 | 58 |
'pytest-cov >= 2.5.0',
|
| 62 | 59 |
'pytest-pep8',
|
| 63 |
- 'pytest-pylint',
|
|
| 64 |
- 'pytest >= 3.1.0',
|
|
| 65 |
- 'pylint >= 1.8 , < 2'],
|
|
| 60 |
+ 'pytest >= 3.1.0'],
|
|
| 66 | 61 |
)
|