diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index a7d14abf8a0602fd28ee263ca5cf05b670f2b97c..853c2e390a6d07f0ba56089f80d5ec7e5cd165e5 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 b4deac90bb21e1f269202acbfae8b6474b466545..0df7250e5c490c3ab33aba78d514954759a8bf0d 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 77c499113e37b14296796b7554d3692d1fe70ed0..43f1c6352ad07d50f8eeae7a9ba2a03bdee8b86d 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 d7f68b1f6341d4806bf620da4a4e3b07883eff56..d870507ab01379d1d17cc158a70220edf8f2022d 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 a35ff45324db743b146eb50f7476248e93e61fff..ce9dfa718e6e143802c7cb7d5ec8b1e6923c92f7 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 9a9b5ee037bb3ab0aba22cab8a35ace4f7872a17..ad975394a0026ae3c4a098505e6295b56c6b3f00 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 70a78aef8c83455e80409540a6337749b4c9b6dd..85e09e38f3008f16d7928e58effd155b6d4408ae 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 80a3a4fa324d860d3ecb62e64ee5e0b2bb967ee5..d12747b01a60abc07a6f2114274226cccbcb8569 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 e648198eb20ea1cebd8ad601bbb324a0fc87e05b..ea1dcc7fd288fcdbec1c563967ae624b55cdf53a 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 5a34d68a2f4c05b6ebce17dc0521b2ac3dd00601..3bd1b8f90d600e4c190e926dff77c65d7bb71610 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 8544fe9ebec04d10e3588fc9dd4f55671b0b5cf3..cd07311ad47f2d8953a4bbff3c0cab4e9d9ad6c2 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 ada20337b18e4af47a5055171372f1306055fcac..32eeecb8b6e9ba5dfb98f7a018514a925f024091 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 10c6f5e9f907c5daf9bc5f6fd6e4ffd92ebeb6a8..f6c1ab41dc7bcb5c27ead6fcae4e05ccb8dbff2e 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 694202d16ebcf4bd10e36c16c0ed13a739eb46db..41d7ea9765b2402dfb0735a38f7866e992180234 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 33e9aadc4128ebcb5adb0ecbff3252306c4d63ab..05913997ee6ff2197676ca53d039020450aa6a71 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"