diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14872663097c4d165db7429879bb860768f85c8d..0c259388264ebf767e2eba9e3d7578a5fad4462e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -75,6 +75,11 @@ variables: # unzipping implementation (https://gitlab.com/gitlab-org/gitlab-runner/-/issues/27496), # this setting cuts cache creation time. FF_USE_FASTZIP: "true" + # TODO: https://gitlab.com/tezos/tezos/-/issues/6764 + # "false" is the GitLab default but we've overridden it in the runner settings. + # This should be fixed at the runner level but we reset it to the + # default here in the meantime. + FF_KUBERNETES_HONOR_ENTRYPOINT: "false" # If `RUNTEZTALIAS` is true, then Tezt tests are included in the @runtest # alias. We set it to false to deactivate these tests in the unit diff --git a/.gitlab/ci/jobs/build/common.yml b/.gitlab/ci/jobs/build/common.yml index 15197ad0589564f4b3690f34c7dd6d0890c5daee..8a12107d45293d867c5fc8c467f55f2d3b78e6f6 100644 --- a/.gitlab/ci/jobs/build/common.yml +++ b/.gitlab/ci/jobs/build/common.yml @@ -35,6 +35,7 @@ variables: ARCH: "" script: + - eval $(opam env) - ./scripts/ci/take_ownership.sh - ./scripts/ci/build_static_binaries.sh artifacts: diff --git a/.gitlab/ci/jobs/doc/build_all.yml b/.gitlab/ci/jobs/doc/build_all.yml index f9c64ec028c1577e70189651dbe40626176be786..d84c75b527d331dbfc4eda1f3530e2dd49ce1bc5 100644 --- a/.gitlab/ci/jobs/doc/build_all.yml +++ b/.gitlab/ci/jobs/doc/build_all.yml @@ -12,6 +12,7 @@ documentation:build_all: needs: [trigger] before_script: - . $HOME/.venv/bin/activate + - eval $(opam env) script: - ./.gitlab/ci/jobs/doc/documentation:build_all.sh artifacts: diff --git a/.gitlab/ci/jobs/doc/linkcheck.yml b/.gitlab/ci/jobs/doc/linkcheck.yml index 141518920871de50307995d91a4e48d83b875ad1..37f081f08cca8770e8de2de24b3675bc4ed0100f 100644 --- a/.gitlab/ci/jobs/doc/linkcheck.yml +++ b/.gitlab/ci/jobs/doc/linkcheck.yml @@ -14,6 +14,7 @@ documentation:linkcheck: before_script: - . ./scripts/version.sh - . $HOME/.venv/bin/activate + - eval $(opam env) script: - make all - make -C docs redirectcheck diff --git a/.gitlab/ci/jobs/doc/publish.yml b/.gitlab/ci/jobs/doc/publish.yml index b3f3e0324ee890e98b14b02fd2b9908dc644a210..a35f4b0a891e695d655b5da795de0d9df16103a9 100644 --- a/.gitlab/ci/jobs/doc/publish.yml +++ b/.gitlab/ci/jobs/doc/publish.yml @@ -23,6 +23,7 @@ publish:documentation: # Load the environment poetry previously created in the docker image. # Give access to the Python dependencies/executables - . $HOME/.venv/bin/activate + - eval $(opam env) script: - ./scripts/ci/doc_publish.sh # Publish jobs are uninterruptible to avoid publishing partial results. diff --git a/.gitlab/ci/jobs/packaging/opam_prepare.yml b/.gitlab/ci/jobs/packaging/opam_prepare.yml index 0d31fb226b16d16e276297841687f241170eed77..b5f21adafb67885227edf26625865622def3a73b 100644 --- a/.gitlab/ci/jobs/packaging/opam_prepare.yml +++ b/.gitlab/ci/jobs/packaging/opam_prepare.yml @@ -46,6 +46,7 @@ opam:prepare: stage: packaging needs: [trigger] script: + - eval $(opam env) - git init _opam-repo-for-release - ./scripts/opam-prepare-repo.sh dev ./ ./_opam-repo-for-release - git -C _opam-repo-for-release add packages diff --git a/.gitlab/ci/jobs/sanity/sanity_ci.yml b/.gitlab/ci/jobs/sanity/sanity_ci.yml index c64bc7965d72c320206b410cecea13c9988bc72b..fa01ebcb602a24e0f0f7ed1a502b8a8b752147bc 100644 --- a/.gitlab/ci/jobs/sanity/sanity_ci.yml +++ b/.gitlab/ci/jobs/sanity/sanity_ci.yml @@ -4,6 +4,7 @@ sanity_ci: - .image_template__runtime_prebuild_dependencies stage: sanity script: + - eval $(opam env) - ./scripts/ci/take_ownership.sh - make -C manifest check - ./scripts/lint.sh --check-gitlab-ci-yml diff --git a/.gitlab/ci/jobs/shared/templates.yml b/.gitlab/ci/jobs/shared/templates.yml index c787c9ca637ee1998256602ac83cd0d77e95b23f..6b745ea4413ce6ec36ab6531951b2b3fdab0bdbe 100644 --- a/.gitlab/ci/jobs/shared/templates.yml +++ b/.gitlab/ci/jobs/shared/templates.yml @@ -90,6 +90,7 @@ # FIXME: https://gitlab.com/tezos/tezos/-/issues/2865 - sudo chown -R $(id -u):$(id -g) $CI_PROJECT_DIR - . ./scripts/version.sh + - eval $(opam env) .oc.kernels_template: extends: diff --git a/.gitlab/ci/jobs/test/check_scripts.yml b/.gitlab/ci/jobs/test/check_scripts.yml index 69a2cf8d6b897a151afcb05cfe4ae31822d51ea4..d9bd779ff082710c630f030fa95c58192af8bccf 100644 --- a/.gitlab/ci/jobs/test/check_scripts.yml +++ b/.gitlab/ci/jobs/test/check_scripts.yml @@ -12,6 +12,7 @@ oc.script:snapshot_alpha_and_link: stage: test before_script: - . ./scripts/version.sh + - eval $(opam env) needs: - job: trigger - job: "oc.build_x86_64-released" @@ -41,6 +42,7 @@ oc.script:test-gen-genesis: needs: [trigger] before_script: - cd scripts/gen-genesis + - eval $(opam env) script: - dune build gen_genesis.exe diff --git a/.gitlab/ci/jobs/test/common.yml b/.gitlab/ci/jobs/test/common.yml index d68cf93783c9291fb8fdde4d55f8195eebec97fd..875ce756d9520560271325c88b29ddc2e45ba423 100644 --- a/.gitlab/ci/jobs/test/common.yml +++ b/.gitlab/ci/jobs/test/common.yml @@ -10,6 +10,7 @@ stage: test before_script: - . ./scripts/version.sh + - eval $(opam env) retry: 2 # Merge coverage files after the execution diff --git a/.gitlab/ci/jobs/test/misc_checks.yml b/.gitlab/ci/jobs/test/misc_checks.yml index 6bb626b59a8dfeb9170310ce4b2840177ef0890d..ab124007a005d7fc72dcfb21841bde63972e6069 100644 --- a/.gitlab/ci/jobs/test/misc_checks.yml +++ b/.gitlab/ci/jobs/test/misc_checks.yml @@ -9,6 +9,7 @@ oc.misc_checks: # Load the environment poetry previously created in the docker image. # Give access to the Python dependencies/executables - . $HOME/.venv/bin/activate + - eval $(opam env) rules: # The linting job runs over the set of [source_directories] # defined in [scripts/lint.sh] that must be included here: @@ -45,8 +46,6 @@ kaitai_checks: needs: [trigger] needs: - "oc.build_x86_64-released" - before_script: - - . ./scripts/version.sh script: - make -C ${CI_PROJECT_DIR} check-kaitai-struct-files || (echo 'Octez encodings and Kaitai files seem to be out of sync. You might need to run `make check-kaitai-struct-files` and commit the resulting diff.' ; false) diff --git a/scripts/ci/build_full_unreleased.sh b/scripts/ci/build_full_unreleased.sh index 6934eba2dc51b8e106a791bb4e46ea3b8c0f0e9b..03a552a0bb77fe893cef2198c9a70cc92d760884 100755 --- a/scripts/ci/build_full_unreleased.sh +++ b/scripts/ci/build_full_unreleased.sh @@ -2,6 +2,8 @@ set -eu +eval "$(opam env)" + if [ -z "${build_deps_image_name}" ]; then echo "build_deps_image_name is unset" && exit 3; fi if [ -z "${build_deps_image_version}" ]; then echo "build_deps_image_version is unset" && exit 3; fi