From 1ad07f4fa41e7609faaf315e7318edf1586a02f8 Mon Sep 17 00:00:00 2001 From: Tobias Reiher Date: Fri, 3 Nov 2023 19:22:27 +0100 Subject: [PATCH] Improve CI runtime Ref. eng/recordflux/RecordFlux#1449 --- .gitlab-ci.yml | 23 ++++++++++++++++++++--- Makefile | 8 ++++++-- 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f50ae26db..dc58e11a0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -169,7 +169,24 @@ code_generation: .update_timestamps_of_generated_code: &update_timestamps_of_generated_code - touch examples/apps/*/build/generated/* -tests: +tests_rflx: + extends: .testing + needs: + - setup + - code_generation + services: + - image:recordflux + - cpu:8 + - mem:16 + script: + - git fetch --unshallow + - *update_timestamps_of_generated_code + - *setup_gnat + - *setup_gnat_cross + - *setup_python + - make test_rflx + +tests_examples: extends: .testing needs: - setup @@ -177,14 +194,14 @@ tests: services: - image:recordflux - cpu:4 - - mem:32 + - mem:16 script: - git fetch --unshallow - *update_timestamps_of_generated_code - *setup_gnat - *setup_gnat_cross - *setup_python - - make test + - make test_examples python_compatibility: extends: .testing diff --git a/Makefile b/Makefile index 511f65efc..a3bea8e56 100644 --- a/Makefile +++ b/Makefile @@ -119,9 +119,13 @@ check_contracts: check_doc: tools/check_doc.py -d doc -x doc/user_guide/gfdl.rst -.PHONY: test test_coverage test_unit_coverage test_property test_tools test_ide test_optimized test_compilation test_binary_size test_specs test_installation test_apps +.PHONY: test test_rflx test_examples test_coverage test_unit_coverage test_property test_tools test_ide test_optimized test_compilation test_binary_size test_installation test_specs test_apps -test: test_coverage test_unit_coverage test_language_coverage test_property test_tools test_ide test_optimized test_compilation test_binary_size test_specs test_installation test_apps +test: test_rflx test_examples + +test_rflx: test_coverage test_unit_coverage test_language_coverage test_property test_tools test_ide test_optimized test_compilation test_binary_size test_installation + +test_examples: test_specs test_apps # A separate invocation of `coverage report` is needed to exclude `$(GENERATED_DIR)` in the coverage report. # Currently, pytest's CLI does not allow the specification of omitted directories