Desnake upload_ci_artifact for consistency
This commit is contained in:
		@@ -6,7 +6,7 @@ set -e
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
cd "$(dirname "$0")"/..
 | 
			
		||||
source ci/upload_ci_artifact.sh
 | 
			
		||||
source ci/upload-ci-artifact.sh
 | 
			
		||||
source scripts/configure-metrics.sh
 | 
			
		||||
 | 
			
		||||
multinode-demo/setup.sh
 | 
			
		||||
@@ -51,7 +51,7 @@ shutdown() {
 | 
			
		||||
  echo "--- Upload artifacts"
 | 
			
		||||
  for cmd in $backgroundCommands; do
 | 
			
		||||
    declare logfile=log-$cmd.txt
 | 
			
		||||
    upload_ci_artifact "$logfile"
 | 
			
		||||
    upload-ci-artifact "$logfile"
 | 
			
		||||
    tail "$logfile"
 | 
			
		||||
  done
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -59,8 +59,8 @@ echo --- Creating tarball
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
echo --- Saving build artifacts
 | 
			
		||||
source ci/upload_ci_artifact.sh
 | 
			
		||||
upload_ci_artifact solana-release.tar.bz2
 | 
			
		||||
source ci/upload-ci-artifact.sh
 | 
			
		||||
upload-ci-artifact solana-release.tar.bz2
 | 
			
		||||
 | 
			
		||||
if [[ -z $DO_NOT_PUBLISH_TAR ]]; then
 | 
			
		||||
  echo --- AWS S3 Store
 | 
			
		||||
 
 | 
			
		||||
@@ -64,8 +64,8 @@ fi
 | 
			
		||||
echo --- build: $CHANNEL channel
 | 
			
		||||
snapcraft
 | 
			
		||||
 | 
			
		||||
source ci/upload_ci_artifact.sh
 | 
			
		||||
upload_ci_artifact solana_*.snap
 | 
			
		||||
source ci/upload-ci-artifact.sh
 | 
			
		||||
upload-ci-artifact solana_*.snap
 | 
			
		||||
 | 
			
		||||
if [[ -z $DO_NOT_PUBLISH_SNAP ]]; then
 | 
			
		||||
  echo --- publish: $CHANNEL channel
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@ set -e
 | 
			
		||||
cd "$(dirname "$0")/.."
 | 
			
		||||
 | 
			
		||||
# shellcheck disable=SC1091
 | 
			
		||||
source ci/upload_ci_artifact.sh
 | 
			
		||||
source ci/upload-ci-artifact.sh
 | 
			
		||||
 | 
			
		||||
eval "$(ci/channel-info.sh)"
 | 
			
		||||
 | 
			
		||||
@@ -42,4 +42,4 @@ _ cargo bench --features=unstable --verbose -- -Z unstable-options --format=json
 | 
			
		||||
 | 
			
		||||
_ cargo run --release --package solana-upload-perf -- "$BENCH_FILE" "$TARGET_BRANCH" "$UPLOAD_METRICS" > "$BENCH_ARTIFACT"
 | 
			
		||||
 | 
			
		||||
upload_ci_artifact "$BENCH_ARTIFACT"
 | 
			
		||||
upload-ci-artifact "$BENCH_ARTIFACT"
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
set -e
 | 
			
		||||
 | 
			
		||||
cd "$(dirname "$0")/.."
 | 
			
		||||
source ci/upload_ci_artifact.sh
 | 
			
		||||
source ci/upload-ci-artifact.sh
 | 
			
		||||
 | 
			
		||||
ci/version-check.sh nightly
 | 
			
		||||
export RUST_BACKTRACE=1
 | 
			
		||||
@@ -46,17 +46,17 @@ _ genhtml -o target/cov/report-lcov --show-details --highlight --ignore-errors s
 | 
			
		||||
 | 
			
		||||
# Upload to tarballs to buildkite.
 | 
			
		||||
_ cd target/cov && tar -cjf cov-report.tar.bz2 report/* && cd -
 | 
			
		||||
_ upload_ci_artifact "target/cov/cov-report.tar.bz2"
 | 
			
		||||
_ upload-ci-artifact "target/cov/cov-report.tar.bz2"
 | 
			
		||||
 | 
			
		||||
_ cd target/cov && tar -cjf lcov-report.tar.bz2 report-lcov/* && cd -
 | 
			
		||||
_ upload_ci_artifact "target/cov/lcov-report.tar.bz2"
 | 
			
		||||
_ upload-ci-artifact "target/cov/lcov-report.tar.bz2"
 | 
			
		||||
 | 
			
		||||
# Upload coverage files to buildkite for grcov debugging
 | 
			
		||||
_ cd target/cov/build && tar -cjf cov-gcda.tar.bz2 gcda/* && cd -
 | 
			
		||||
_ upload_ci_artifact "target/cov/build/cov-gcda.tar.bz2"
 | 
			
		||||
_ upload-ci-artifact "target/cov/build/cov-gcda.tar.bz2"
 | 
			
		||||
 | 
			
		||||
_ cd target/cov/build && tar -cjf cov-gcno.tar.bz2 gcno/* && cd -
 | 
			
		||||
_ upload_ci_artifact "target/cov/build/cov-gcno.tar.bz2"
 | 
			
		||||
_ upload-ci-artifact "target/cov/build/cov-gcno.tar.bz2"
 | 
			
		||||
 | 
			
		||||
if [[ -z "$CODECOV_TOKEN" ]]; then
 | 
			
		||||
  echo CODECOV_TOKEN undefined
 | 
			
		||||
 
 | 
			
		||||
@@ -9,7 +9,7 @@ if [[ -z $USE_PREBUILT_CHANNEL_TARBALL ]]; then
 | 
			
		||||
fi
 | 
			
		||||
 | 
			
		||||
# shellcheck disable=SC1091
 | 
			
		||||
source ci/upload_ci_artifact.sh
 | 
			
		||||
source ci/upload-ci-artifact.sh
 | 
			
		||||
 | 
			
		||||
[[ -n $ITERATION_WAIT ]] || ITERATION_WAIT=300
 | 
			
		||||
[[ -n $NUMBER_OF_NODES ]] || NUMBER_OF_NODES="10 25 50 100"
 | 
			
		||||
@@ -76,7 +76,7 @@ launchTestnet() {
 | 
			
		||||
    --data-urlencode "q=$q_mean_tps;$q_max_tps;$q_mean_finality;$q_max_finality;$q_99th_finality" |
 | 
			
		||||
    python ci/testnet-automation-json-parser.py >>TPS"$nodeCount".log
 | 
			
		||||
 | 
			
		||||
  upload_ci_artifact TPS"$nodeCount".log
 | 
			
		||||
  upload-ci-artifact TPS"$nodeCount".log
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
# This is needed, because buildkite doesn't let us define an array of numbers.
 | 
			
		||||
 
 | 
			
		||||
@@ -1,6 +1,6 @@
 | 
			
		||||
# |source| me
 | 
			
		||||
 | 
			
		||||
upload_ci_artifact() {
 | 
			
		||||
upload-ci-artifact() {
 | 
			
		||||
  echo "--- artifact: $1"
 | 
			
		||||
  if [[ -r "$1" ]]; then
 | 
			
		||||
    ls -l "$1"
 | 
			
		||||
		Reference in New Issue
	
	Block a user