diff --git a/.gitlab/ci/pipelines/debian_repository_full.yml b/.gitlab/ci/pipelines/debian_repository_full.yml index 0628a97ad4e85ac5574cdadfe144c7906ec2cbe6..7d07ef8c12db7231779b3aeecdb3eaf060f68d44 100644 --- a/.gitlab/ci/pipelines/debian_repository_full.yml +++ b/.gitlab/ci/pipelines/debian_repository_full.yml @@ -313,7 +313,7 @@ oc.lintian_debian: script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm -oc.install_bin_debian_bookworm: +oc.install_bin_debian_bookworm_current: image: debian:bookworm stage: publishing_tests tags: @@ -323,6 +323,20 @@ oc.install_bin_debian_bookworm: dependencies: [] script: - ./docs/introduction/install-bin-deb.sh debian bookworm + variables: {} + +oc.install_bin_debian_bookworm: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_debian + dependencies: [] + script: + - ./docs/introduction/install-bin-deb.sh debian bookworm + variables: + PREFIX: next oc.lintian_ubuntu: image: public.ecr.aws/lts/ubuntu:24.04_stable @@ -341,7 +355,7 @@ oc.lintian_ubuntu: script: - ./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble -oc.install_bin_ubuntu_noble: +oc.install_bin_ubuntu_noble_current: image: public.ecr.aws/lts/ubuntu:24.04_stable stage: publishing_tests tags: @@ -351,8 +365,9 @@ oc.install_bin_ubuntu_noble: dependencies: [] script: - ./docs/introduction/install-bin-deb.sh ubuntu noble + variables: {} -oc.install_bin_ubuntu_jammy: +oc.install_bin_ubuntu_jammy_current: image: public.ecr.aws/lts/ubuntu:22.04_stable stage: publishing_tests tags: @@ -362,3 +377,30 @@ oc.install_bin_ubuntu_jammy: dependencies: [] script: - ./docs/introduction/install-bin-deb.sh ubuntu jammy + variables: {} + +oc.install_bin_ubuntu_noble: + image: public.ecr.aws/lts/ubuntu:24.04_stable + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_ubuntu + dependencies: [] + script: + - ./docs/introduction/install-bin-deb.sh ubuntu noble + variables: + PREFIX: next + +oc.install_bin_ubuntu_jammy: + image: public.ecr.aws/lts/ubuntu:22.04_stable + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_ubuntu + dependencies: [] + script: + - ./docs/introduction/install-bin-deb.sh ubuntu jammy + variables: + PREFIX: next diff --git a/.gitlab/ci/pipelines/debian_repository_partial.yml b/.gitlab/ci/pipelines/debian_repository_partial.yml index 9f252a96969d6aa8dedc34f192275fea2dea2781..a079861257d18fb63b3121e6faccb83dece0019b 100644 --- a/.gitlab/ci/pipelines/debian_repository_partial.yml +++ b/.gitlab/ci/pipelines/debian_repository_partial.yml @@ -163,7 +163,7 @@ oc.lintian_debian: script: - ./scripts/ci/lintian_debian_packages.sh debian bookworm -oc.install_bin_debian_bookworm: +oc.install_bin_debian_bookworm_current: image: debian:bookworm stage: publishing_tests tags: @@ -173,3 +173,17 @@ oc.install_bin_debian_bookworm: dependencies: [] script: - ./docs/introduction/install-bin-deb.sh debian bookworm + variables: {} + +oc.install_bin_debian_bookworm: + image: debian:bookworm + stage: publishing_tests + tags: + - gcp + needs: + - apt_repo_debian + dependencies: [] + script: + - ./docs/introduction/install-bin-deb.sh debian bookworm + variables: + PREFIX: next diff --git a/ci/bin/debian_repository.ml b/ci/bin/debian_repository.ml index 3bb558c26be551dd3cbc910eb4bb8907b271089e..c29a56957b9b0c71529324196a7838c35b384e63 100644 --- a/ci/bin/debian_repository.ml +++ b/ci/bin/debian_repository.ml @@ -242,14 +242,15 @@ let jobs pipeline_type = ["./scripts/ci/create_debian_repo.sh ubuntu noble jammy"] in (* These test the installability of the current packages *) - let job_install_bin ~__POS__ ~name ~dependencies ~image ?allow_failure script - = + let job_install_bin ~__POS__ ~name ~dependencies ~image ?(variables = []) + ?allow_failure script = job ?allow_failure ~__POS__ ~name ~image ~dependencies + ~variables ~stage:Stages.publishing_tests script in @@ -283,16 +284,30 @@ let jobs pipeline_type = ["./scripts/ci/lintian_debian_packages.sh ubuntu jammy noble"]; job_install_bin ~__POS__ - ~name:"oc.install_bin_ubuntu_noble" + ~name:"oc.install_bin_ubuntu_noble_current" ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) ~image:Images.ubuntu_noble ["./docs/introduction/install-bin-deb.sh ubuntu noble"]; job_install_bin ~__POS__ - ~name:"oc.install_bin_ubuntu_jammy" + ~name:"oc.install_bin_ubuntu_jammy_current" ~dependencies:(Dependent [Job job_apt_repo_ubuntu_current]) ~image:Images.ubuntu_jammy ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; + job_install_bin + ~__POS__ + ~name:"oc.install_bin_ubuntu_noble" + ~dependencies:(Dependent [Job job_apt_repo_ubuntu]) + ~variables:[("PREFIX", "next")] + ~image:Images.ubuntu_noble + ["./docs/introduction/install-bin-deb.sh ubuntu noble"]; + job_install_bin + ~__POS__ + ~name:"oc.install_bin_ubuntu_jammy" + ~dependencies:(Dependent [Job job_apt_repo_ubuntu]) + ~variables:[("PREFIX", "next")] + ~image:Images.ubuntu_jammy + ["./docs/introduction/install-bin-deb.sh ubuntu jammy"]; ] in let test_current_debian_packages_jobs = @@ -305,10 +320,17 @@ let jobs pipeline_type = ["./scripts/ci/lintian_debian_packages.sh debian bookworm"]; job_install_bin ~__POS__ - ~name:"oc.install_bin_debian_bookworm" + ~name:"oc.install_bin_debian_bookworm_current" ~dependencies:(Dependent [Job job_apt_repo_debian_current]) ~image:Images.debian_bookworm ["./docs/introduction/install-bin-deb.sh debian bookworm"]; + job_install_bin + ~__POS__ + ~name:"oc.install_bin_debian_bookworm" + ~dependencies:(Dependent [Job job_apt_repo_debian]) + ~variables:[("PREFIX", "next")] + ~image:Images.debian_bookworm + ["./docs/introduction/install-bin-deb.sh debian bookworm"]; ] in let debian_jobs = diff --git a/docs/introduction/install-bin-deb.sh b/docs/introduction/install-bin-deb.sh index 452ba180ccefdd8cf362e0312b56975469236415..b0998a76b8e0e8bceaa25ab3af8d6a3dee1dc69a 100755 --- a/docs/introduction/install-bin-deb.sh +++ b/docs/introduction/install-bin-deb.sh @@ -18,6 +18,13 @@ protocol=$(head -1 script-inputs/active_protocol_versions_without_number) # This logic must be kept in sync with the script in # ./scripts/ci/create_debian_repo.sh +# The prefix used for these packages in the repository. E.g. 'next' +if [ -n "$PREFIX" ]; then + PREFIX=${PREFIX}/ +else + PREFIX= +fi + # if it's a release tag, then it can be a RC release # or a final release. This can be on a protected branch or not. if [ -n "${gitlab_release_no_v:-}" ]; then @@ -25,7 +32,7 @@ if [ -n "${gitlab_release_no_v:-}" ]; then # candidate if [ -n "${gitlab_release_rc_version}" ]; then # Release candidate - distribution="RC/$distribution" + distribution="${PREFIX}RC/$distribution" fi # else we just that $distribution as it is else @@ -34,7 +41,7 @@ else # this is not a release, but it's a protected branch. # We allow this only for the master branch. if [ "$CI_COMMIT_REF_NAME" = "master" ]; then - distribution="master/$distribution" + distribution="${PREFIX}master/$distribution" else echo "Cannot test for a protected branch that \ is not associated with a release tag or it's master" @@ -46,7 +53,7 @@ else echo "Cannot test a repository for a branch named 'RC'" exit 1 else - distribution="$CI_COMMIT_REF_NAME/$distribution" + distribution="${PREFIX}$CI_COMMIT_REF_NAME/$distribution" fi fi fi @@ -67,10 +74,17 @@ sudo apt-get update sudo apt-get install -y octez-client sudo apt-get install -y octez-node sudo apt-get install -y octez-baker -sudo apt-get install -y octez-smartrollup -sudo apt-get install -y octez-evmnode sudo apt-get install -y octez-dal-node +if [ -n "$PREFIX" ]; then + # [install octez NEXT packages] + sudo apt-get install -y octez-smart-rollup-node +else + # [install octez current packages] + sudo apt-get install -y octez-smartrollup + sudo apt-get install -y octez-evmnode +fi + # [test executables] octez-client --version octez-node --version diff --git a/scripts/pkg-common/utils.sh b/scripts/pkg-common/utils.sh index 71f6d88d701dcf1fcda82cc5e401c58ee10b42ab..9c207af49cd77e6a38e911051e10b6c156c4a864 100644 --- a/scripts/pkg-common/utils.sh +++ b/scripts/pkg-common/utils.sh @@ -118,7 +118,7 @@ getOctezVersion() { if [ -n "${gitlab_release_no_v:-}" ]; then RET="$gitlab_release_no_v" else - RET="$gitlab_release_no_v+$CI_COMMIT_SHORT_SHA" + RET="0.0-dev+$CI_COMMIT_SHORT_SHA" fi else