Use devnet packages in connectivity tests. Do not connect to berkeley…

… network
MinaProtocol · Nov 10, 2024 · 7550f26 · 7550f26
1 parent 862035d
commit 7550f26
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 11 deletions.
diff --git a/buildkite/scripts/connect-to-berkeley.sh → buildkite/scripts/connect-to-devnet.sh b/buildkite/scripts/connect-to-berkeley.sh → buildkite/scripts/connect-to-devnet.sh
@@ -3,10 +3,10 @@
 set -eo pipefail
 
 case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in
-  rampup|berkeley|release/2.0.0|develop)
+  compatible|release/*|develop|master)
   ;;
   *)
-    echo "Not pulling against rampup, not running the connect test"
+    echo "Not pulling against mainline branch, not running the connect test"
     exit 0 ;;
 esac
 
@@ -16,7 +16,7 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get update
 apt-get install -y git apt-transport-https ca-certificates tzdata curl
 
-TESTNET_VERSION_NAME="berkeley"
+TESTNET_VERSION_NAME="devnet"
 TESTNET_NAME="testworld-2-0"
 
 git config --global --add safe.directory /workdir

diff --git a/buildkite/scripts/connect-to-testnet.sh b/buildkite/scripts/connect-to-testnet.sh
@@ -7,16 +7,16 @@ if [[ $# -ne 3 ]]; then
     exit 1
 fi
 
-TESTNET_VERSION_NAME="berkeley"
+TESTNET_VERSION_NAME="devnet"
 TESTNET_NAME=$1
 WAIT_BETWEEN_POLLING_GRAPHQL=$2
 WAIT_AFTER_FINAL_CHECK=$3
 
 case "$BUILDKITE_PULL_REQUEST_BASE_BRANCH" in
-  rampup|berkeley|release/2.0.0|develop)
+  compatible|release/*|develop|master)
   ;;
   *)
-    echo "Not pulling against rampup, not running the connect test"
+    echo "Not pulling against mainline branch, not running the connect test"
     exit 0 ;;
 esac
 

diff --git a/buildkite/src/Constants/DebianVersions.dhall b/buildkite/src/Constants/DebianVersions.dhall
@@ -110,7 +110,7 @@ let bullseyeDirtyWhen =
         [ S.strictlyStart (S.contains "src")
         , S.strictlyStart (S.contains "automation")
         , S.strictly (S.contains "Makefile")
-        , S.exactly "buildkite/scripts/connect-to-berkeley" "sh"
+        , S.exactly "buildkite/scripts/connect-to-devnet" "sh"
         , S.exactly "buildkite/scripts/connect-to-mainnet-on-compatible" "sh"
         , S.exactly "buildkite/scripts/rosetta-integration-tests" "sh"
         , S.exactly "buildkite/scripts/rosetta-integration-tests-full" "sh"

diff --git a/...ite/src/Jobs/Test/ConnectToBerkeley.dhall → ...dkite/src/Jobs/Test/ConnectToDevnet.dhall b/...ite/src/Jobs/Test/ConnectToBerkeley.dhall → ...dkite/src/Jobs/Test/ConnectToDevnet.dhall
@@ -23,7 +23,7 @@ let Dockers = ../../Constants/DockerVersions.dhall
 let dependsOn =
       Dockers.dependsOn
         Dockers.Type.Bullseye
-        (Some Network.Type.Berkeley)
+        (Some Network.Type.Devnet)
         Profiles.Type.Standard
         Artifacts.Type.Daemon
 
@@ -33,17 +33,17 @@ in  Pipeline.build
         , dirtyWhen =
           [ S.strictlyStart (S.contains "src")
           , S.exactly "buildkite/scripts/connect-to-testnet" "sh"
-          , S.exactly "buildkite/src/Jobs/Test/ConnectToBerkeley" "dhall"
+          , S.exactly "buildkite/src/Jobs/Test/ConnectToDevnet" "dhall"
           , S.exactly "buildkite/src/Command/ConnectToTestnet" "dhall"
           ]
         , path = "Test"
-        , name = "ConnectToBerkeley"
+        , name = "ConnectToDevnet"
         , tags = [ PipelineTag.Type.Long, PipelineTag.Type.Test ]
         }
       , steps =
         [ ConnectToTestnet.step
             dependsOn
-            "berkeley"
+            "devnet"
             "40s"
             "2m"
             (B/SoftFail.Boolean True)