Merge pull request #17970 from MinaProtocol/dkijania/filter_out_arm_amd

[CI] Support archs argument in aptly

Author: dkijania

buildkite/scripts/debian/start_local_repo.sh

@@ -5,6 +5,22 @@ if [ -z $MINA_DEB_CODENAME ]; then
     exit 1
 fi
 
+# Parse command line arguments
+ARCH="amd64"  # default architecture
+
+while [[ $# -gt 0 ]]; do
+    case $1 in
+        --arch)
+            ARCH="$2"
+            shift 2
+            ;;
+        *)
+            echo "Unknown option: $1"
+            exit 1
+            ;;
+    esac
+done
+
 LOCAL_DEB_FOLDER=_build
 
 set -eou pipefail
@@ -16,4 +32,4 @@ mkdir -p $LOCAL_DEB_FOLDER
 source ./buildkite/scripts/export-git-env-vars.sh
 ./buildkite/scripts/cache/manager.sh read --root legacy/debians "$MINA_DEB_CODENAME/*" _build
 ./buildkite/scripts/cache/manager.sh read "debians/$MINA_DEB_CODENAME/*" _build
-./scripts/debian/aptly.sh start --codename $MINA_DEB_CODENAME --debians $LOCAL_DEB_FOLDER --component unstable --clean --background --wait
+./scripts/debian/aptly.sh start --codename $MINA_DEB_CODENAME --debians $LOCAL_DEB_FOLDER --component unstable --clean --background --wait --archs $ARCH

buildkite/scripts/release/manager.sh

@@ -1915,6 +1915,10 @@ function pull(){
                 __networks=${2:?$error_message}
                 shift 2;
             ;;
+            --archs )
+                __archs=${2:?$error_message}
+                shift 2;
+            ;;
             * )
                 echo -e "${RED} !! Unknown option: $1${CLEAR}\n";
                 echo "";
@@ -1936,6 +1940,8 @@ function pull(){
     echo " - Target: $__target"
     echo " - Codenames: $__codenames"
     echo " - Networks: $__networks"
+    echo " - Architectures: $__archs"
+
     if [[ -n ${__from_special_folder+x} ]]; then
         echo " - From special folder: $__from_special_folder"
     fi
@@ -1947,26 +1953,28 @@ function pull(){
     read -r -a __artifacts_arr <<< "$__artifacts"
     read -r -a __codenames_arr <<< "$__codenames"
     read -r -a __networks_arr <<< "$__networks"
+    read -r -a __archs_arr <<< "$__archs"
 
-    for __artifact in "${__artifacts_arr[@]}"; do
-        for __codename in "${__codenames_arr[@]}"; do
-            for network in "${__networks_arr[@]}"; do
-                echo "  📥  Pulling $__artifact for $__codename codename and $network network"
-                local __artifact_full_name
-                local __source_path
-                __artifact_full_name=$(get_artifact_with_suffix $__artifact $network)
-
-                if [[ -n ${__from_special_folder+x} ]]; then
-                    __source_path="$(storage_root "$__backend")/$__from_special_folder/${__artifact_full_name}_*"
-                else
-                    __source_path="$(storage_root "$__backend")/$__buildkite_build_id/debians/$__codename/${__artifact_full_name}_*"
-                fi
-
-                storage_download "$__backend" "$__source_path" "$__target"
+    for __arch in "${__archs_arr[@]}"; do
+        for __artifact in "${__artifacts_arr[@]}"; do
+            for __codename in "${__codenames_arr[@]}"; do
+                for network in "${__networks_arr[@]}"; do
+                    echo "  📥  Pulling $__artifact for $__codename codename and $network network"
+                    local __artifact_full_name
+                    local __source_path
+                    __artifact_full_name=$(get_artifact_with_suffix $__artifact $network)
+
+                    if [[ -n ${__from_special_folder+x} ]]; then
+                        __source_path="$(storage_root "$__backend")/$__from_special_folder/${__artifact_full_name}_*_${__arch}.deb"
+                    else
+                        __source_path="$(storage_root "$__backend")/$__buildkite_build_id/debians/$__codename/${__artifact_full_name}_*_${__arch}.deb"
+                    fi
+
+                    storage_download "$__backend" "$__source_path" "$__target"
+                done
             done
         done
     done
-
     echo " ✅  Done."
     echo ""
 }

buildkite/src/Command/DockerImage.dhall

@@ -109,7 +109,8 @@ let generateStep =
                 then  " && echo Skipping local debian repo setup "
 
                 else      " && ./buildkite/scripts/debian/update.sh --verbose"
-                      ++  " && apt-get install aptly -y && ./buildkite/scripts/debian/start_local_repo.sh"
+                      ++  " && apt-get install aptly -y && ./buildkite/scripts/debian/start_local_repo.sh --arch ${Arch.lowerName
+                                                                                                                     spec.arch}"
 
           let maybeStopDebianRepo =
                       if spec.no_debian

scripts/debian/aptly.sh

@@ -28,24 +28,27 @@ check_required jq
 function start_aptly() {
     local __distribution=$1
     local __debs=$2
-    local __background=$3
-    local __clean=$4
-    local __component=$5
+    local __archs=$3
+    local __background=$4
+    local __clean=$5
+    local __component=$6
     local __repo="${__distribution}"-"${__component}"
-    local __port=$6
-    local __wait=$7
+    local __port=$7
+    local __wait=$8
 
     if [ "${__clean}" = 1 ]; then
         rm -rf ~/.aptly
     fi
 
-    aptly repo create -component "${__component}" -distribution "${__distribution}"  "${__repo}"
+    aptly repo list | grep -q "^${__repo}$" && aptly repo drop "${__repo}" || true
 
-    aptly repo add "${__repo}" "${__debs}"
+    aptly repo create -component "${__component}" -distribution "${__distribution}" -architectures "${__archs}" "${__repo}"
 
-    aptly snapshot create "${__component}" from repo "${__repo}"
+    aptly repo add -architectures "${__archs}" "${__repo}" "${__debs}"
 
-    aptly publish snapshot -distribution="${__distribution}" -skip-signing "${__component}"
+    aptly snapshot create -architectures "${__archs}" "${__component}" from repo "${__repo}"
+
+    aptly publish snapshot -architectures "${__archs}" -distribution "${__distribution}" -skip-signing "${__component}"
 
     if [ "${__background}" = 1 ]; then
         aptly serve -listen 0.0.0.0:"${__port}" &
@@ -101,6 +104,7 @@ function start(){
     local __background=0
     local __clean=0
     local __component="unstable"
+    local __archs="amd64"
     local __port=$PORT
     local __wait=0
 
@@ -127,6 +131,10 @@ function start(){
                 __debs=${2:?$error_message}
                 shift 2;
             ;;
+            -a | --archs )
+                __archs=${2:?$error_message}
+                shift 2;
+            ;;
             -m | --component )
                 __component=${2:?$error_message}
                 shift 2;
@@ -149,6 +157,7 @@ function start(){
 
     start_aptly $__distribution \
         $__debs \
+        $__archs \
         $__background \
         $__clean \
         $__component \