From ed86d035841c7322c750777eb8b15d3441adfc5c Mon Sep 17 00:00:00 2001 From: dkijania Date: Mon, 28 Oct 2024 23:07:02 +0100 Subject: [PATCH] Remove berkeley reference from various docs and guides --- README.md | 4 ++-- buildkite/scripts/build-release.sh | 2 +- buildkite/scripts/debian/promote.sh | 2 +- buildkite/scripts/promote-docker.sh | 4 ++-- buildkite/src/README.md | 2 +- dockerfiles/Dockerfile-mina-daemon | 4 ++-- helm/cron_jobs/README.md | 2 +- scripts/debian/aptly.sh | 2 +- scripts/debian/publish.sh | 2 +- scripts/debian/reversion.sh | 2 +- src/app/rosetta/README.md | 8 ++++---- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index b848104e1d8..b1c689fe9cb 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ ### Build status -| Develop | Berkeley | Compatible | +| Develop | Compatible | Master | | ------- | -------- | ---------- | -| [![Build status - develop](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=develop)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - berkeley](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=berkeley)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - compatible](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=compatible)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) +| [![Build status - develop](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=develop)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - compatible](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=compatb)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) | [![Build status - master](https://badge.buildkite.com/0c47452f3ea619d3217d388e0de522b218db28c3e161887a9a.svg?branch=master)](https://buildkite.com/o-1-labs-2/mina-end-to-end-nightlies) Mina logo diff --git a/buildkite/scripts/build-release.sh b/buildkite/scripts/build-release.sh index 68d794da5e1..dbf3bb490bc 100755 --- a/buildkite/scripts/build-release.sh +++ b/buildkite/scripts/build-release.sh @@ -9,7 +9,7 @@ source ~/.profile ./buildkite/scripts/build-artifact.sh echo "--- Bundle all packages for Debian ${MINA_DEB_CODENAME}" -echo " Includes mina daemon, archive-node, rosetta, generate keypair for berkeley" +echo " Includes mina daemon, archive-node, rosetta, generate keypair for devnet" [[ ${MINA_BUILD_MAINNET} ]] && echo " MINA_BUILD_MAINNET is true so this includes the mainnet and devnet packages for mina-daemon as well" diff --git a/buildkite/scripts/debian/promote.sh b/buildkite/scripts/debian/promote.sh index f0a59ac369e..491e77f562e 100755 --- a/buildkite/scripts/debian/promote.sh +++ b/buildkite/scripts/debian/promote.sh @@ -29,7 +29,7 @@ function usage() { echo " -t, --to-component The target channel for package (unstable, alpha, beta etc.)" echo " -c, --codename The Debian codename (bullseye, focal etc.)" echo "" - echo "Example: $0 --package mina-archive --version 2.0.0berkeley-rc1-berkeley-48efea4 --architecture amd64 --codename bullseye --from-component unstable --to-component nightly" + echo "Example: $0 --package mina-archive --version 2.0.0-rc1-48efea4 --architecture amd64 --codename bullseye --from-component unstable --to-component nightly" exit 1 } diff --git a/buildkite/scripts/promote-docker.sh b/buildkite/scripts/promote-docker.sh index 683bbc28acc..a8ab9526de6 100755 --- a/buildkite/scripts/promote-docker.sh +++ b/buildkite/scripts/promote-docker.sh @@ -18,12 +18,12 @@ function usage() { echo -e "${RED}☞ $1${CLEAR}\n"; fi echo "Usage: $0 [-n name] [-v version] [-t tag] [-c codename] " - echo " -n, --name The Docker name (mina-berkeley, mina-archive etc.)" + echo " -n, --name The Docker name (mina-devnet, mina-archive etc.)" echo " -v, --version The Docker version" echo " -t, --tag The Additional tag" echo " -p, --publish The Publish to docker.io flag. If defined script will publish docker do docker.io. Otherwise it will still resides in gcr.io" echo "" - echo "Example: $0 --name mina-archive --version 2.0.0berkeley-rc1-berkeley-48efea4 --tag berkeley-latest-nightly-bullseye " + echo "Example: $0 --name mina-archive --version 2.0.0-rc1-48efea4 --tag devnet-latest-nightly-bullseye " exit 1 } diff --git a/buildkite/src/README.md b/buildkite/src/README.md index e8bfe284ddb..d020eb0d2c2 100644 --- a/buildkite/src/README.md +++ b/buildkite/src/README.md @@ -160,7 +160,7 @@ All list of available parameters: - PROFILE The Docker and Debian profile (Standard, Lightnet)". All available profiles are located in `buildkite/src/Constants/Profiles.dhall` file. Only CamelCase format is supported -- NETWORK The Docker and Debian network (Devnet, Mainnet, Berkeley). All available profiles are located in `buildkite/src/Constants/Network.dhall` file. Only CamelCase format is supported +- NETWORK The Docker and Debian network (Devnet, Mainnet). All available profiles are located in `buildkite/src/Constants/Network.dhall` file. Only CamelCase format is supported - FROM_CHANNEL Source debian channel. By default: Unstable. All available channels are located in `buildkite/src/Constants/DebianChannel.dhall` file. Only CamelCase format is supported diff --git a/dockerfiles/Dockerfile-mina-daemon b/dockerfiles/Dockerfile-mina-daemon index 7d43e27bd0e..6288928a149 100644 --- a/dockerfiles/Dockerfile-mina-daemon +++ b/dockerfiles/Dockerfile-mina-daemon @@ -13,8 +13,8 @@ ARG deb_suffix ENV SUFFIX=${deb_suffix:+-${deb_suffix}} # construct mina debian package name based on network and suffix. # possible values: -# - mina-berkeley -# - mina-berkeley-lightnet etc. +# - mina-devnet +# - mina-devnet-lightnet etc. ENV MINA_DEB=mina-${network}${SUFFIX} ENV DEBIAN_FRONTEND noninteractive diff --git a/helm/cron_jobs/README.md b/helm/cron_jobs/README.md index edd63378621..f11fc50f50f 100644 --- a/helm/cron_jobs/README.md +++ b/helm/cron_jobs/README.md @@ -1,7 +1,7 @@ Replayer cron jobs ================== -There are replayer cron jobs for Mainnet, Devnet, and Berkeley. These +There are replayer cron jobs for Mainnet and Devnet. These jobs are run daily, to replay a day's worth of transactions. Each cron job downloads the most recent archive dump corresponding to diff --git a/scripts/debian/aptly.sh b/scripts/debian/aptly.sh index 8eae74c3544..2c661e5a821 100755 --- a/scripts/debian/aptly.sh +++ b/scripts/debian/aptly.sh @@ -68,7 +68,7 @@ function start_help(){ echo "" echo "Parameters:" echo "" - echo " -b, --background The Docker name (mina-berkeley, mina-archive etc.)" + echo " -b, --background The Docker name (mina-devnet, mina-archive etc.)" echo " -c, --codename The Codename for debian repository" echo " -d, --debians The Debian(s) to be available in aptly. Supports regular expression" echo " -m, --component The Component for debian repository. For example: unstable" diff --git a/scripts/debian/publish.sh b/scripts/debian/publish.sh index 3640480cd1e..81501cc1205 100755 --- a/scripts/debian/publish.sh +++ b/scripts/debian/publish.sh @@ -24,7 +24,7 @@ function usage() { echo " -v, --version The Debian version" echo " -c, --codename The Debian codename" echo "" - echo "Example: $0 --name mina-archive --release unstable --version 2.0.0berkeley-rc1-berkeley-48efea4 --codename bullseye " + echo "Example: $0 --name mina-archive --release unstable --version 2.0.0-rc1-48efea4 --codename bullseye " exit 1 } diff --git a/scripts/debian/reversion.sh b/scripts/debian/reversion.sh index 0aa2c16faf3..5fec028f490 100755 --- a/scripts/debian/reversion.sh +++ b/scripts/debian/reversion.sh @@ -31,7 +31,7 @@ function usage() { echo " --suite The Current Debian suite" echo " --new-suite The New Debian suite" echo "" - echo "Example: $0 --deb mina-archive --version 2.0.0berkeley-rc1-berkeley-48efea4 --new-version 2.0.0berkeley-rc1 --codename bullseye --release unstable --new-release umt" + echo "Example: $0 --deb mina-archive --version 2.0.0-rc1-48efea4 --new-version 2.0.0-rc1 --codename bullseye --release unstable --new-release umt" exit 1 } diff --git a/src/app/rosetta/README.md b/src/app/rosetta/README.md index b8fdf6fbc83..c773623066f 100644 --- a/src/app/rosetta/README.md +++ b/src/app/rosetta/README.md @@ -11,11 +11,11 @@ recommended 16GB) and then run the following: ```bash cat dockerfiles/Dockerfile-mina-rosetta \ | docker build -t mina-rosetta:v2.0.0 \ - --build-arg "network=berkeley" \ + --build-arg "network=devnet" \ --build-arg "image=debian:bullseye" \ --build-arg "deb_codename=bullseye" \ - --build-arg "deb_release=berkeley" \ - --build-arg "deb_version=2.0.0berkeley-rc1-1551e2f" - + --build-arg "deb_release=devnet" \ + --build-arg "deb_version=2.0.0devnet-rc1-1551e2f" - ``` This creates an image (`mina-rosetta:v2.0.0`) based on Debian Bullseye that @@ -135,7 +135,7 @@ command: $ MINA_ROSETTA_MAX_DB_POOL_SIZE=64 _build/default/src/app/rosetta/rosetta.exe \ --port 3087 \ --graphql-uri http://localhost:3085/graphql \ - --archive-uri postgres://pguser:pguser@localhost:5432/archive_berkeley + --archive-uri postgres://pguser:pguser@localhost:5432/archive ``` The `--graphql-uri` parameter gives the address at which Rosetta can connect to