... |
... |
@@ -56,7 +56,7 @@ source_dist: |
56
|
56
|
|
57
|
57
|
# Run premerge commits
|
58
|
58
|
#
|
59
|
|
-.linux-tests-template: &linux-tests
|
|
59
|
+.linux-tests-template: &tests
|
60
|
60
|
stage: test
|
61
|
61
|
|
62
|
62
|
variables:
|
... |
... |
@@ -91,27 +91,28 @@ source_dist: |
91
|
91
|
|
92
|
92
|
tests-debian-9:
|
93
|
93
|
image: buildstream/testsuite-debian:9-master-119-552f5fc6
|
94
|
|
- <<: *linux-tests
|
|
94
|
+ <<: *tests
|
95
|
95
|
|
96
|
96
|
tests-fedora-27:
|
97
|
97
|
image: buildstream/testsuite-fedora:27-master-119-552f5fc6
|
98
|
|
- <<: *linux-tests
|
|
98
|
+ <<: *tests
|
99
|
99
|
|
100
|
100
|
tests-fedora-28:
|
101
|
101
|
image: buildstream/testsuite-fedora:28-master-119-552f5fc6
|
102
|
|
- <<: *linux-tests
|
|
102
|
+ <<: *tests
|
103
|
103
|
|
104
|
104
|
tests-ubuntu-18.04:
|
105
|
105
|
image: buildstream/testsuite-ubuntu:18.04-master-119-552f5fc6
|
106
|
|
- <<: *linux-tests
|
|
106
|
+ <<: *tests
|
107
|
107
|
|
108
|
108
|
tests-unix:
|
109
|
109
|
# Use fedora here, to a) run a test on fedora and b) ensure that we
|
110
|
110
|
# can get rid of ostree - this is not possible with debian-8
|
111
|
111
|
image: buildstream/testsuite-fedora:27-master-119-552f5fc6
|
112
|
|
- stage: test
|
|
112
|
+ <<: *tests
|
113
|
113
|
variables:
|
114
|
114
|
BST_FORCE_BACKEND: "unix"
|
|
115
|
+ COVERAGE_DIR: coverage-unix
|
115
|
116
|
|
116
|
117
|
script:
|
117
|
118
|
|
... |
... |
@@ -121,23 +122,11 @@ tests-unix: |
121
|
122
|
- dnf mark install fuse-libs
|
122
|
123
|
- dnf erase -y bubblewrap ostree
|
123
|
124
|
|
124
|
|
- # Unpack and get into dist/buildstream
|
125
|
|
- - cd dist && ./unpack.sh && cd buildstream
|
|
125
|
+ - cd dist/buildstream
|
126
|
126
|
|
127
|
127
|
# Since the unix platform is required to run as root, no user change required
|
128
|
128
|
- python3 setup.py test --index-url invalid://uri --addopts --integration
|
129
|
129
|
|
130
|
|
- # Go back to the toplevel and collect our reports
|
131
|
|
- - cd ../..
|
132
|
|
- - mkdir -p coverage-unix/
|
133
|
|
- - cp dist/buildstream/.coverage coverage-unix/coverage.unix
|
134
|
|
- except:
|
135
|
|
- - schedules
|
136
|
|
- artifacts:
|
137
|
|
- paths:
|
138
|
|
- - coverage-unix/
|
139
|
|
- - logs-unix/
|
140
|
|
-
|
141
|
130
|
|
142
|
131
|
# Automatically build documentation for every commit, we want to know
|
143
|
132
|
# if building documentation fails even if we're not deploying it.
|
... |
... |
@@ -261,7 +250,7 @@ coverage: |
261
|
250
|
- pip3 install --no-index .
|
262
|
251
|
- mkdir report
|
263
|
252
|
- cd report
|
264
|
|
- - cp ../../../coverage-unix/coverage.unix .
|
|
253
|
+ - cp ../../../coverage-unix/coverage.* .
|
265
|
254
|
- cp ../../../coverage-linux/coverage.* .
|
266
|
255
|
- ls coverage.*
|
267
|
256
|
- coverage combine --rcfile=../.coveragerc -a coverage.*
|