diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index a7b2f0e97d0301a5ae6ccd5ae400004507dc6642..745d6d9a74a4f624b977da6d081505c7431b0e9b 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -543,8 +543,6 @@ oc.build:static-x86_64-linux-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -643,8 +641,6 @@ oc.build:static-arm64-linux-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -739,8 +735,6 @@ oc.build_x86_64-released: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -855,8 +849,6 @@ oc.build_x86_64-exp-dev-extra: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1122,8 +1114,6 @@ oc.build_kernels: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1203,8 +1193,6 @@ oc.build_dsn_node: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1278,8 +1266,6 @@ oc.tezt:fetch-records: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1608,6 +1594,33 @@ build-layer1-profiling: stage: build tags: - gcp_very_high_cpu + rules: + - changes: + - .gitlab-ci.yml + - .gitlab/**/* + - Makefile + - brassaia-eio/**/* + - brassaia/**/* + - cohttp/**/* + - data-encoding/**/* + - dune + - dune-project + - dune-workspace + - etherlink/**/* + - irmin/**/* + - michelson_test_scripts/**/* + - opam/**/* + - opentelemetry/**/* + - prometheus/**/* + - resto/**/* + - rust-toolchain + - script-inputs/**/* + - scripts/**/* + - sdk/**/* + - src/**/* + - tezt/**/* + - tzt_reference_test_suite/**/* + when: on_success dependencies: - oc.docker:ci:amd64 timeout: 60 minutes @@ -1658,8 +1671,6 @@ select_tezts: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1758,7 +1769,7 @@ trigger:rpm_repository_partial_auto: - scripts/ci/build-rpm-packages.sh - scripts/ci/create_rpm_repo.sh - scripts/ci/prepare-apt-rpm-repo.sh - - scripts/packaging/build-deb-local.sh + - scripts/packaging/build-rpm-local.sh - scripts/packaging/octez/rpm/* - scripts/packaging/tests/rpm/* - scripts/version.sh @@ -2048,8 +2059,6 @@ oc.integration:compiler-rejections: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2112,8 +2121,6 @@ oc.script:test-gen-genesis: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2241,8 +2248,6 @@ oc.script:test_octez_release_versions: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2931,8 +2936,6 @@ oc.unit:non-proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3087,8 +3090,6 @@ oc.unit:other-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3175,8 +3176,6 @@ oc.unit:proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3263,8 +3262,6 @@ oc.unit:non-proto-arm64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3340,8 +3337,6 @@ oc.unit:webassembly-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3388,8 +3383,6 @@ oc.unit:protocol_compiles: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3642,8 +3635,6 @@ tezt: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3736,8 +3727,6 @@ tezt-time-sensitive: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3829,8 +3818,6 @@ tezt-slow: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3921,8 +3908,6 @@ tezt-extra: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4012,8 +3997,6 @@ tezt-flaky: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4107,8 +4090,6 @@ tezt:static-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4195,8 +4176,6 @@ oc.unified_coverage: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index b48878da82a51419cb56d1bd3f901c3b957a77f1..a386dd2092de6ac6931295747b8934039e9b01a3 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -542,8 +542,6 @@ oc.build:static-x86_64-linux-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -642,8 +640,6 @@ oc.build:static-arm64-linux-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -738,8 +734,6 @@ oc.build_x86_64-released: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -854,8 +848,6 @@ oc.build_x86_64-exp-dev-extra: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1121,8 +1113,6 @@ oc.build_kernels: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1202,8 +1192,6 @@ oc.build_dsn_node: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1277,8 +1265,6 @@ oc.tezt:fetch-records: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1607,6 +1593,33 @@ build-layer1-profiling: stage: build tags: - gcp_very_high_cpu + rules: + - changes: + - .gitlab-ci.yml + - .gitlab/**/* + - Makefile + - brassaia-eio/**/* + - brassaia/**/* + - cohttp/**/* + - data-encoding/**/* + - dune + - dune-project + - dune-workspace + - etherlink/**/* + - irmin/**/* + - michelson_test_scripts/**/* + - opam/**/* + - opentelemetry/**/* + - prometheus/**/* + - resto/**/* + - rust-toolchain + - script-inputs/**/* + - scripts/**/* + - sdk/**/* + - src/**/* + - tezt/**/* + - tzt_reference_test_suite/**/* + when: on_success dependencies: - oc.docker:ci:amd64 timeout: 60 minutes @@ -1657,8 +1670,6 @@ select_tezts: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1757,7 +1768,7 @@ trigger:rpm_repository_partial_auto: - scripts/ci/build-rpm-packages.sh - scripts/ci/create_rpm_repo.sh - scripts/ci/prepare-apt-rpm-repo.sh - - scripts/packaging/build-deb-local.sh + - scripts/packaging/build-rpm-local.sh - scripts/packaging/octez/rpm/* - scripts/packaging/tests/rpm/* - scripts/version.sh @@ -2047,8 +2058,6 @@ oc.integration:compiler-rejections: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2111,8 +2120,6 @@ oc.script:test-gen-genesis: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2240,8 +2247,6 @@ oc.script:test_octez_release_versions: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2930,8 +2935,6 @@ oc.unit:non-proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3086,8 +3089,6 @@ oc.unit:other-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3174,8 +3175,6 @@ oc.unit:proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3262,8 +3261,6 @@ oc.unit:non-proto-arm64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3339,8 +3336,6 @@ oc.unit:webassembly-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3387,8 +3382,6 @@ oc.unit:protocol_compiles: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3641,8 +3634,6 @@ tezt: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3735,8 +3726,6 @@ tezt-time-sensitive: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3828,8 +3817,6 @@ tezt-slow: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3920,8 +3907,6 @@ tezt-extra: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4011,8 +3996,6 @@ tezt-flaky: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4106,8 +4089,6 @@ tezt:static-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4194,8 +4175,6 @@ oc.unified_coverage: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index cfad5acf7540c78f42af8fd6ee0dd48f77e19450..7f2d757cf665184af7c3ba38d27e210325512567 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -1118,6 +1118,8 @@ build-layer1-profiling: stage: build tags: - gcp_very_high_cpu + rules: + - when: always dependencies: - oc.docker:ci:amd64 timeout: 60 minutes diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index 8dba9218868c00ada0c6720fb9b1663ee9c0a1bc..2e962e09bf03eb3a920fbf4443b15fa1d3b076c1 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -874,7 +874,9 @@ let jobs pipeline_type = job_build_teztale ~arch:Arm64 ~storage:Ramfs (); job_evm_static_x86_64_experimental; job_evm_static_arm64_experimental; - job_build_layer1_profiling (); + job_build_layer1_profiling + ~rules:(make_rules ~changes:changeset_octez ()) + (); ] @ Option.to_list job_select_tezts @ bin_packages_jobs diff --git a/ci/bin/common.ml b/ci/bin/common.ml index add22c81b772e4862066c2d9ce5aa0db43560ccb..02530dc7e95590c1da2eb9f05c151439eaca168e 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -261,6 +261,7 @@ let changeset_octez = List.map (fun path -> if Sys.is_directory path then path ^ "/**/*" else path) (read_lines_from_file "script-inputs/octez-source-content") + |> List.filter (fun f -> f <> "CHANGES.rst" && f <> "LICENSES/**/*") |> Changeset.make in Changeset.( @@ -356,7 +357,7 @@ let changeset_rpm_packages = Changeset.( make [ - "scripts/packaging/build-deb-local.sh"; + "scripts/packaging/build-rpm-local.sh"; "scripts/packaging/octez/rpm/*"; "scripts/packaging/tests/rpm/*"; "rpm-deps-build.Dockerfile"; @@ -897,11 +898,12 @@ let job_datadog_pipeline_trace : tezos_job = pipeline_type:$PIPELINE_TYPE --tags mr_number:$CI_MERGE_REQUEST_IID"; ] -let job_build_layer1_profiling ?(expire_in = Duration (Days 1)) () = +let job_build_layer1_profiling ?rules ?(expire_in = Duration (Days 1)) () = job ~__POS__ ~stage:Stages.build ~image:Images.CI.build + ?rules ~name:"build-layer1-profiling" ~cpu:Very_high ~retry:{max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]}