Skip to content

Commit

Permalink
update: use anza-xyz agave (#852)
Browse files Browse the repository at this point in the history
* update: use anza-xyz agave

* one more replace
  • Loading branch information
aalu1418 authored Sep 12, 2024
1 parent 3c609a6 commit 50ca9e4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion integration-tests/testconfig/default.toml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ inside_k8 = false
network = "localnet"
user = "default"
stateful_db = false
devnet_image = "solanalabs/solana:v1.18.23"
devnet_image = "anzaxyz/agave:v1.18.23"

[OCR2]
node_count = 6
Expand Down
2 changes: 1 addition & 1 deletion scripts/install-solana-ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@

set -euxo pipefail

sh -c "$(curl -sSfL https://release.solana.com/v1.18.23/install)"
sh -c "$(curl -sSfL https://release.anza.xyz/v1.18.23/install)"
echo "PATH=$HOME/.local/share/solana/install/active_release/bin:$PATH" >> $GITHUB_ENV
10 changes: 5 additions & 5 deletions scripts/setup-localnet/localnet.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ container_name="chainlink-solana.test-validator"

echo "Starting $container_name@$container_version"

# NOTE: solanalabs/solana docker image only supports linux/amd64
# https://hub.docker.com/r/solanalabs/solana/tags
# NOTE: anzaxyz/agave docker image only supports linux/amd64
# https://hub.docker.com/r/anzaxyz/agave/tags
# If you are running on an ARM machine, Following error will be thrown:
# "Incompatible CPU detected: missing AVX support. Please build from source on the target "
docker run -d \
Expand All @@ -22,7 +22,7 @@ docker run -d \
-p 127.0.0.1:9900:9900 \
--name "${container_name}" \
--entrypoint /bin/sh \
"solanalabs/solana:${container_version}" \
"anzaxyz/agave:${container_version}" \
-c "solana-test-validator && echo 'Validator started successfully'"
# --network-alias "${container_name}" \
# --network chainlink \
Expand All @@ -46,7 +46,7 @@ do

if [[ $output == *"Incompatible CPU detected"* || $output == *"Aborted"* ]]; then
echo ""
echo "solanalabs/solana docker image only supports linux/amd64"
echo "anzaxyz/agave docker image only supports linux/amd64"
exit 1
fi

Expand All @@ -59,4 +59,4 @@ do
fi

sleep 3
done
done
10 changes: 5 additions & 5 deletions scripts/update-solana.sh
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
#!/bin/bash
set -e

cliVersion=$(grep -oh "release.solana.com/v[0-9]*.[0-9]*.[0-9]*" scripts/install-solana-ci.sh)
cliVersion=$(grep -oh "release.anza.xyz/v[0-9]*.[0-9]*.[0-9]*" scripts/install-solana-ci.sh)
echo "Current Test CLI Version: $cliVersion"

cd integration-tests
testVersion=$(grep -oh "solanalabs/solana:v[0-9]*.[0-9]*.[0-9]*" testconfig/default.toml)
testVersion=$(grep -oh "anzaxyz/agave:v[0-9]*.[0-9]*.[0-9]*" testconfig/default.toml)
echo "Current E2E Test Version: $testVersion"
cd ..

Expand All @@ -15,9 +15,9 @@ echo "Current Version in Localnet Container: $localnetVersion"
nixVersion=$(grep -oh "version = \"v[0-9]*.[0-9]*.[0-9]*\"" solana.nix)
echo "Current Version in Nix packages: $nixVersion"

latestTag=$(curl https://api.github.com/repos/solana-labs/solana/releases/latest | jq -r '.tag_name')
latestVersion="solanalabs/solana:$latestTag"
latestCLI="release.solana.com/$latestTag"
latestTag=$(curl https://api.github.com/repos/anza-xyz/agave/releases/latest | jq -r '.tag_name')
latestVersion="anzaxyz/agave:$latestTag"
latestCLI="release.anza.xyz/$latestTag"
latestLocalnet="container_version=$latestTag"
latestNix="version = \"$latestTag\""
echo "Latest Solana Mainnet Version: $latestTag"
Expand Down

0 comments on commit 50ca9e4

Please sign in to comment.