@@ -4,6 +4,7 @@ include: '/.gitlab/ci_includes/jobs.yml'
4
4
5
5
stages :
6
6
- build
7
+ - lint
7
8
- test
8
9
- build-final
9
10
- publish
@@ -193,6 +194,7 @@ build-backend-image:
193
194
# If pipeline not triggered by tag:
194
195
# - Runs the backend lint if changes to the backend, otherwise skips.
195
196
backend-lint :
197
+ stage : lint
196
198
extends :
197
199
- .docker-image-test-stage
198
200
- .skippable-job
@@ -207,6 +209,7 @@ backend-check-startup-python:
207
209
extends :
208
210
- .docker-image-test-stage
209
211
- .skippable-job
212
+ - .requires-lint
210
213
services :
211
214
- name : $CI_DIND_IMAGE
212
215
alias : docker
@@ -222,8 +225,6 @@ backend-check-startup-python:
222
225
FF_NETWORK_PER_BUILD : 1
223
226
script :
224
227
- docker run --rm --network=host $BACKEND_CI_DEV_IMAGE ci-check-startup
225
- needs :
226
- - job : build-backend-image
227
228
228
229
# If pipeline not triggered by tag:
229
230
# - Runs the backend tests (the first 1/3) if changes to the backend, otherwise skips.
@@ -232,6 +233,7 @@ backend-test-group-1:
232
233
extends :
233
234
- .docker-image-test-stage
234
235
- .skippable-job
236
+ - .requires-lint
235
237
services :
236
238
- name : $CI_DIND_IMAGE
237
239
alias : docker
@@ -261,8 +263,7 @@ backend-test-group-1:
261
263
$BACKEND_CI_DEV_IMAGE $TEST_TYPE $PYTEST_EXTRA_ARGS;
262
264
- docker cp baserow_backend_test_container:/baserow/backend/reports .
263
265
- docker rm baserow_backend_test_container
264
- needs :
265
- - job : build-backend-image
266
+
266
267
artifacts :
267
268
name : " $CI_JOB_NAME-reports"
268
269
paths :
@@ -345,6 +346,16 @@ collect-backend-coverage:
345
346
artifacts : true
346
347
- job : backend-test-group-5
347
348
artifacts : true
349
+ - job : backend-test-group-6
350
+ artifacts : true
351
+ - job : backend-test-group-7
352
+ artifacts : true
353
+ - job : backend-test-group-8
354
+ artifacts : true
355
+ - job : backend-test-group-9
356
+ artifacts : true
357
+ - job : backend-test-group-10
358
+ artifacts : true
348
359
script :
349
360
- . /baserow/venv/bin/activate
350
361
# The reports artifacts will be extracted before the script runs into reports by
@@ -361,6 +372,7 @@ collect-backend-coverage:
361
372
path : coverage.xml
362
373
coverage : ' /^TOTAL.+?(\d+\%)$/'
363
374
375
+
364
376
# If pipeline not triggered by tag:
365
377
# - Build and store non-dev images in CI repo under the `ci-tested` tag so we know
366
378
# those images have passed the tests.
@@ -414,6 +426,7 @@ build-web-frontend-image:
414
426
# If pipeline not triggered by tag:
415
427
# - Runs eslint and stylelint if the web-frontend code has changed, otherwise skips.
416
428
web-frontend-lint :
429
+ stage : lint
417
430
extends :
418
431
- .docker-image-test-stage
419
432
- .skippable-job
@@ -431,11 +444,10 @@ web-frontend-test:
431
444
extends :
432
445
- .docker-image-test-stage
433
446
- .skippable-job
447
+ - .requires-lint
434
448
variables :
435
449
RUN_WHEN_CHANGES_MADE_IN : " web-frontend/ premium/web-frontend/ enterprise/web-frontend/"
436
450
DOWNLOAD_AND_UNPACK_ARTIFACTS_ON_SKIP : ' true'
437
- needs :
438
- - job : build-web-frontend-image
439
451
script :
440
452
- mkdir reports/ -p
441
453
- TEST_TYPE=$([[ "$ENABLE_COVERAGE" = "true" ]] && echo "ci-test" || echo "test")
@@ -458,6 +470,7 @@ zapier-integration-test:
458
470
extends :
459
471
- .docker-image-test-stage
460
472
- .skippable-job
473
+ - .requires-lint
461
474
variables :
462
475
RUN_WHEN_CHANGES_MADE_IN : " integrations/zapier"
463
476
script :
@@ -469,15 +482,14 @@ zapier-integration-test:
469
482
# - Build and store non-dev images in CI repo under the `ci-tested` tag so we know
470
483
# those images have passed the tests.
471
484
build-final-web-frontend-image :
472
- extends : .build-final-baserow-image
473
- needs :
474
- - job : web-frontend-test
475
- - job : web-frontend-lint
485
+ extends :
486
+ - .build-final-baserow-image
476
487
variables :
477
488
IMAGE_NAME : $WEBFRONTEND_IMAGE_NAME
478
489
DEV_IMAGE_NAME : $WEBFRONTEND_DEV_IMAGE_NAME
479
490
DOCKERFILE_PATH : $WEBFRONTEND_DOCKERFILE_PATH
480
-
491
+ needs :
492
+ - job : web-frontend-test
481
493
482
494
# Allow to manually build the image from any branch
483
495
build-final-web-frontend-image-manual :
@@ -503,6 +515,7 @@ build-final-web-frontend-image-manual:
503
515
e2e-tests :
504
516
extends :
505
517
- .docker-image-test-stage
518
+ - .requires-lint
506
519
script :
507
520
- cd e2e-tests
508
521
- E2E_TEST_YARN_RUN_CMD=test-ci docker compose up --no-build --exit-code-from e2e-tests
@@ -790,6 +803,7 @@ publish-cloudron-release-tagged-image:
790
803
# ================================ MISC LINTS ===============================
791
804
792
805
docker-file-hadolint :
806
+ stage : lint
793
807
extends :
794
808
- .docker-image-test-stage
795
809
- .skippable-job
@@ -817,11 +831,15 @@ docker-file-hadolint:
817
831
- " reports/*"
818
832
paths :
819
833
- " reports/*"
834
+ needs :
835
+ - job : backend-lint
836
+
820
837
821
838
mjml-compiled-check :
822
839
extends :
823
840
- .docker-image-test-stage
824
841
- .skippable-job
842
+ - .requires-lint
825
843
variables :
826
844
RUN_WHEN_CHANGES_MADE_IN : " .eta"
827
845
dependencies : []
0 commit comments