Merge pull request #17721 from MinaProtocol/sanabriarusso/buildkite-fix

Removing helm tools

Author: dkijania

buildkite/scripts/debian/update.sh

@@ -29,8 +29,7 @@ APT_SOURCES_DIR="/etc/apt/sources.list.d"
 export DEBIAN_FRONTEND=noninteractive
 
 # Configuration
-BLACKLISTED_REPOS=( helm-stable-debian.list )  # Default blacklisted repositories
-# BLACKLISTED_REPOS=()  # Uncomment to start with no blacklisted repos
+BLACKLISTED_REPOS=()  # Uncomment to start with no blacklisted repos
 VERBOSE=false
 DRY_RUN=false
 SUDO_CMD=""

buildkite/src/Constants/ContainerImages.dhall

@@ -4,13 +4,15 @@
 -- NOTE: minaToolchainBookworm is also used for building Ubuntu Jammy packages in CI
 { toolchainBase = "codaprotocol/ci-toolchain-base:v3"
 , minaToolchainBookworm =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:809e6b4af19a962a6a158b835007e24c45118d0d3da59a8b8013094c774f8279"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:cb7253baa6389779bf6986285dfc34ed60ce389bebdeae3bb68c25945ba6670b"
 , minaToolchainBullseye =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:7a9cd3e3eeb30ef2a7cad1737bcf7382c425275dc7664c86c9714ab4fe7bd091"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:f26c26154d8185dc473d25bf19e71670beee8d8083c03acb3a242a56154d9511"
 , minaToolchainNoble =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:56455a3fa1a3b575b511e89aba88f7f8374ecc7b20ca04f26e035b17b63356e9"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:190f31de9aa9b6da0f2be93e467f0307fbc85fd0c32e2e742e8b566bb2e23a45"
+, minaToolchainJammy =
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:969baf296735abc81958c0a2192973562287f5c9f170442b44076047bde7a1e1"
 , minaToolchain =
-    "gcr.io/o1labs-192920/mina-toolchain@sha256:7a9cd3e3eeb30ef2a7cad1737bcf7382c425275dc7664c86c9714ab4fe7bd091"
+    "gcr.io/o1labs-192920/mina-toolchain@sha256:f26c26154d8185dc473d25bf19e71670beee8d8083c03acb3a242a56154d9511"
 , postgres = "postgres:12.4-alpine"
 , xrefcheck =
     "dkhamsing/awesome_bot@sha256:a8adaeb3b3bd5745304743e4d8a6d512127646e420544a6d22d9f58a07f35884"

dockerfiles/Dockerfile-mina-test-suite

@@ -47,6 +47,7 @@ RUN apt-get update --quiet --yes \
     libssl1.1 \
     tzdata \
     jq \
+    procps \
     sudo \
     wget \
   && rm -rf /var/lib/apt/lists/*

dockerfiles/stages/3-toolchain

@@ -30,6 +30,7 @@ RUN apt-get update --yes \
     postgresql \
     postgresql-contrib \
     perl \
+    procps \
     python3 \
     python3-pip \
     python3-sexpdata \
@@ -65,13 +66,6 @@ RUN echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.
 
 ENV USE_GKE_GCLOUD_AUTH_PLUGIN=True
 
-# --- Helm tools
-RUN curl https://baltocdn.com/helm/signing.asc | apt-key add - \
-    && echo "deb https://baltocdn.com/helm/stable/debian/ all main" | tee /etc/apt/sources.list.d/helm-stable-debian.list \
-    && apt-get update --yes \
-    && apt-get install --yes --no-install-recommends helm \
-    && rm -rf /var/lib/apt/lists/*
-
 # --- yarn + nodejs, pinned version
 RUN curl -sL https://deb.nodesource.com/setup_20.x | bash - \
     && curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add - \

scripts/tests/archive-node-test.sh

@@ -4,8 +4,6 @@ set -x
 
 buildkite/scripts/debian/update.sh --verbose
 
-apt-get install -y procps
-
 # test archive node on known archive db
 NETWORK_DATA_FOLDER=${NETWORK_DATA_FOLDER:-src/test/archive/sample_db}
 ARCHIVE_TEST_APP=${ARCHIVE_TEST_APP:-_build/default/src/test/archive/archive_node_tests/archive_node_tests.exe}
@@ -15,4 +13,4 @@ ARCHIVE_TEST_APP=${ARCHIVE_TEST_APP:-_build/default/src/test/archive/archive_nod
 MINA_TEST_POSTGRES_URI=${POSTGRES_URI:-"postgres://postgres:postgres@localhost:5432"}
 
 echo "Running archive node test"
-MINA_TEST_POSTGRES_URI=$MINA_TEST_POSTGRES_URI $ARCHIVE_TEST_APP
+MINA_TEST_POSTGRES_URI=$MINA_TEST_POSTGRES_URI $ARCHIVE_TEST_APP -v