Move move tests into its own job (#6847)

This commit is contained in:
Michael Vines 2019-11-08 20:40:03 -07:00 committed by GitHub
parent 02058ea699
commit 63425bed10
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 12 deletions

View File

@ -7,7 +7,7 @@ steps:
timeout_in_minutes: 5 timeout_in_minutes: 5
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh" - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-checks.sh"
name: "checks" name: "checks"
timeout_in_minutes: 35 timeout_in_minutes: 20
- wait - wait
- command: "ci/test-stable-perf.sh" - command: "ci/test-stable-perf.sh"
name: "stable-perf" name: "stable-perf"
@ -17,18 +17,21 @@ steps:
- "queue=cuda" - "queue=cuda"
- command: "ci/test-bench.sh" - command: "ci/test-bench.sh"
name: "bench" name: "bench"
timeout_in_minutes: 60 timeout_in_minutes: 30
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-stable.sh" - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-stable.sh"
name: "stable" name: "stable"
timeout_in_minutes: 40 timeout_in_minutes: 40
artifact_paths: "log-*.txt" artifact_paths: "log-*.txt"
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-move.sh"
name: "move"
timeout_in_minutes: 20
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-local-cluster.sh" - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_stable_docker_image ci/test-local-cluster.sh"
name: "local-cluster" name: "local-cluster"
timeout_in_minutes: 40 timeout_in_minutes: 30
artifact_paths: "log-*.txt" artifact_paths: "log-*.txt"
- command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-coverage.sh" - command: ". ci/rust-version.sh; ci/docker-run.sh $$rust_nightly_docker_image ci/test-coverage.sh"
name: "coverage" name: "coverage"
timeout_in_minutes: 40 timeout_in_minutes: 30
- wait - wait
- trigger: "solana-secondary" - trigger: "solana-secondary"
branches: "!pull/*" branches: "!pull/*"

1
ci/test-move.sh Symbolic link
View File

@ -0,0 +1 @@
test-stable.sh

View File

@ -28,18 +28,13 @@ rm -rf target/xargo # Issue #3105
# Run the appropriate test based on entrypoint # Run the appropriate test based on entrypoint
testName=$(basename "$0" .sh) testName=$(basename "$0" .sh)
echo "Executing $testName"
case $testName in case $testName in
test-stable) test-stable)
echo "Executing $testName"
_ cargo +"$rust_stable" test --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture _ cargo +"$rust_stable" test --all --exclude solana-local-cluster ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path local_cluster/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture _ cargo +"$rust_stable" test --manifest-path local_cluster/Cargo.toml --features=move ${V:+--verbose} test_bench_tps_local_cluster_move -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/move_loader_api/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/move_loader_program/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/librapay_api/Cargo.toml ${V:+--verbose} -- --nocapture
;; ;;
test-stable-perf) test-stable-perf)
echo "Executing $testName"
ci/affects-files.sh \ ci/affects-files.sh \
.rs$ \ .rs$ \
Cargo.lock$ \ Cargo.lock$ \
@ -54,7 +49,7 @@ test-stable-perf)
^sdk/ \ ^sdk/ \
|| { || {
annotate --style info \ annotate --style info \
"Skipped test-stable-perf as no relevant files were modified" "Skipped $testName as no relevant files were modified"
exit 0 exit 0
} }
@ -83,8 +78,30 @@ test-stable-perf)
_ cargo +"$rust_stable" build --bins ${V:+--verbose} _ cargo +"$rust_stable" build --bins ${V:+--verbose}
_ cargo +"$rust_stable" test --package solana-ledger --package solana-core --lib ${V:+--verbose} -- --nocapture _ cargo +"$rust_stable" test --package solana-ledger --package solana-core --lib ${V:+--verbose} -- --nocapture
;; ;;
test-move)
ci/affects-files.sh \
Cargo.lock$ \
Cargo.toml$ \
^ci/rust-version.sh \
^ci/test-stable.sh \
^ci/test-move.sh \
^programs/move_loader_api \
^programs/move_loader_program \
^programs/librapay_api \
^logger/ \
^runtime/ \
^sdk/ \
|| {
annotate --style info \
"Skipped $testName as no relevant files were modified"
exit 0
}
_ cargo +"$rust_stable" test --manifest-path programs/move_loader_api/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/move_loader_program/Cargo.toml ${V:+--verbose} -- --nocapture
_ cargo +"$rust_stable" test --manifest-path programs/librapay_api/Cargo.toml ${V:+--verbose} -- --nocapture
exit 0
;;
test-local-cluster) test-local-cluster)
echo "Executing $testName"
_ cargo +"$rust_stable" build --release --bins ${V:+--verbose} _ cargo +"$rust_stable" build --release --bins ${V:+--verbose}
_ cargo +"$rust_stable" test --release --package solana-local-cluster ${V:+--verbose} -- --nocapture _ cargo +"$rust_stable" test --release --package solana-local-cluster ${V:+--verbose} -- --nocapture
exit 0 exit 0