Merge pull request #17540 from MinaProtocol/dkijania/add_suffix_to_archive_docker_tag

add case for mina-archive to receive docker suffix tag

Author: dkijania

buildkite/scripts/release/manager.sh

@@ -1282,7 +1282,10 @@ function verify(){
                             for network in "${__networks_arr[@]}"; do
                                local __artifact_full_name
                                     __artifact_full_name=$(get_artifact_with_suffix $artifact $network)
-                               
+
+                               local __docker_suffix_combined
+                               __docker_suffix_combined=$(combine_docker_suffixes "$network" "$__docker_suffix")
+
                                if [[ $__only_dockers == 0 ]]; then
                                     echo "     📋  Verifying: $artifact debian on $__channel channel with $__version version for $__codename codename"
 
@@ -1299,18 +1302,13 @@ function verify(){
 
                                 if [[ $__only_debians == 0 ]]; then
 
-                                    local __suffix_arg=""
-                                    if [[ -n "$__docker_suffix" ]]; then
-                                        __suffix_arg="-s -$__docker_suffix"
-                                    fi
-
-                                    echo "      📋  Verifying: $artifact docker on $(calculate_docker_tag "$__docker_io" $__artifact_full_name $__version $__codename "")"
+                                    echo "      📋  Verifying: $artifact docker on $(calculate_docker_tag "$__docker_io" $artifact $__version $__codename "$network")"
 
                                     prefix_cmd "$SUBCOMMAND_TAB" $SCRIPTPATH/../../../scripts/docker/verify.sh \
                                         -p "$artifact" \
                                         -v $__version \
                                         -c "$__codename" \
-                                        ${__suffix_arg} \
+                                        -s "$__docker_suffix_combined" \
                                         -r "$__repo"
 
                                     echo ""

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

@@ -27,7 +27,7 @@ cleanup
 TEST_NAME="$1"
 
 MINA_IMAGE="gcr.io/o1labs-192920/mina-daemon:$MINA_DOCKER_TAG-berkeley"
-ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG"
+ARCHIVE_IMAGE="gcr.io/o1labs-192920/mina-archive:$MINA_DOCKER_TAG-berkeley"
 
 if [[ "${TEST_NAME:0:15}" == "block-prod-prio" ]] && [[ "$RUN_OPT_TESTS" == "" ]]; then
   echo "Skipping $TEST_NAME"

scripts/docker/helper.sh

@@ -21,7 +21,7 @@ function export_base_image () {
 
 function export_version () {
     case "${SERVICE}" in
-        mina-daemon|mina-batch-txn|mina-rosetta|mina-daemon-hardfork) export VERSION="${VERSION}-${NETWORK##*=}" ;;
+        mina-daemon|mina-archive|mina-batch-txn|mina-rosetta|mina-daemon-hardfork) export VERSION="${VERSION}-${NETWORK##*=}" ;;
         *)  ;;
 esac
 }