... |
... |
@@ -10,16 +10,6 @@ stages: |
10
|
10
|
- test
|
11
|
11
|
- post
|
12
|
12
|
|
13
|
|
-# Avoid running all the tests post merge on
|
14
|
|
-# master or on any release branch.
|
15
|
|
-#
|
16
|
|
-.tests-condition-template: &tests-condition
|
17
|
|
- only:
|
18
|
|
- - branches
|
19
|
|
- except:
|
20
|
|
- - master
|
21
|
|
- - /bst-1\..*/
|
22
|
|
-
|
23
|
13
|
#####################################################
|
24
|
14
|
# Prepare stage #
|
25
|
15
|
#####################################################
|
... |
... |
@@ -101,26 +91,20 @@ source_dist: |
101
|
91
|
tests-debian-9:
|
102
|
92
|
image: buildstream/testsuite-debian:9-master-114-4cab18e3
|
103
|
93
|
<<: *linux-tests
|
104
|
|
- <<: *tests-condition
|
105
|
94
|
|
106
|
95
|
tests-fedora-27:
|
107
|
96
|
image: buildstream/testsuite-fedora:27-master-114-4cab18e3
|
108
|
97
|
<<: *linux-tests
|
109
|
|
- <<: *tests-condition
|
110
|
98
|
|
111
|
99
|
tests-fedora-28:
|
112
|
100
|
image: buildstream/testsuite-fedora:28-master-114-4cab18e3
|
113
|
101
|
<<: *linux-tests
|
114
|
|
- <<: *tests-condition
|
115
|
102
|
|
116
|
103
|
tests-ubuntu-18.04:
|
117
|
104
|
image: buildstream/testsuite-ubuntu:18.04-master-114-4cab18e3
|
118
|
105
|
<<: *linux-tests
|
119
|
|
- <<: *tests-condition
|
120
|
106
|
|
121
|
107
|
tests-unix:
|
122
|
|
- <<: *tests-condition
|
123
|
|
-
|
124
|
108
|
# Use fedora here, to a) run a test on fedora and b) ensure that we
|
125
|
109
|
# can get rid of ostree - this is not possible with debian-8
|
126
|
110
|
image: buildstream/testsuite-fedora:27-master-114-4cab18e3
|
... |
... |
@@ -159,15 +143,6 @@ tests-unix: |
159
|
143
|
# Note: We still do not enforce a consistent installation of python3-sphinx,
|
160
|
144
|
# as it will significantly grow the backing image.
|
161
|
145
|
docs:
|
162
|
|
-
|
163
|
|
- # Here we build the docs for every pre-merge CI, but avoid
|
164
|
|
- # the job on post-merge to stable branches, because we only
|
165
|
|
- # ever publish them from master
|
166
|
|
- only:
|
167
|
|
- - branches
|
168
|
|
- except:
|
169
|
|
- - /bst-1\..*/
|
170
|
|
-
|
171
|
146
|
stage: test
|
172
|
147
|
script:
|
173
|
148
|
- export BST_SOURCE_CACHE="$(pwd)/cache/integration-cache/sources"
|
... |
... |
@@ -183,19 +158,11 @@ docs: |
183
|
158
|
- public/
|
184
|
159
|
|
185
|
160
|
|
186
|
|
-#####################################################
|
187
|
|
-# Post stage #
|
188
|
|
-#####################################################
|
189
|
|
-
|
190
|
|
-# Check code quality with codeclimate
|
191
|
|
-# This needs some refactoring; we probably just want to provide the codeclimate.json directly
|
192
|
|
-# as an output of radon, with some conversion
|
|
161
|
+# Check code quality with gitlab's built-in feature.
|
193
|
162
|
#
|
194
|
|
-codequality:
|
195
|
|
- <<: *tests-condition
|
196
|
|
-
|
|
163
|
+code_quality:
|
197
|
164
|
image: docker:stable
|
198
|
|
- stage: post
|
|
165
|
+ stage: test
|
199
|
166
|
variables:
|
200
|
167
|
DOCKER_DRIVER: overlay2
|
201
|
168
|
allow_failure: true
|
... |
... |
@@ -209,11 +176,13 @@ codequality: |
209
|
176
|
--volume /var/run/docker.sock:/var/run/docker.sock
|
210
|
177
|
"registry.gitlab.com/gitlab-org/security-products/codequality:$SP_VERSION" /code
|
211
|
178
|
artifacts:
|
212
|
|
- paths: [codeclimate.json]
|
|
179
|
+ paths: [gl-code-quality-report.json]
|
213
|
180
|
|
214
|
|
-analysis:
|
215
|
|
- <<: *tests-condition
|
|
181
|
+#####################################################
|
|
182
|
+# Post stage #
|
|
183
|
+#####################################################
|
216
|
184
|
|
|
185
|
+analysis:
|
217
|
186
|
stage: post
|
218
|
187
|
script:
|
219
|
188
|
- |
|
... |
... |
@@ -242,8 +211,6 @@ analysis: |
242
|
211
|
# Collate coverage reports
|
243
|
212
|
#
|
244
|
213
|
coverage:
|
245
|
|
- <<: *tests-condition
|
246
|
|
-
|
247
|
214
|
stage: post
|
248
|
215
|
coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/'
|
249
|
216
|
script:
|