Merge branch 'compatible' into dkijania/convert_berkeley_to_testnet_generic

Author: dkijania

buildkite/scripts/check-compatibility.sh

@@ -510,11 +510,9 @@ function promote_and_verify_docker() {
     local __artifact_full_target_version=$__target_version-$__codename${__suffix}
 
     if [[ $__publish_to_docker_io == 1 ]]; then
-        local __publish_arg="-p"
-        local __repo=$DOCKER_IO_REPO
+        local __push_repo=$DOCKER_IO_REPO
     else
-        local __publish_arg=""
-        local __repo=$GCR_REPO
+        local __push_repo=$GCR_REPO
     fi
 
     echo " 🐋 Publishing $__artifact docker for '$__network' network and '$__codename' codename with '$__target_version' version and '$__arch' "
@@ -527,7 +525,8 @@ function promote_and_verify_docker() {
             -v $__artifact_full_source_version \
             -t $__artifact_full_target_version \
             -a $__arch \
-            $__publish_arg
+            --pull-registry "$GCR_REPO" \
+            --push-registry "$__push_repo" \
 
             echo ""
 
@@ -1013,6 +1012,7 @@ function promote(){
     local __debian_repo=$DEBIAN_REPO
     local __debian_sign_key=""
     local __arch="$DEFAULT_ARCHITECTURES"
+    local __profile=$DEFAULT_PROFILE
 
 
     while [ ${#} -gt 0 ]; do
@@ -1085,6 +1085,10 @@ function promote(){
                 __arch=${2:?$error_message}
                 shift 2;
             ;;
+            --profile )
+                __profile=${2:?$error_message}
+                shift 2;
+            ;;
             * )
                 echo -e "${RED} !! Unknown option: $1${CLEAR}\n";
                 echo "";

buildkite/scripts/release/manager.sh

@@ -25,9 +25,13 @@ fi
 cleanup
 
 TEST_NAME="$1"
+DOCKER_REPO="$2"
+MINA_DOCKER_NAME="mina-daemon"
+MINA_ARCHIVE_DOCKER_NAME="mina-archive"
 
-MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-testnet-generic"
-ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG-testnet-generic"
+
+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/run-test-executive-local.sh

@@ -20,6 +20,8 @@ let DockerLogin = ../Command/DockerLogin/Type.dhall
 
 let DebianRepo = ../Constants/DebianRepo.dhall
 
+let DockerRepo = ../Constants/DockerRepo.dhall
+
 let DebianVersions = ../Constants/DebianVersions.dhall
 
 let Network = ../Constants/Network.dhall
@@ -51,6 +53,7 @@ let ReleaseSpec =
           , build_flags : BuildFlags.Type
           , step_key_suffix : Text
           , docker_publish : DockerPublish.Type
+          , docker_repo : DockerRepo.Type
           , verify : Bool
           , if_ : Optional B/If
           }
@@ -72,6 +75,7 @@ let ReleaseSpec =
           , docker_publish = DockerPublish.Type.Essential
           , no_cache = False
           , no_debian = False
+          , docker_repo = DockerRepo.Type.Internal
           , step_key_suffix = "-docker-image"
           , verify = False
           , deb_suffix = None Text
@@ -166,6 +170,7 @@ let generateStep =
                 ++  debSuffix
                 ++  " --repo ${spec.repo}"
                 ++  " --platform ${Arch.platform spec.arch}"
+                ++  " --docker-registry ${DockerRepo.show spec.docker_repo}"
 
           let releaseDockerCmd =
                       if DockerPublish.shouldPublish
@@ -184,6 +189,8 @@ let generateStep =
                       ++  " --deb-build-flags ${BuildFlags.lowerName
                                                   spec.build_flags}"
                       ++  " --platform ${Arch.platform spec.arch}"
+                      ++  " --docker-registry ${DockerRepo.show
+                                                  spec.docker_repo}"
 
                 else  " echo In order to ensure storage optimization, skipping publishing docker as this is not essential one or publishing is disabled . Docker publish setting is set to  ${DockerPublish.show
                                                                                                                                                                                                 spec.docker_publish}."

buildkite/src/Command/DockerImage.dhall

@@ -26,6 +26,8 @@ let DebianVersions = ../../Constants/DebianVersions.dhall
 
 let DebianRepo = ../../Constants/DebianRepo.dhall
 
+let DockerRepo = ../../Constants/DockerRepo.dhall
+
 let ContainerImages = ../../Constants/ContainerImages.dhall
 
 let Command = ../Base.dhall
@@ -72,6 +74,7 @@ let Spec =
           , depends_on : List Command.TaggedKey.Type
           , branch : Text
           , architectures : List Architecture.Type
+          , docker_repo : DockerRepo.Type
           , if_ : Optional Text
           }
       , default =
@@ -89,6 +92,7 @@ let Spec =
           , verify = True
           , branch = ""
           , architectures = [ Architecture.Type.Amd64, Architecture.Type.Arm64 ]
+          , docker_repo = DockerRepo.Type.Internal
           , if_ = None Text
           }
       }
@@ -251,6 +255,8 @@ let publish
                                   ++  "--target-version ${r.value} "
                                   ++  "--codenames ${codenames} "
                                   ++  "--only-dockers "
+                                  ++  "--docker-repo ${DockerRepo.show
+                                                         spec.docker_repo} "
                                   ++  "--force-upload-debians "
                                 )
                             ]

buildkite/src/Command/Packages/Publish.dhall

@@ -24,6 +24,8 @@ let Dockers = ../../Constants/DockerVersions.dhall
 
 let Profiles = ../../Constants/Profiles.dhall
 
+let DockerRepo = ../../Constants/DockerRepo.dhall
+
 let B/SoftFail = B.definitions/commandStep/properties/soft_fail/Type
 
 let B/If = B.definitions/commandStep/properties/if/Type
@@ -37,6 +39,7 @@ let Spec =
           , timeout : Natural
           , profile : Profiles.Type
           , scope : List PipelineScope.Type
+          , repo : DockerRepo.Type
           , if_ : B/If
           }
       , default =
@@ -47,6 +50,7 @@ let Spec =
           , timeout = 1000
           , profile = Profiles.Type.Devnet
           , scope = PipelineScope.Full
+          , repo = DockerRepo.Type.Internal
           , if_ =
               "build.pull_request.base_branch != \"develop\" && build.branch != \"develop\""
           }
@@ -64,7 +68,8 @@ let command
                   , "source ./buildkite/scripts/export-git-env-vars.sh"
                   , "scripts/tests/rosetta-connectivity.sh --network ${Network.lowerName
                                                                          spec.network} --tag \\\${MINA_DOCKER_TAG} --timeout ${Natural/show
-                                                                                                                                 spec.timeout} --run-compatibility-test develop --run-load-test "
+                                                                                                                                 spec.timeout} --repo ${DockerRepo.show
+                                                                                                                                                          spec.repo} --run-compatibility-test develop --run-load-test "
                   ]
               ]
             , label =