From b1d81e6f536269b043f76bc98ac535876033e86e Mon Sep 17 00:00:00 2001 From: Neo <11726174-neo.nomadic@users.noreply.gitlab.com> Date: Sat, 12 Apr 2025 15:59:06 +0200 Subject: [PATCH] CI: Add retry on system_failure to [oc.build:static-x86_64-linux-binaries] --- .gitlab/ci/pipelines/before_merging.yml | 5 +++++ .gitlab/ci/pipelines/master_branch.yml | 5 +++++ .gitlab/ci/pipelines/merge_train.yml | 5 +++++ .gitlab/ci/pipelines/non_release_tag.yml | 5 +++++ .gitlab/ci/pipelines/non_release_tag_test.yml | 5 +++++ .gitlab/ci/pipelines/octez_beta_release_tag.yml | 5 +++++ .gitlab/ci/pipelines/octez_evm_node_release_tag.yml | 5 +++++ .gitlab/ci/pipelines/octez_release_tag.yml | 5 +++++ .gitlab/ci/pipelines/octez_release_tag_test.yml | 5 +++++ .gitlab/ci/pipelines/schedule_extended_test.yml | 5 +++++ .gitlab/ci/pipelines/schedule_master_test_release.yml | 5 +++++ ci/bin/code_verification.ml | 2 ++ ci/bin/common.ml | 4 +++- ci/bin/master_branch.ml | 2 ++ ci/bin/release_tag.ml | 4 ++++ 15 files changed, 66 insertions(+), 1 deletion(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index a7d14abf8a06..853c2e390a6d 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -606,6 +606,11 @@ oc.build:static-x86_64-linux-binaries: artifacts: paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index b4deac90bb21..0df7250e5c49 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -116,6 +116,11 @@ oc.build:static-x86_64-linux-binaries: artifacts: paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index 77c499113e37..43f1c6352ad0 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -605,6 +605,11 @@ oc.build:static-x86_64-linux-binaries: artifacts: paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index d7f68b1f6341..d870507ab013 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -112,6 +112,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index a35ff45324db..ce9dfa718e6e 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -112,6 +112,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index 9a9b5ee037bb..ad975394a002 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -112,6 +112,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 70a78aef8c83..85e09e38f300 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -154,6 +154,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.docker:amd64: image: ${GCP_REGISTRY}/tezos/docker-images/ci-docker:v1.12.0 diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index 80a3a4fa324d..d12747b01a60 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -113,6 +113,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index e648198eb20e..ea1dcc7fd288 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -113,6 +113,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 5a34d68a2f4c..3bd1b8f90d60 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -452,6 +452,11 @@ oc.build:static-x86_64-linux-binaries: artifacts: paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 8544fe9ebec0..cd07311ad47f 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -112,6 +112,11 @@ oc.build:static-x86_64-linux-binaries: expire_in: 90 days paths: - octez-binaries/$ARCH/* + retry: + max: 2 + when: + - stuck_or_timeout_failure + - runner_system_failure oc.build:static-arm64-linux-binaries: image: ${ci_image_name}/build:${ci_image_tag} diff --git a/ci/bin/code_verification.ml b/ci/bin/code_verification.ml index ada20337b18e..32eeecb8b6e9 100644 --- a/ci/bin/code_verification.ml +++ b/ci/bin/code_verification.ml @@ -672,6 +672,8 @@ let jobs pipeline_type = ~__POS__ ~arch:Amd64 ~cpu:Very_high + ~retry: + {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]} (* Even though not many tests depend on static executables, some of those that do are limiting factors in the total duration of pipelines. So we start this job as early as possible, diff --git a/ci/bin/common.ml b/ci/bin/common.ml index 10c6f5e9f907..f6c1ab41dc7b 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -647,7 +647,8 @@ let changeset_mir_tzt = let job_build_static_binaries ~__POS__ ~arch ?(cpu = Normal) ?(executable_files = "script-inputs/octez-released-executables") ?(experimental_executables = "script-inputs/octez-experimental-executables") - ?version_executable ?(release = false) ?rules ?dependencies () : tezos_job = + ?version_executable ?(release = false) ?rules ?dependencies ?retry () : + tezos_job = let arch_string = arch_to_string arch in let name = "oc.build:static-" ^ arch_string ^ "-linux-binaries" in let artifacts = @@ -672,6 +673,7 @@ let job_build_static_binaries ~__POS__ ~arch ?(cpu = Normal) ~arch ~cpu ~name + ?retry ~image:Images.CI.build ~before_script:(before_script ~take_ownership:true ~eval_opam:true []) ~variables: diff --git a/ci/bin/master_branch.ml b/ci/bin/master_branch.ml index 694202d16ebc..41d7ea9765b2 100644 --- a/ci/bin/master_branch.ml +++ b/ci/bin/master_branch.ml @@ -57,6 +57,8 @@ let jobs = ~__POS__ ~arch:Amd64 ~cpu:Very_high + ~retry: + {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]} ~rules:rules_always () in diff --git a/ci/bin/release_tag.ml b/ci/bin/release_tag.ml index 33e9aadc4128..05913997ee6f 100644 --- a/ci/bin/release_tag.ml +++ b/ci/bin/release_tag.ml @@ -137,6 +137,8 @@ let octez_jobs ?(test = false) release_tag_pipeline_type = ~__POS__ ~arch:Amd64 ~cpu:Very_high + ~retry: + {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]} ~release:true () in @@ -315,6 +317,8 @@ let octez_evm_node_jobs ?(test = false) () = ~__POS__ ~arch:Amd64 ~cpu:Very_high + ~retry: + {max = 2; when_ = [Stuck_or_timeout_failure; Runner_system_failure]} ~executable_files:"script-inputs/octez-evm-node-executable" ~release:true ~version_executable:"octez-evm-node" -- GitLab