From 757287ae75e41b472886ff3137c8467172b27259 Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 7 Dec 2023 12:39:02 +0100 Subject: [PATCH 1/2] ci: set FF_KUBERNETES_HONOR_ENTRYPOINT: false --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 14872663097c..0c259388264e 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 -- GitLab From 1fa0b2d9de37eea7574b6efd8567db7a0e7f45ce Mon Sep 17 00:00:00 2001 From: Pietro Abate Date: Thu, 7 Dec 2023 12:41:30 +0100 Subject: [PATCH 2/2] ci: fix build scripts for gcp --- .gitlab/ci/jobs/build/common.yml | 1 + .gitlab/ci/jobs/doc/build_all.yml | 1 + .gitlab/ci/jobs/doc/linkcheck.yml | 1 + .gitlab/ci/jobs/doc/publish.yml | 1 + .gitlab/ci/jobs/packaging/opam_prepare.yml | 1 + .gitlab/ci/jobs/sanity/sanity_ci.yml | 1 + .gitlab/ci/jobs/shared/templates.yml | 1 + .gitlab/ci/jobs/test/check_scripts.yml | 2 ++ .gitlab/ci/jobs/test/common.yml | 1 + .gitlab/ci/jobs/test/misc_checks.yml | 3 +-- scripts/ci/build_full_unreleased.sh | 2 ++ 11 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/jobs/build/common.yml b/.gitlab/ci/jobs/build/common.yml index 15197ad05895..8a12107d4529 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 f9c64ec028c1..d84c75b527d3 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 141518920871..37f081f08cca 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 b3f3e0324ee8..a35f4b0a891e 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 0d31fb226b16..b5f21adafb67 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 c64bc7965d72..fa01ebcb602a 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 c787c9ca637e..6b745ea4413c 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 69a2cf8d6b89..d9bd779ff082 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 d68cf93783c9..875ce756d952 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 6bb626b59a8d..ab124007a005 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 6934eba2dc51..03a552a0bb77 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 -- GitLab