fix missing docker image

x1-labs · Dec 14, 2024 · 64b18a0 · 64b18a0
1 parent 268861a
commit 64b18a0
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 82 deletions.
diff --git a/.buildkite/hooks/post-checkout b/.buildkite/hooks/post-checkout
@@ -4,37 +4,3 @@ CI_BUILD_START=$(date +%s)
 export CI_BUILD_START
 
 source ci/env.sh
-
-##
-## Kill any running docker containers, which are potentially left over from the
-## previous CI job
-##
-#(
-#  echo "+++ Killing stale docker containers"
-#  while read -r line; do
-#    read -r id image _ <<<"$line"
-#
-#    if [[ $image =~ "solanalabs/rust" ]]; then
-#      if docker kill "$id" >/dev/null; then
-#        echo "kill $id $image"
-#      fi
-#      continue
-#    fi
-#  done < <(docker ps | tail -n +2)
-#)
-#
-## Processes from previously aborted CI jobs seem to loiter, unclear why as one
-## would expect the buildkite-agent to clean up all child processes of the
-## aborted CI job.
-## But as a workaround for now manually kill some known loiterers.  These
-## processes will all have the `init` process as their PPID:
-#(
-#  victims=
-#  for name in bash cargo docker solana; do
-#    victims="$victims $(pgrep -u "$(id -u)" -P 1 -d \  $name)"
-#  done
-#  for victim in $victims; do
-#    echo "Killing pid $victim"
-#    kill -9 "$victim" || true
-#  done
-#)
diff --git a/.buildkite/scripts/build-bench.sh b/.buildkite/scripts/build-bench.sh
@@ -8,24 +8,11 @@ source "$here"/common.sh
 
 agent="${1-solana}"
 
-. ci/rust-version.sh
-
 build_steps() {
   cat <<EOF
 {
   "name": "$1",
   "command": "$2",
-  "plugins": [{
-    "docker#v5.12.0": {
-        "image": "$rust_nightly_docker_image",
-        "workdir": "/solana",
-        "propagate-environment": "true",
-        "propagate-uid-gid": "true",
-        "environment": [
-          "RUSTC_WRAPPER=/usr/local/cargo/bin/sccache"
-        ]
-    }
-  }],
   "timeout_in_minutes": 30,
   "agent": "$agent",
   "retry": 3

diff --git a/.buildkite/scripts/build-stable.sh b/.buildkite/scripts/build-stable.sh
@@ -8,24 +8,11 @@ source "$here"/common.sh
 
 agent="${1-solana}"
 
-. ci/rust-version.sh
-
 partitions=$(
   cat <<EOF
 {
   "name": "partitions",
   "command": "ci/stable/run-partition.sh",
-  "plugins": [{
-    "docker#v5.12.0": {
-        "image": "$rust_nightly_docker_image",
-        "workdir": "/solana",
-        "propagate-environment": "true",
-        "propagate-uid-gid": "true",
-        "environment": [
-          "RUSTC_WRAPPER=/usr/local/cargo/bin/sccache"
-        ]
-    }
-  }],
   "timeout_in_minutes": 30,
   "agent": "$agent",
   "parallelism": 2,
@@ -39,17 +26,6 @@ local_cluster_partitions=$(
 {
   "name": "local-cluster",
   "command": "ci/stable/run-local-cluster-partially.sh",
-  "plugins": [{
-    "docker#v5.12.0": {
-        "image": "$rust_nightly_docker_image",
-        "workdir": "/solana",
-        "propagate-environment": "true",
-        "propagate-uid-gid": "true",
-        "environment": [
-          "RUSTC_WRAPPER=/usr/local/cargo/bin/sccache"
-        ]
-    }
-  }],
   "timeout_in_minutes": 30,
   "agent": "$agent",
   "parallelism": 5,
@@ -63,17 +39,6 @@ localnet=$(
 {
   "name": "localnet",
   "command": "ci/stable/run-localnet.sh",
-  "plugins": [{
-    "docker#v5.12.0": {
-        "image": "$rust_nightly_docker_image",
-        "workdir": "/solana",
-        "propagate-environment": "true",
-        "propagate-uid-gid": "true",
-        "environment": [
-          "RUSTC_WRAPPER=/usr/local/cargo/bin/sccache"
-        ]
-    }
-  }],
   "timeout_in_minutes": 30,
   "agent": "$agent"
 }