From 2c2bbdb891d84887ff4f4587edc3acb4e7b6e6a3 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Wed, 9 Apr 2025 17:22:12 +0200 Subject: [PATCH 1/5] Revert "CI: jobs with [before_script] send info to Datadog by default" This reverts commit 5387e51294da6b28d518cdf476856b18444373c1. --- .gitlab/ci/pipelines/before_merging.yml | 44 --------------- .../ci/pipelines/debian_repository_full.yml | 6 --- .../pipelines/debian_repository_partial.yml | 3 -- .../debian_repository_partial_auto.yml | 3 -- .gitlab/ci/pipelines/master_branch.yml | 10 ---- .gitlab/ci/pipelines/merge_train.yml | 44 --------------- .gitlab/ci/pipelines/non_release_tag.yml | 8 --- .gitlab/ci/pipelines/non_release_tag_test.yml | 8 --- .../ci/pipelines/octez_beta_release_tag.yml | 8 --- .../pipelines/octez_evm_node_release_tag.yml | 2 - .gitlab/ci/pipelines/octez_monitoring.yml | 1 - .gitlab/ci/pipelines/octez_release_tag.yml | 8 --- .../ci/pipelines/octez_release_tag_test.yml | 8 --- .gitlab/ci/pipelines/rpm_repository_full.yml | 2 - .../ci/pipelines/rpm_repository_partial.yml | 1 - .../pipelines/rpm_repository_partial_auto.yml | 1 - .../pipelines/schedule_extended_rpc_test.yml | 3 -- .../ci/pipelines/schedule_extended_test.yml | 54 ------------------- .../schedule_extended_validation_test.yml | 3 -- .../schedule_master_test_release.yml | 8 --- ci/bin/common.ml | 2 +- 21 files changed, 1 insertion(+), 226 deletions(-) diff --git a/.gitlab/ci/pipelines/before_merging.yml b/.gitlab/ci/pipelines/before_merging.yml index 5b0aedad62e5..1566f117dc2e 100644 --- a/.gitlab/ci/pipelines/before_merging.yml +++ b/.gitlab/ci/pipelines/before_merging.yml @@ -166,7 +166,6 @@ sanity_ci: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) script: @@ -216,7 +215,6 @@ oc.ocaml_fmt: - $CI_PROJECT_DIR/_dune_cache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -279,7 +277,6 @@ oc.misc_checks: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -350,7 +347,6 @@ documentation:rst-check: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . $HOME/.venv/bin/activate script: - make --silent -C docs sphinx-check @@ -428,7 +424,6 @@ oc.build_arm64-released: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -486,7 +481,6 @@ oc.build_arm64-exp-dev-extra: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -593,7 +587,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -689,7 +682,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -789,7 +781,6 @@ oc.build_x86_64-released: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -909,7 +900,6 @@ oc.build_x86_64-exp-dev-extra: - $CI_PROJECT_DIR/_dune_cache policy: push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1000,7 +990,6 @@ wasm-runtime-check: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1069,7 +1058,6 @@ ocaml-check: - $CI_PROJECT_DIR/_dune_cache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1288,7 +1276,6 @@ oc.tezt:fetch-records: allow_failure: true timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1326,7 +1313,6 @@ build_octez_source: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1591,7 +1577,6 @@ build-layer1-profiling: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1654,7 +1639,6 @@ select_tezts: exit_codes: 17 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) script: @@ -1844,7 +1828,6 @@ kaitai_checks: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -1886,7 +1869,6 @@ kaitai_e2e_checks: - kaitai_checks timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - . ./scripts/install_build_deps.js.sh script: @@ -1941,7 +1923,6 @@ oc.check_lift_limits_patch: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -1997,7 +1978,6 @@ oc.python_check: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - . $HOME/.venv/bin/activate @@ -2055,7 +2035,6 @@ oc.integration:compiler-rejections: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2129,7 +2108,6 @@ oc.script:test-gen-genesis: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - cd scripts/gen-genesis script: @@ -2173,7 +2151,6 @@ oc.script:snapshot_alpha_and_link: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -2234,7 +2211,6 @@ oc.script:test_octez_release_versions: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -2280,7 +2256,6 @@ oc.script:b58_prefix: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - . $HOME/.venv/bin/activate script: @@ -2311,7 +2286,6 @@ oc.test-liquidity-baking-scripts: - oc.build_x86_64-exp-dev-extra timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -2556,7 +2530,6 @@ test_sdk_bindings: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . $HOME/.venv/bin/activate - . ./scripts/ci/sccache-start.sh script: @@ -3005,7 +2978,6 @@ oc.unit:non-proto-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3073,7 +3045,6 @@ oc.unit:etherlink-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3161,7 +3132,6 @@ oc.unit:other-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3249,7 +3219,6 @@ oc.unit:proto-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3333,7 +3302,6 @@ oc.unit:non-proto-arm64: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3401,7 +3369,6 @@ oc.unit:webassembly-x86_64: - oc.docker:ci:amd64 timeout: 20 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -3458,7 +3425,6 @@ oc.unit:protocol_compiles: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3495,7 +3461,6 @@ de.unit:x86_64: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest data-encoding @@ -3519,7 +3484,6 @@ de.unit:arm64: - oc.docker:ci:arm64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest data-encoding @@ -3543,7 +3507,6 @@ resto.unit:x86_64: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest resto @@ -3567,7 +3530,6 @@ resto.unit:arm64: - oc.docker:ci:arm64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest resto @@ -4237,7 +4199,6 @@ tezt:static-binaries: - oc.tezt:fetch-records timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - mv octez-binaries/x86_64/octez-* . script: - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\" @@ -4446,7 +4407,6 @@ documentation:odoc: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -4504,7 +4464,6 @@ documentation:manuals: - oc.build_dsn_node timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - make -C docs -j octez-gen @@ -4579,7 +4538,6 @@ documentation:docgen: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -4637,7 +4595,6 @@ documentation:build_all: - documentation:docgen timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . $HOME/.venv/bin/activate script: @@ -4689,7 +4646,6 @@ documentation:linkcheck: allow_failure: true timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . $HOME/.venv/bin/activate diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 81b73e05ca07..a21909683c26 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -301,7 +301,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -333,7 +332,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -536,7 +534,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -568,7 +565,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -598,7 +594,6 @@ oc.lintian_debian: - oc.build-debian timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - export DEBIAN_FRONTEND=noninteractive - apt-get update @@ -748,7 +743,6 @@ oc.lintian_ubuntu: - oc.build-ubuntu timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - export DEBIAN_FRONTEND=noninteractive - apt-get update diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 5487317766f4..97a09c2ac08e 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -258,7 +258,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -290,7 +289,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -320,7 +318,6 @@ oc.lintian_debian: - oc.build-debian timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - export DEBIAN_FRONTEND=noninteractive - apt-get update diff --git a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml index 5487317766f4..97a09c2ac08e 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial_auto.yml @@ -258,7 +258,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -290,7 +289,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -320,7 +318,6 @@ oc.lintian_debian: - oc.build-debian timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - export DEBIAN_FRONTEND=noninteractive - apt-get update diff --git a/.gitlab/ci/pipelines/master_branch.yml b/.gitlab/ci/pipelines/master_branch.yml index 193c072391e1..b4deac90bb21 100644 --- a/.gitlab/ci/pipelines/master_branch.yml +++ b/.gitlab/ci/pipelines/master_branch.yml @@ -97,7 +97,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -142,7 +141,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -188,7 +186,6 @@ oc.build_arm64-released: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -244,7 +241,6 @@ oc.build_arm64-exp-dev-extra: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -351,7 +347,6 @@ oc.unified_coverage: allow_failure: true timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -416,7 +411,6 @@ documentation:odoc: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -466,7 +460,6 @@ documentation:manuals: - oc.build:static-x86_64-linux-binaries timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - scripts/ci/documentation:manuals_static.sh @@ -518,7 +511,6 @@ documentation:docgen: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -574,7 +566,6 @@ documentation:build_all: - documentation:docgen timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . $HOME/.venv/bin/activate script: @@ -628,7 +619,6 @@ publish:documentation: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . $HOME/.venv/bin/activate - echo "${CI_PK_GITLAB_DOC}" > ~/.ssh/id_ed25519 diff --git a/.gitlab/ci/pipelines/merge_train.yml b/.gitlab/ci/pipelines/merge_train.yml index c10f695275c2..b8ea8b07fbd8 100644 --- a/.gitlab/ci/pipelines/merge_train.yml +++ b/.gitlab/ci/pipelines/merge_train.yml @@ -166,7 +166,6 @@ sanity_ci: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) script: @@ -216,7 +215,6 @@ oc.ocaml_fmt: - $CI_PROJECT_DIR/_dune_cache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -279,7 +277,6 @@ oc.misc_checks: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -350,7 +347,6 @@ documentation:rst-check: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . $HOME/.venv/bin/activate script: - make --silent -C docs sphinx-check @@ -427,7 +423,6 @@ oc.build_arm64-released: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -485,7 +480,6 @@ oc.build_arm64-exp-dev-extra: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -592,7 +586,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -688,7 +681,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -788,7 +780,6 @@ oc.build_x86_64-released: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -908,7 +899,6 @@ oc.build_x86_64-exp-dev-extra: - $CI_PROJECT_DIR/_dune_cache policy: push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -999,7 +989,6 @@ wasm-runtime-check: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1068,7 +1057,6 @@ ocaml-check: - $CI_PROJECT_DIR/_dune_cache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1287,7 +1275,6 @@ oc.tezt:fetch-records: allow_failure: true timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1325,7 +1312,6 @@ build_octez_source: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1590,7 +1576,6 @@ build-layer1-profiling: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1653,7 +1638,6 @@ select_tezts: exit_codes: 17 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) script: @@ -1843,7 +1827,6 @@ kaitai_checks: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -1885,7 +1868,6 @@ kaitai_e2e_checks: - kaitai_checks timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - . ./scripts/install_build_deps.js.sh script: @@ -1940,7 +1922,6 @@ oc.check_lift_limits_patch: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -1996,7 +1977,6 @@ oc.python_check: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - . $HOME/.venv/bin/activate @@ -2054,7 +2034,6 @@ oc.integration:compiler-rejections: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2128,7 +2107,6 @@ oc.script:test-gen-genesis: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - cd scripts/gen-genesis script: @@ -2172,7 +2150,6 @@ oc.script:snapshot_alpha_and_link: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -2233,7 +2210,6 @@ oc.script:test_octez_release_versions: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -2279,7 +2255,6 @@ oc.script:b58_prefix: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - . $HOME/.venv/bin/activate script: @@ -2310,7 +2285,6 @@ oc.test-liquidity-baking-scripts: - oc.build_x86_64-exp-dev-extra timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -2555,7 +2529,6 @@ test_sdk_bindings: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . $HOME/.venv/bin/activate - . ./scripts/ci/sccache-start.sh script: @@ -3004,7 +2977,6 @@ oc.unit:non-proto-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3072,7 +3044,6 @@ oc.unit:etherlink-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3160,7 +3131,6 @@ oc.unit:other-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3248,7 +3218,6 @@ oc.unit:proto-x86_64: - $CI_PROJECT_DIR/_dune_cache policy: pull before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3332,7 +3301,6 @@ oc.unit:non-proto-arm64: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3400,7 +3368,6 @@ oc.unit:webassembly-x86_64: - oc.docker:ci:amd64 timeout: 20 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -3457,7 +3424,6 @@ oc.unit:protocol_compiles: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -3494,7 +3460,6 @@ de.unit:x86_64: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest data-encoding @@ -3518,7 +3483,6 @@ de.unit:arm64: - oc.docker:ci:arm64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest data-encoding @@ -3542,7 +3506,6 @@ resto.unit:x86_64: - oc.docker:ci:amd64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest resto @@ -3566,7 +3529,6 @@ resto.unit:arm64: - oc.docker:ci:arm64 timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest resto @@ -4236,7 +4198,6 @@ tezt:static-binaries: - oc.tezt:fetch-records timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - mv octez-binaries/x86_64/octez-* . script: - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\" @@ -4445,7 +4406,6 @@ documentation:odoc: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -4503,7 +4463,6 @@ documentation:manuals: - oc.build_dsn_node timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - make -C docs -j octez-gen @@ -4578,7 +4537,6 @@ documentation:docgen: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -4636,7 +4594,6 @@ documentation:build_all: - documentation:docgen timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . $HOME/.venv/bin/activate script: @@ -4688,7 +4645,6 @@ documentation:linkcheck: allow_failure: true timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . $HOME/.venv/bin/activate diff --git a/.gitlab/ci/pipelines/non_release_tag.yml b/.gitlab/ci/pipelines/non_release_tag.yml index a39fb1d618a6..d7f68b1f6341 100644 --- a/.gitlab/ci/pipelines/non_release_tag.yml +++ b/.gitlab/ci/pipelines/non_release_tag.yml @@ -92,7 +92,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -138,7 +137,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -485,7 +483,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -517,7 +514,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -720,7 +716,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -752,7 +747,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -931,7 +925,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -1113,7 +1106,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/non_release_tag_test.yml b/.gitlab/ci/pipelines/non_release_tag_test.yml index 2792c47a23d4..a35ff45324db 100644 --- a/.gitlab/ci/pipelines/non_release_tag_test.yml +++ b/.gitlab/ci/pipelines/non_release_tag_test.yml @@ -92,7 +92,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -138,7 +137,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -485,7 +483,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -517,7 +514,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -720,7 +716,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -752,7 +747,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -931,7 +925,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -1113,7 +1106,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/octez_beta_release_tag.yml b/.gitlab/ci/pipelines/octez_beta_release_tag.yml index b5b5c1e94a4d..9a9b5ee037bb 100644 --- a/.gitlab/ci/pipelines/octez_beta_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_beta_release_tag.yml @@ -92,7 +92,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -138,7 +137,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -486,7 +484,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -518,7 +515,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -721,7 +717,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -753,7 +748,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -932,7 +926,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -1114,7 +1107,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml index 44bc4885f341..70a78aef8c83 100644 --- a/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_evm_node_release_tag.yml @@ -89,7 +89,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -134,7 +133,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh diff --git a/.gitlab/ci/pipelines/octez_monitoring.yml b/.gitlab/ci/pipelines/octez_monitoring.yml index ab9dabe78742..2a02ffabbb2b 100644 --- a/.gitlab/ci/pipelines/octez_monitoring.yml +++ b/.gitlab/ci/pipelines/octez_monitoring.yml @@ -128,7 +128,6 @@ build-layer1-profiling: - $CI_PROJECT_DIR/_sccache policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) diff --git a/.gitlab/ci/pipelines/octez_release_tag.yml b/.gitlab/ci/pipelines/octez_release_tag.yml index 7ec303c0a99c..80a3a4fa324d 100644 --- a/.gitlab/ci/pipelines/octez_release_tag.yml +++ b/.gitlab/ci/pipelines/octez_release_tag.yml @@ -93,7 +93,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -139,7 +138,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -487,7 +485,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -519,7 +516,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -722,7 +718,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -754,7 +749,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -933,7 +927,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -1115,7 +1108,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/octez_release_tag_test.yml b/.gitlab/ci/pipelines/octez_release_tag_test.yml index 397f1c8d66bc..e648198eb20e 100644 --- a/.gitlab/ci/pipelines/octez_release_tag_test.yml +++ b/.gitlab/ci/pipelines/octez_release_tag_test.yml @@ -93,7 +93,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -139,7 +138,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -487,7 +485,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -519,7 +516,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -722,7 +718,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -754,7 +749,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -933,7 +927,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -1115,7 +1108,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/rpm_repository_full.yml b/.gitlab/ci/pipelines/rpm_repository_full.yml index 1b28131a0396..0a92ba681aed 100644 --- a/.gitlab/ci/pipelines/rpm_repository_full.yml +++ b/.gitlab/ci/pipelines/rpm_repository_full.yml @@ -188,7 +188,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -370,7 +369,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/rpm_repository_partial.yml b/.gitlab/ci/pipelines/rpm_repository_partial.yml index d24d1deabdc4..0a5fd2f92276 100644 --- a/.gitlab/ci/pipelines/rpm_repository_partial.yml +++ b/.gitlab/ci/pipelines/rpm_repository_partial.yml @@ -184,7 +184,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml index d24d1deabdc4..0a5fd2f92276 100644 --- a/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml +++ b/.gitlab/ci/pipelines/rpm_repository_partial_auto.yml @@ -184,7 +184,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml index a4f25b35527a..c2e0226d0a23 100644 --- a/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_rpc_test.yml @@ -392,7 +392,6 @@ oc.build_x86_64-released: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -447,7 +446,6 @@ oc.build_x86_64-exp-dev-extra: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -537,7 +535,6 @@ oc.tezt:fetch-records: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) diff --git a/.gitlab/ci/pipelines/schedule_extended_test.yml b/.gitlab/ci/pipelines/schedule_extended_test.yml index 5ad64e0f0a15..c14423760ac1 100644 --- a/.gitlab/ci/pipelines/schedule_extended_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_test.yml @@ -158,7 +158,6 @@ sanity_ci: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) script: @@ -196,7 +195,6 @@ oc.ocaml_fmt: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -238,7 +236,6 @@ oc.misc_checks: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -295,7 +292,6 @@ documentation:rst-check: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . $HOME/.venv/bin/activate script: - make --silent -C docs sphinx-check @@ -325,7 +321,6 @@ oc.build_arm64-released: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -381,7 +376,6 @@ oc.build_arm64-exp-dev-extra: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -439,7 +433,6 @@ oc.build:static-x86_64-linux-binaries: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -485,7 +478,6 @@ oc.build:static-arm64-linux-binaries: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -531,7 +523,6 @@ oc.build_x86_64-released: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -597,7 +588,6 @@ oc.build_x86_64-exp-dev-extra: policy: push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -662,7 +652,6 @@ wasm-runtime-check: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -701,7 +690,6 @@ ocaml-check: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -824,7 +812,6 @@ oc.tezt:fetch-records: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -862,7 +849,6 @@ build_octez_source: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1105,7 +1091,6 @@ build-layer1-profiling: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -1141,7 +1126,6 @@ opam:prepare: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - git init _opam-repo-for-release @@ -1178,7 +1162,6 @@ opam:all_6: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1247,7 +1230,6 @@ opam:exec_6: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1304,7 +1286,6 @@ opam:all_2: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1375,7 +1356,6 @@ opam:all_1: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1435,7 +1415,6 @@ opam:all_3: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1506,7 +1485,6 @@ opam:exec_4: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1562,7 +1540,6 @@ opam:all_4: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1632,7 +1609,6 @@ opam:exec_1: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1698,7 +1674,6 @@ opam:all_5: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1769,7 +1744,6 @@ opam:all_7: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - mkdir -p $CI_PROJECT_DIR/opam_logs - . ./scripts/ci/sccache-start.sh @@ -1858,7 +1832,6 @@ kaitai_checks: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -1894,7 +1867,6 @@ kaitai_e2e_checks: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - . ./scripts/install_build_deps.js.sh script: @@ -1922,7 +1894,6 @@ oc.check_lift_limits_patch: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -1950,7 +1921,6 @@ oc.python_check: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - . $HOME/.venv/bin/activate @@ -1982,7 +1952,6 @@ oc.integration:compiler-rejections: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2007,7 +1976,6 @@ oc.script:test-gen-genesis: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - cd scripts/gen-genesis script: @@ -2038,7 +2006,6 @@ oc.script:snapshot_alpha_and_link: policy: pull interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -2073,7 +2040,6 @@ oc.script:test_octez_release_versions: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -2092,7 +2058,6 @@ oc.script:b58_prefix: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - . $HOME/.venv/bin/activate script: @@ -2118,7 +2083,6 @@ oc.test-liquidity-baking-scripts: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -2231,7 +2195,6 @@ test_sdk_bindings: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . $HOME/.venv/bin/activate - . ./scripts/ci/sccache-start.sh script: @@ -2600,7 +2563,6 @@ oc.unit:non-proto-x86_64: policy: pull interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2662,7 +2624,6 @@ oc.unit:etherlink-x86_64: policy: pull interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2724,7 +2685,6 @@ oc.unit:other-x86_64: policy: pull interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2786,7 +2746,6 @@ oc.unit:proto-x86_64: policy: pull interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2844,7 +2803,6 @@ oc.unit:non-proto-arm64: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2886,7 +2844,6 @@ oc.unit:webassembly-x86_64: timeout: 20 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) script: @@ -2917,7 +2874,6 @@ oc.unit:protocol_compiles: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -2951,7 +2907,6 @@ de.unit:x86_64: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest data-encoding @@ -2972,7 +2927,6 @@ de.unit:arm64: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest data-encoding @@ -2993,7 +2947,6 @@ resto.unit:x86_64: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest resto @@ -3014,7 +2967,6 @@ resto.unit:arm64: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - dune runtest resto @@ -3454,7 +3406,6 @@ tezt:static-binaries: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - mv octez-binaries/x86_64/octez-* . script: - echo "TESTS=\"${TESTS}\" JUNIT=\"${JUNIT}\" CI_NODE_INDEX=\"${CI_NODE_INDEX}\" @@ -3546,7 +3497,6 @@ documentation:odoc: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -3586,7 +3536,6 @@ documentation:manuals: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) script: - make -C docs -j octez-gen @@ -3620,7 +3569,6 @@ documentation:docgen: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh script: @@ -3660,7 +3608,6 @@ documentation:build_all: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - eval $(opam env) - . $HOME/.venv/bin/activate script: @@ -3693,7 +3640,6 @@ documentation:linkcheck: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - eval $(opam env) - . $HOME/.venv/bin/activate diff --git a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml index a4f25b35527a..c2e0226d0a23 100644 --- a/.gitlab/ci/pipelines/schedule_extended_validation_test.yml +++ b/.gitlab/ci/pipelines/schedule_extended_validation_test.yml @@ -392,7 +392,6 @@ oc.build_x86_64-released: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -447,7 +446,6 @@ oc.build_x86_64-exp-dev-extra: policy: pull-push interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) @@ -537,7 +535,6 @@ oc.tezt:fetch-records: timeout: 60 minutes interruptible: false before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - . ./scripts/version.sh - eval $(opam env) diff --git a/.gitlab/ci/pipelines/schedule_master_test_release.yml b/.gitlab/ci/pipelines/schedule_master_test_release.yml index 3c81187999b9..8544fe9ebec0 100644 --- a/.gitlab/ci/pipelines/schedule_master_test_release.yml +++ b/.gitlab/ci/pipelines/schedule_master_test_release.yml @@ -92,7 +92,6 @@ oc.build:static-x86_64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -138,7 +137,6 @@ oc.build:static-arm64-linux-binaries: - $CI_PROJECT_DIR/_target policy: pull-push before_script: - - . ./scripts/ci/datadog_send_job_info.sh - ./scripts/ci/take_ownership.sh - eval $(opam env) - . ./scripts/ci/sccache-start.sh @@ -489,7 +487,6 @@ apt_repo_debian_old: - oc.build-debian-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -521,7 +518,6 @@ apt_repo_debian: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -724,7 +720,6 @@ apt_repo_ubuntu_old: - oc.build-ubuntu-old_b timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -756,7 +751,6 @@ apt_repo_ubuntu: - oc.build-data_packages timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/install-gsutil.sh - apt install -y apt-utils debsigs jq @@ -935,7 +929,6 @@ rpm_repo_rockylinux: - oc.build-rockylinux-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: @@ -1117,7 +1110,6 @@ rpm_repo_fedora: - oc.build-fedora-data timeout: 60 minutes before_script: - - . ./scripts/ci/datadog_send_job_info.sh - . ./scripts/version.sh - ./scripts/ci/prepare-rpm-repo.sh script: diff --git a/ci/bin/common.ml b/ci/bin/common.ml index bcd4374dc8e4..10c6f5e9f907 100644 --- a/ci/bin/common.ml +++ b/ci/bin/common.ml @@ -60,7 +60,7 @@ let cargo_home = optional arguments. *) let before_script ?(take_ownership = false) ?(source_version = false) ?(eval_opam = false) ?(init_python_venv = false) ?(install_js_deps = false) - ?(datadog_job_info = true) before_script = + ?(datadog_job_info = false) before_script = let toggle t x = if t then [x] else [] in (* Sending job-level info to Datadog is done first. This step should never fail, even if [datadog-ci] is not installed in the image running the job. *) toggle datadog_job_info ". ./scripts/ci/datadog_send_job_info.sh" -- GitLab From 6daf78fd9a995b8a7aeae94407ef2e1d2fb8fe1d Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Wed, 9 Apr 2025 17:22:46 +0200 Subject: [PATCH 2/5] Revert "Images/CI: update README" This reverts commit a36393dad37b76103828d5f10d7ce15846f41483. --- images/ci/README.md | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/images/ci/README.md b/images/ci/README.md index 81fd6418fc84..9fd96995dc6a 100644 --- a/images/ci/README.md +++ b/images/ci/README.md @@ -15,14 +15,13 @@ The images defined in this directory are used in the CI pipelines of All images except `e2etest`, are built on top of each other, such that the contents of image N is also in N+1[^1]. The image `e2etest` is built on top of -`runtime_datadog` and additionally copies some binaries from +`runtime` and additionally copies some binaries from `build`: ```mermaid graph TB - runtime -->|FROM| runtime_datadog - runtime_datadog -->|FROM| prebuild - runtime_datadog -->|FROM| e2etest + runtime -->|FROM| prebuild + runtime -->|FROM| e2etest prebuild -->|FROM| build build -->|FROM| test test -.->|COPY bisect-ppx-report, ocamlformat| e2etest @@ -30,14 +29,13 @@ graph TB The images, their content and intended usage, are: -| Image | Contents | Usage | -|-------------------|------------------------------------|-----------------------------------| -| `runtime` | runtime libraries + zcash-params | distributing Octez executables | -| `runtime_datadog` | datadog-ci (via npm) | base image to instrument CI jobs | -| `prebuild` | OCaml + opam package cache + Cargo | CI: OPAM installability tests | -| `build` | opam packages | CI: Building Octez | -| `test` | Python + NVM + ShellCheck | CI: Octez tests and documentation | -| `e2etest` | `eth-cli` + `solc` + cast | CI: Octez integration tests | +| Image | Contents | Usage | +|------------|------------------------------------|-----------------------------------| +| `runtime` | runtime libraries + zcash-params | distributing Octez executables | +| `prebuild` | OCaml + opam package cache + Cargo | CI: OPAM installability tests | +| `build` | opam packages | CI: Building Octez | +| `test` | Python + NVM + ShellCheck | CI: Octez tests and documentation | +| `e2etest` | `eth-cli` + cast | CI: Octez integration tests | For more details on the contents and usage of each image, see the header comment of each corresponding layer in the Dockerfile. -- GitLab From 0341e6e71bc02be979f36ff9241d80b1abafab95 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Wed, 9 Apr 2025 17:22:55 +0200 Subject: [PATCH 3/5] Revert "Images/CI: add [runtime_datadog] in [valid_layer_targets]" This reverts commit aaf05301a9874ca701f567aa24b58e0bf0566b5c. --- images/ci.inc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/ci.inc.sh b/images/ci.inc.sh index c88d9e65c48a..805c0d2d58d4 100644 --- a/images/ci.inc.sh +++ b/images/ci.inc.sh @@ -3,7 +3,7 @@ ## Sourceable file with common variables and functions for scripts ## related to the CI images -export valid_layer_targets='runtime runtime_datadog prebuild build test e2etest' +export valid_layer_targets='runtime prebuild build test e2etest' # Gives the Docker tag for a images/ci image based on: # Argument 1: target architecture -- GitLab From ee2df7d629f98ce8054fe58027905b1f25870656 Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Wed, 9 Apr 2025 17:23:32 +0200 Subject: [PATCH 4/5] Revert "Images/CI: use [runtime_datadog] instead of [runtime] in [prebuild, e2etest] + update comments" This reverts commit 006c46573dc69df9b23b829b52543944670d83d7. --- images/ci/Dockerfile.build | 2 +- images/ci/Dockerfile.e2etest | 8 ++++---- images/ci/Dockerfile.prebuild | 4 ++-- images/ci/Dockerfile.runtime | 2 +- images/ci/Dockerfile.test | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/images/ci/Dockerfile.build b/images/ci/Dockerfile.build index b33218cec8f1..e4f1857a0d9e 100644 --- a/images/ci/Dockerfile.build +++ b/images/ci/Dockerfile.build @@ -1,4 +1,4 @@ -# runtime + datadog + build dependencies +# runtime + build dependencies # # This image builds upon the `prebuild` image, # see its header for details on its content. diff --git a/images/ci/Dockerfile.e2etest b/images/ci/Dockerfile.e2etest index 82983e54245f..85192c38681a 100644 --- a/images/ci/Dockerfile.e2etest +++ b/images/ci/Dockerfile.e2etest @@ -1,10 +1,10 @@ -# runtime + datadog + end-to-end test dependencies +# runtime + end-to-end test dependencies # -# This image builds on the runtime + datadog dependencies and additionally includes: +# This image builds on the runtime dependencies and additionally includes: # # - ocamlformat and bisect-ppx-report, copied from the # build image. -# - solc, eth-cli, installed from npm +# - eth-cli, installed from npm # - some utilities used in the Tezt integration test suite: curl, git, file # - some utilities used in the [unified_coverage] job: make, jq # @@ -18,7 +18,7 @@ ARG OCAML_IMAGE ARG BUILD_IMAGE # hadolint ignore=DL3006 -FROM runtime_datadog as e2etest +FROM runtime as e2etest LABEL org.opencontainers.image.title="e2etest" diff --git a/images/ci/Dockerfile.prebuild b/images/ci/Dockerfile.prebuild index d6ada63cdc30..2a6a8a088697 100644 --- a/images/ci/Dockerfile.prebuild +++ b/images/ci/Dockerfile.prebuild @@ -1,4 +1,4 @@ -# runtime + datadog + prebuild dependencies +# runtime + prebuild dependencies # # This image builds upon the `runtime` image, see its # header for details on its content. @@ -12,7 +12,7 @@ # - building images on top of it in the image stack (see README.md) # hadolint ignore=DL3006 -FROM runtime_datadog as prebuild +FROM runtime as prebuild LABEL org.opencontainers.image.title="prebuild" diff --git a/images/ci/Dockerfile.runtime b/images/ci/Dockerfile.runtime index ef19e9d7d2d3..7b46776ac9f1 100644 --- a/images/ci/Dockerfile.runtime +++ b/images/ci/Dockerfile.runtime @@ -24,7 +24,7 @@ SHELL ["/bin/ash", "-euo", "pipefail", "-c"] # https://github.com/opencontainers/image-spec/blob/main/annotations.md LABEL org.opencontainers.image.authors="contact@nomadic-labs.com" \ org.opencontainers.image.description="Octez - GitLab CI docker image" \ - org.opencontainers.image.documentation="https://octez.tezos.com/docs/" \ + org.opencontainers.image.documentation="https://tezos.gitlab.io/" \ org.opencontainers.image.licenses="MIT" \ org.opencontainers.image.source="https://gitlab.com/tezos/tezos" \ org.opencontainers.image.title="runtime" \ diff --git a/images/ci/Dockerfile.test b/images/ci/Dockerfile.test index c3d13e8291e6..5791f836b071 100644 --- a/images/ci/Dockerfile.test +++ b/images/ci/Dockerfile.test @@ -1,4 +1,4 @@ -# runtime + datadog + build + test dependencies +# runtime + build + test dependencies # # This image builds upon the `build` image, see # its header for details on its content. -- GitLab From ac38fde13d6baa034ea6ef6e46d2dcdb9ea7749b Mon Sep 17 00:00:00 2001 From: Bruno Bernardo Date: Wed, 9 Apr 2025 17:23:42 +0200 Subject: [PATCH 5/5] Revert "Images/CI: install [datadog_ci] in new [runtime_datadog] instead of [e2etest]" This reverts commit d640be9b322d7c80a19a37acc8848847b6efc5c2. --- images/ci/Dockerfile.e2etest | 15 ++++++++++++-- images/ci/Dockerfile.runtime_datadog | 29 ---------------------------- 2 files changed, 13 insertions(+), 31 deletions(-) delete mode 100644 images/ci/Dockerfile.runtime_datadog diff --git a/images/ci/Dockerfile.e2etest b/images/ci/Dockerfile.e2etest index 85192c38681a..52e3222f4ec4 100644 --- a/images/ci/Dockerfile.e2etest +++ b/images/ci/Dockerfile.e2etest @@ -65,8 +65,19 @@ RUN mkdir -p /usr/share/dal-trusted-setup && \ sh /tmp/install_dal_trusted_setup.sh && \ rm /tmp/install_dal_trusted_setup.sh /tmp/version.sh -# We need eth since e2e tests. This requires git as well. -RUN npm install -g eth-cli@2.0.2 \ +# Set NPM registry +# NPM_REGISTRY_DOMAIN and NPM_REGISTRY are set in the GitLab CI/CD +ARG NPM_REGISTRY_DOMAIN +ARG NPM_REGISTRY + +RUN --mount=type=secret,id=npm_token \ + if [ -n "$NPM_REGISTRY" ] ; then \ + npm set registry "$NPM_REGISTRY" && \ + npm set //${NPM_REGISTRY_DOMAIN}:_authToken="$(cat /run/secrets/npm_token)"; \ + fi \ + && npm install -g "@datadog/datadog-ci@2.46.0" \ + # We need eth since e2e tests. This requires git as well. + && npm install -g eth-cli@2.0.2 \ # We need solc to compile solidity smart-contracts && npm install -g solc@0.8.28 \ && PATH="/root/.cargo/bin:${PATH}" \ diff --git a/images/ci/Dockerfile.runtime_datadog b/images/ci/Dockerfile.runtime_datadog deleted file mode 100644 index 55630d9b1662..000000000000 --- a/images/ci/Dockerfile.runtime_datadog +++ /dev/null @@ -1,29 +0,0 @@ -# runtime_datadog -# -# This image includes datadog-ci and npm (needed to install datadog-ci on alpine). -# -# datadog-ci is needed to instrument CI jobs. - -# hadolint ignore=DL3006 -FROM runtime as runtime_datadog - -LABEL org.opencontainers.image.title="runtime_datadog" - -USER root - -# Set NPM registry -# NPM_REGISTRY_DOMAIN and NPM_REGISTRY are set in the GitLab CI/CD -ARG NPM_REGISTRY_DOMAIN -ARG NPM_REGISTRY - -# hadolint ignore=DL3018 -RUN apk add --no-cache npm -RUN --mount=type=secret,id=npm_token \ - if [ -n "$NPM_REGISTRY" ] ; then \ - npm set registry "$NPM_REGISTRY" && \ - npm set //${NPM_REGISTRY_DOMAIN}:_authToken="$(cat /run/secrets/npm_token)"; \ - fi \ - && npm install -g "@datadog/datadog-ci@2.46.0" - -USER tezos -WORKDIR /home/tezos -- GitLab