From e1a01507e505faf018eb8d9de2304ed3ea43ee6d Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 18 Jun 2025 09:43:43 +0200 Subject: [PATCH 1/3] ciao: fix bug in rpm packages changeset --- .gitlab/ci/pipelines/before_merging.yml | 2 +- .gitlab/ci/pipelines/merge_train.yml | 2 +- ci/bin/common.ml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index a7b2f0e97d03..92707f6fdd41 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -1758,7 +1758,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 diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index b48878da82a5..dac0a20f1337 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -1757,7 +1757,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 diff --git a/ci/bin/common.ml b/ci/bin/common.ml index add22c81b772..5517846d4b0e 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -356,7 +356,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"; -- GitLab From 212b615da7e982cb21e37be1c231e8e06fb44ccc Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Tue, 17 Jun 2025 15:56:30 +0200 Subject: [PATCH 2/3] ciao: add changeset to job_build_layer1_profiling --- .gitlab/ci/pipelines/before_merging.yml | 29 +++++++++++++++++++ .gitlab/ci/pipelines/merge_train.yml | 29 +++++++++++++++++++ .../ci/pipelines/schedule_extended_test.yml | 2 ++ ci/bin/code_verification.ml | 4 ++- ci/bin/common.ml | 3 +- 5 files changed, 65 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 92707f6fdd41..931a9ec5cfd2 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -1608,6 +1608,35 @@ build-layer1-profiling: stage: build tags: - gcp_very_high_cpu + rules: + - changes: + - .gitlab-ci.yml + - .gitlab/**/* + - CHANGES.rst + - LICENSES/**/* + - 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 diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index dac0a20f1337..716dc0f0a35d 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -1607,6 +1607,35 @@ build-layer1-profiling: stage: build tags: - gcp_very_high_cpu + rules: + - changes: + - .gitlab-ci.yml + - .gitlab/**/* + - CHANGES.rst + - LICENSES/**/* + - 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 diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index cfad5acf7540..7f2d757cf665 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 8dba9218868c..2e962e09bf03 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 5517846d4b0e..15e7c0a9ad61 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -897,11 +897,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]} -- GitLab From b1ddb8775ac989abcf901b39e4dc8b86ffda81b8 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Wed, 18 Jun 2025 11:09:08 +0200 Subject: [PATCH 3/3] CIAO: remove CHANGES.rst and LICENSES from octez changeset --- .gitlab/ci/pipelines/before_merging.yml | 50 ------------------------- .gitlab/ci/pipelines/merge_train.yml | 50 ------------------------- ci/bin/common.ml | 1 + 3 files changed, 1 insertion(+), 100 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 931a9ec5cfd2..745d6d9a74a4 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/**/* @@ -1612,8 +1598,6 @@ build-layer1-profiling: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1687,8 +1671,6 @@ select_tezts: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2077,8 +2059,6 @@ oc.integration:compiler-rejections: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2141,8 +2121,6 @@ oc.script:test-gen-genesis: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2270,8 +2248,6 @@ oc.script:test_octez_release_versions: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2960,8 +2936,6 @@ oc.unit:non-proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3116,8 +3090,6 @@ oc.unit:other-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3204,8 +3176,6 @@ oc.unit:proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3292,8 +3262,6 @@ oc.unit:non-proto-arm64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3369,8 +3337,6 @@ oc.unit:webassembly-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3417,8 +3383,6 @@ oc.unit:protocol_compiles: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3671,8 +3635,6 @@ tezt: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3765,8 +3727,6 @@ tezt-time-sensitive: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3858,8 +3818,6 @@ tezt-slow: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3950,8 +3908,6 @@ tezt-extra: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4041,8 +3997,6 @@ tezt-flaky: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4136,8 +4090,6 @@ tezt:static-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4224,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 716dc0f0a35d..a386dd2092de 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/**/* @@ -1611,8 +1597,6 @@ build-layer1-profiling: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -1686,8 +1670,6 @@ select_tezts: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2076,8 +2058,6 @@ oc.integration:compiler-rejections: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2140,8 +2120,6 @@ oc.script:test-gen-genesis: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2269,8 +2247,6 @@ oc.script:test_octez_release_versions: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -2959,8 +2935,6 @@ oc.unit:non-proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3115,8 +3089,6 @@ oc.unit:other-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3203,8 +3175,6 @@ oc.unit:proto-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3291,8 +3261,6 @@ oc.unit:non-proto-arm64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3368,8 +3336,6 @@ oc.unit:webassembly-x86_64: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3416,8 +3382,6 @@ oc.unit:protocol_compiles: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3670,8 +3634,6 @@ tezt: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3764,8 +3726,6 @@ tezt-time-sensitive: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3857,8 +3817,6 @@ tezt-slow: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -3949,8 +3907,6 @@ tezt-extra: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4040,8 +3996,6 @@ tezt-flaky: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4135,8 +4089,6 @@ tezt:static-binaries: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* @@ -4223,8 +4175,6 @@ oc.unified_coverage: - changes: - .gitlab-ci.yml - .gitlab/**/* - - CHANGES.rst - - LICENSES/**/* - Makefile - brassaia-eio/**/* - brassaia/**/* diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 15e7c0a9ad61..02530dc7e955 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.( -- GitLab