[CI] Rename berkeley debian suffix to testnet-generic

Makefile

@@ -541,9 +541,9 @@ define build_debian_package
 		&& echo "✅ Build complete"
 endef
 
-.PHONY: debian-build-archive-berkeley
-debian-build-archive-berkeley: ## Build the Debian archive package
-	$(call build_debian_package,archive_berkeley)
+.PHONY: debian-build-archive-testnet-generic
+debian-build-archive-testnet-generic: ## Build the Debian archive package
+	$(call build_debian_package,archive_testnet_generic)
 
 .PHONY: debian-build-archive-devnet
 debian-build-archive-devnet: ## Build the Debian archive package for devnet
@@ -553,9 +553,9 @@ debian-build-archive-devnet: ## Build the Debian archive package for devnet
 debian-build-archive-mainnet: ## Build the Debian archive package for mainnet
 	$(call build_debian_package,archive_mainnet)
 
-.PHONY: debian-build-daemon-berkeley
-debian-build-daemon-berkeley: ## Build the Debian daemon package for berkeley
-	$(call build_debian_package,daemon_berkeley)
+.PHONY: debian-build-daemon-testnet-generic
+debian-build-daemon-testnet-generic: ## Build the Debian daemon package for testnet-generic
+	$(call build_debian_package,daemon_testnet_generic)
 
 .PHONY: debian-build-daemon-devnet
 debian-build-daemon-devnet: ## Build the Debian daemon package for devnet
@@ -569,9 +569,9 @@ debian-build-daemon-mainnet: ## Build the Debian daemon package for mainnet
 debian-build-logproc: ## Build the Debian logproc package
 	$(call build_debian_package,logproc)
 
-.PHONY: debian-build-rosetta-berkeley
-debian-build-rosetta-berkeley: ## Build the Debian Rosetta package
-	$(call build_debian_package,rosetta_berkeley)
+.PHONY: debian-build-rosetta-testnet-generic
+debian-build-rosetta-testnet-generic: ## Build the Debian Rosetta package
+	$(call build_debian_package,rosetta_testnet_generic)
 
 .PHONY: debian-build-rosetta-devnet
 debian-build-rosetta-devnet: ## Build the Debian Rosetta package for devnet
@@ -640,10 +640,10 @@ docker-build-toolchain: ## Build the toolchain to be used in CI
 		--service mina-toolchain \
 		--version mina-toolchain-$(CODENAME)-$(GITHASH)
 
-.PHONY: docker-build-archive-berkeley
-docker-build-archive-berkeley: SHELL := /bin/bash
-docker-build-archive-berkeley: start-local-debian-repo ## Build the archive Docker image
-	$(call build_docker_image,mina-archive,berkeley)
+.PHONY: docker-build-archive-testnet-generic
+docker-build-archive-testnet-generic: SHELL := /bin/bash
+docker-build-archive-testnet-generic: start-local-debian-repo ## Build the archive Docker image
+	$(call build_docker_image,mina-archive,testnet-generic)
 
 .PHONY: docker-build-archive-devnet
 docker-build-archive-devnet: SHELL := /bin/bash
@@ -655,10 +655,10 @@ docker-build-archive-mainnet: SHELL := /bin/bash
 docker-build-archive-mainnet: start-local-debian-repo ## Build the archive Docker image for mainnet
 	$(call build_docker_image,mina-archive,mainnet)
 
-.PHONY: docker-build-daemon-berkeley
-docker-build-daemon-berkeley: SHELL := /bin/bash
-docker-build-daemon-berkeley: start-local-debian-repo ## Build the daemon Docker image
-	$(call build_docker_image,mina-daemon,berkeley)
+.PHONY: docker-build-daemon-testnet-generic
+docker-build-daemon-testnet-generic: SHELL := /bin/bash
+docker-build-daemon-testnet-generic: start-local-debian-repo ## Build the daemon Docker image
+	$(call build_docker_image,mina-daemon,testnet-generic)
 
 .PHONY: docker-build-daemon-devnet
 docker-build-daemon-devnet: SHELL := /bin/bash
@@ -671,9 +671,9 @@ docker-build-daemon-mainnet: start-local-debian-repo ## Build the daemon Docker
 	$(call build_docker_image,mina-daemon,mainnet)
 
 .PHONY: docker-build-rosetta
-docker-build-rosetta-berkeley: SHELL := /bin/bash
-docker-build-rosetta-berkeley: start-local-debian-repo ## Build the Rosetta Docker image
-	$(call build_docker_image,mina-rosetta,berkeley)
+docker-build-rosetta-testnet-generic: SHELL := /bin/bash
+docker-build-rosetta-testnet-generic: start-local-debian-repo ## Build the Rosetta Docker image
+	$(call build_docker_image,mina-rosetta,testnet-generic)
 
 .PHONY: docker-build-rosetta-devnet
 docker-build-rosetta-devnet: SHELL := /bin/bash

buildkite/scripts/bench/install.sh

@@ -5,7 +5,7 @@ set -eo pipefail
 # Don't prompt for answers during apt-get install
 export DEBIAN_FRONTEND=noninteractive
 
-TESTNET_NAME="berkeley"
+TESTNET_NAME="testnet-generic"
 
 git config --global --add safe.directory /workdir
 source buildkite/scripts/export-git-env-vars.sh

buildkite/scripts/debian/install.sh

@@ -37,7 +37,7 @@ else
   debs=(${DEBS//,/ })
   for i in "${debs[@]}"; do
     case $i in
-      mina-berkeley*|mina-devnet|mina-mainnet)
+      mina-testnet-generic*|mina-devnet|mina-mainnet)
         # Downaload mina-logproc too
         ./buildkite/scripts/cache/manager.sh read "debians/$MINA_DEB_CODENAME/mina-logproc*" $LOCAL_DEB_FOLDER
       ;;

buildkite/scripts/dump-mina-type-shapes.sh

@@ -4,7 +4,7 @@ set -eo pipefail
 
 buildkite/scripts/debian/update.sh --verbose
 
-TESTNET_NAME="berkeley"
+TESTNET_NAME="testnet-generic"
 
 git config --global --add safe.directory /workdir
 source buildkite/scripts/export-git-env-vars.sh

buildkite/scripts/run-test-executive-local.sh

@@ -30,8 +30,8 @@ MINA_DOCKER_NAME="mina-daemon"
 MINA_ARCHIVE_DOCKER_NAME="mina-archive"
 
 
-MINA_IMAGE="$DOCKER_REPO/$MINA_DOCKER_NAME:$MINA_DOCKER_TAG-berkeley"
-ARCHIVE_IMAGE="$DOCKER_REPO/$MINA_ARCHIVE_DOCKER_NAME:$MINA_DOCKER_TAG-berkeley"
+MINA_IMAGE="$DOCKER_REPO/$MINA_DOCKER_NAME:$MINA_DOCKER_TAG-testnet-generic"
+ARCHIVE_IMAGE="$DOCKER_REPO/$MINA_ARCHIVE_DOCKER_NAME:$MINA_DOCKER_TAG-testnet-generic"
 
 if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]]; then
   echo "Skipping $TEST_NAME"

buildkite/scripts/single-node-tests.sh

@@ -11,7 +11,7 @@ source buildkite/scripts/export-git-env-vars.sh
 
 source buildkite/scripts/debian/update.sh --verbose
 
-source buildkite/scripts/debian/install.sh "mina-test-suite,mina-berkeley-lightnet" 1
+source buildkite/scripts/debian/install.sh "mina-test-suite,mina-testnet-generic-lightnet" 1
 
 export MINA_LIBP2P_PASS="naughty blue worm"
 export MINA_PRIVKEY_PASS="naughty blue worm"

buildkite/scripts/tests/ledger_test_apply.sh

@@ -11,7 +11,7 @@ source buildkite/scripts/export-git-env-vars.sh
 
 source buildkite/scripts/debian/update.sh --verbose
 
-source buildkite/scripts/debian/install.sh "mina-berkeley-instrumented" 1
+source buildkite/scripts/debian/install.sh "mina-testnet-generic-instrumented" 1
 
 echo "removing magic config files"
 sudo rm -f /var/lib/coda/config_*

buildkite/scripts/version-linter.sh

@@ -7,7 +7,7 @@ if [[ $# -ne 1 ]]; then
     exit 1
 fi
 
-TESTNET_NAME="${TESTNET_NAME:-berkeley}"
+TESTNET_NAME="${TESTNET_NAME:-testnet-generic}"
 
 git config --global --add safe.directory /workdir
 

buildkite/src/Command/DockerImage.dhall

@@ -60,7 +60,7 @@ let ReleaseSpec =
           }
       , default =
           { deps = [] : List Command.TaggedKey.Type
-          , network = Network.Type.Berkeley
+          , network = Network.Type.TestnetGeneric
           , arch = Arch.Type.Amd64
           , version = "\\\${MINA_DOCKER_TAG}"
           , service = Artifacts.Type.Daemon
@@ -167,7 +167,7 @@ let generateStep =
           let buildDockerCmd =
                     "./scripts/docker/build.sh"
                 ++  " --service ${Artifacts.dockerName spec.service}"
-                ++  " --network ${Network.lowerName spec.network}"
+                ++  " --network ${Network.debianSuffix spec.network}"
                 ++  " --version ${spec.version}"
                 ++  " --branch ${spec.branch}"
                 ++  " ${maybeCacheOption} "
@@ -193,7 +193,7 @@ let generateStep =
                 then      "./scripts/docker/release.sh"
                       ++  " --service ${Artifacts.dockerName spec.service}"
                       ++  " --version ${spec.version}"
-                      ++  " --network ${Network.lowerName spec.network}"
+                      ++  " --network ${Network.debianSuffix spec.network}"
                       ++  " --deb-codename ${DebianVersions.lowerName
                                                spec.deb_codename}"
                       ++  " --deb-version ${spec.deb_version}"

buildkite/src/Command/MinaArtifact.dhall

@@ -73,7 +73,7 @@ let MinaBuildSpec =
           , debVersion = DebianVersions.DebVersion.Bullseye
           , profile = Profiles.Type.Devnet
           , buildFlags = BuildFlags.Type.None
-          , network = Network.Type.Berkeley
+          , network = Network.Type.TestnetGeneric
           , toolchainSelectMode = Toolchain.SelectionMode.ByDebianAndArch
           , tags = [ PipelineTag.Type.Long, PipelineTag.Type.Release ]
           , scope = PipelineScope.Full
@@ -312,7 +312,7 @@ let docker_step
                   [ DockerImage.ReleaseSpec::{
                     , deps = deps
                     , service = Artifacts.Type.FunctionalTestSuite
-                    , network = Network.Type.Berkeley
+                    , network = Network.Type.TestnetGeneric
                     , deb_codename = spec.debVersion
                     , build_flags = spec.buildFlags
                     , docker_publish = docker_publish

buildkite/src/Command/Packages/VerifyDockers.dhall

@@ -57,7 +57,7 @@ let joinNetworks
             ( Prelude.List.map
                 Network.Type
                 Text
-                (\(network : Network.Type) -> Network.lowerName network)
+                (\(network : Network.Type) -> Network.debianSuffix network)
                 spec.networks
             )
 

buildkite/src/Constants/Artifacts.dhall

@@ -177,7 +177,7 @@ let Tag =
           , version = "\\\${MINA_DOCKER_TAG}"
           , profile = Profiles.Type.Devnet
           , buildFlags = BuildFlags.Type.None
-          , network = Network.Type.Berkeley
+          , network = Network.Type.TestnetGeneric
           , remove_profile_from_name = False
           }
       }
@@ -201,19 +201,20 @@ let dockerTag =
 
           in  merge
                 { Daemon =
-                    "${spec.version}-${Network.lowerName
+                    "${spec.version}-${Network.debianSuffix
                                          spec.network}${profile_part}${build_flags_part}"
                 , DaemonLegacyHardfork =
-                    "${spec.version}-${Network.lowerName
+                    "${spec.version}-${Network.debianSuffix
                                          spec.network}${profile_part}"
                 , DaemonAutoHardfork =
-                    "${spec.version}-${Network.lowerName
+                    "${spec.version}-${Network.debianSuffix
                                          spec.network}${profile_part}"
                 , Archive = "${spec.version}${build_flags_part}"
                 , LogProc = "${spec.version}"
                 , TestExecutive = "${spec.version}"
                 , BatchTxn = "${spec.version}"
-                , Rosetta = "${spec.version}-${Network.lowerName spec.network}"
+                , Rosetta =
+                    "${spec.version}-${Network.debianSuffix spec.network}"
                 , ZkappTestTransaction = "${spec.version}"
                 , FunctionalTestSuite = "${spec.version}${build_flags_part}"
                 , Toolchain = "${spec.version}"

buildkite/src/Constants/DebianVersions.dhall

@@ -44,7 +44,7 @@ let DepsSpec =
           }
       , default =
           { deb_version = DebVersion.Bullseye
-          , network = Network.Type.Berkeley
+          , network = Network.Type.TestnetGeneric
           , profile = Profiles.Type.Devnet
           , build_flag = BuildFlags.Type.None
           , step = "build"

buildkite/src/Constants/DockerVersions.dhall

@@ -47,7 +47,7 @@ let DepsSpec =
       , default =
           { codename = Docker.Bullseye
           , prefix = "MinaArtifact"
-          , network = Network.Type.Berkeley
+          , network = Network.Type.TestnetGeneric
           , profile = Profiles.Type.Devnet
           , artifact = Artifacts.Type.Daemon
           , buildFlags = BuildFlags.Type.None

buildkite/src/Constants/Network.dhall

@@ -4,14 +4,20 @@ let List/any = Prelude.List.any
 
 let Network
     : Type
-    = < Devnet | Mainnet | Berkeley | DevnetLegacy | MainnetLegacy | PreMesa1 >
+    = < Devnet
+      | Mainnet
+      | TestnetGeneric
+      | DevnetLegacy
+      | MainnetLegacy
+      | PreMesa1
+      >
 
 let capitalName =
           \(network : Network)
       ->  merge
             { Devnet = "Devnet"
             , Mainnet = "Mainnet"
-            , Berkeley = "Berkeley"
+            , TestnetGeneric = "TestnetGeneric"
             , DevnetLegacy = "DevnetLegacy"
             , MainnetLegacy = "MainnetLegacy"
             , PreMesa1 = "PreMesa1"
@@ -23,19 +29,31 @@ let lowerName =
       ->  merge
             { Devnet = "devnet"
             , Mainnet = "mainnet"
-            , Berkeley = "berkeley"
+            , TestnetGeneric = "testnet_generic"
             , DevnetLegacy = "devnet_legacy"
             , MainnetLegacy = "mainnet_legacy"
             , PreMesa1 = "hetzner-pre-mesa-1"
             }
             network
 
+let debianSuffix =
+          \(network : Network)
+      ->  merge
+            { Devnet = "devnet"
+            , Mainnet = "mainnet"
+            , TestnetGeneric = "testnet-generic"
+            , DevnetLegacy = "devnet-legacy"
+            , MainnetLegacy = "mainnet-legacy"
+            , PreMesa1 = "hetzner-pre-mesa-1"
+            }
+            network
+
 let requiresMainnetBuild =
           \(network : Network)
       ->  merge
             { Devnet = True
             , Mainnet = True
-            , Berkeley = False
+            , TestnetGeneric = True
             , DevnetLegacy = True
             , MainnetLegacy = True
             , PreMesa1 = False
@@ -61,6 +79,7 @@ let foldMinaBuildMainnetEnv =
 in  { Type = Network
     , capitalName = capitalName
     , lowerName = lowerName
+    , debianSuffix = debianSuffix
     , requiresMainnetBuild = requiresMainnetBuild
     , foldMinaBuildMainnetEnv = foldMinaBuildMainnetEnv
     , buildMainnetEnv = buildMainnetEnv

buildkite/src/Constants/Profiles.dhall

@@ -39,7 +39,7 @@ let fromNetwork =
       ->  merge
             { Devnet = Profile.Devnet
             , Mainnet = Profile.Mainnet
-            , Berkeley = Profile.Devnet
+            , TestnetGeneric = Profile.Devnet
             , DevnetLegacy = Profile.Devnet
             , MainnetLegacy = Profile.Mainnet
             , PreMesa1 = Profile.Devnet

buildkite/src/Entrypoints/GenerateHardforkPackage.dhall

@@ -47,7 +47,7 @@ let Spec =
           }
       , default =
           { codenames = [ DebianVersions.DebVersion.Bullseye ]
-          , network = Network.Type.Berkeley
+          , network = Network.Type.TestnetGeneric
           , genesis_timestamp = Some "2024-04-07T11:45:00Z"
           , config_json_gz_url =
               "https://storage.googleapis.com/o1labs-gitops-infrastructure/devnet/devnet-state-dump-3NK4eDgbkCjKj9fFUXVkrJXsfpfXzJySoAvrFJVCropPW7LLF14F-676026c4d4d2c18a76b357d6422a06f932c3ef4667a8fd88717f68b53fd6b2d7.json.gz"

buildkite/src/Jobs/Test/RosettaIntegrationTests.dhall

@@ -20,7 +20,7 @@ let Network = ../../Constants/Network.dhall
 
 let RunWithPostgres = ../../Command/RunWithPostgres.dhall
 
-let network = Network.Type.Berkeley
+let network = Network.Type.TestnetGeneric
 
 let dirtyWhen =
       [ S.strictlyStart (S.contains "src")