From 1eaa739aad028f0a99d19cd731e360efacd6f97a Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Fri, 25 Jun 2021 15:29:50 -0600 Subject: [PATCH 1/4] WIP: Run only local-cluster CI --- ci/buildkite-pipeline.sh | 164 +++++++++++++++++++-------------------- 1 file changed, 82 insertions(+), 82 deletions(-) diff --git a/ci/buildkite-pipeline.sh b/ci/buildkite-pipeline.sh index c92426f28af5ce..ae8886613759c1 100755 --- a/ci/buildkite-pipeline.sh +++ b/ci/buildkite-pipeline.sh @@ -125,94 +125,94 @@ wait_step() { } all_test_steps() { - command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20 - wait_step + # command_step checks ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-checks.sh" 20 + # wait_step # Coverage... - if affects \ - .rs$ \ - Cargo.lock$ \ - Cargo.toml$ \ - ^ci/rust-version.sh \ - ^ci/test-coverage.sh \ - ^scripts/coverage.sh \ - ; then - command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 30 - wait_step - else - annotate --style info --context test-coverage \ - "Coverage skipped as no .rs files were modified" - fi + # if affects \ + # .rs$ \ + # Cargo.lock$ \ + # Cargo.toml$ \ + # ^ci/rust-version.sh \ + # ^ci/test-coverage.sh \ + # ^scripts/coverage.sh \ + # ; then + # command_step coverage ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_nightly_docker_image ci/test-coverage.sh" 30 + # wait_step + # else + # annotate --style info --context test-coverage \ + # "Coverage skipped as no .rs files were modified" + # fi # Full test suite - command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 60 - wait_step + # command_step stable ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-stable.sh" 60 + # wait_step # Perf test suite - if affects \ - .rs$ \ - Cargo.lock$ \ - Cargo.toml$ \ - ^ci/rust-version.sh \ - ^ci/test-stable-perf.sh \ - ^ci/test-stable.sh \ - ^ci/test-local-cluster.sh \ - ^core/build.rs \ - ^fetch-perf-libs.sh \ - ^programs/ \ - ^sdk/ \ - ; then - cat >> "$output_file" <<"EOF" - - command: "ci/test-stable-perf.sh" - name: "stable-perf" - timeout_in_minutes: 40 - artifact_paths: "log-*.txt" - agents: - - "queue=cuda" -EOF - else - annotate --style info \ - "Stable-perf skipped as no relevant files were modified" - fi - - # Downstream backwards compatibility - if affects \ - .rs$ \ - Cargo.lock$ \ - Cargo.toml$ \ - ^ci/rust-version.sh \ - ^ci/test-stable-perf.sh \ - ^ci/test-stable.sh \ - ^ci/test-local-cluster.sh \ - ^core/build.rs \ - ^fetch-perf-libs.sh \ - ^programs/ \ - ^sdk/ \ - ^scripts/build-downstream-projects.sh \ - ; then - cat >> "$output_file" <<"EOF" - - command: "scripts/build-downstream-projects.sh" - name: "downstream-projects" - timeout_in_minutes: 30 -EOF - else - annotate --style info \ - "downstream-projects skipped as no relevant files were modified" - fi - # Benches... - if affects \ - .rs$ \ - Cargo.lock$ \ - Cargo.toml$ \ - ^ci/rust-version.sh \ - ^ci/test-coverage.sh \ - ^ci/test-bench.sh \ - ; then - command_step bench "ci/test-bench.sh" 30 - else - annotate --style info --context test-bench \ - "Bench skipped as no .rs files were modified" - fi +# if affects \ +# .rs$ \ +# Cargo.lock$ \ +# Cargo.toml$ \ +# ^ci/rust-version.sh \ +# ^ci/test-stable-perf.sh \ +# ^ci/test-stable.sh \ +# ^ci/test-local-cluster.sh \ +# ^core/build.rs \ +# ^fetch-perf-libs.sh \ +# ^programs/ \ +# ^sdk/ \ +# ; then +# cat >> "$output_file" <<"EOF" +# - command: "ci/test-stable-perf.sh" +# name: "stable-perf" +# timeout_in_minutes: 40 +# artifact_paths: "log-*.txt" +# agents: +# - "queue=cuda" +# EOF +# else +# annotate --style info \ +# "Stable-perf skipped as no relevant files were modified" +# fi +# +# # Downstream backwards compatibility +# if affects \ +# .rs$ \ +# Cargo.lock$ \ +# Cargo.toml$ \ +# ^ci/rust-version.sh \ +# ^ci/test-stable-perf.sh \ +# ^ci/test-stable.sh \ +# ^ci/test-local-cluster.sh \ +# ^core/build.rs \ +# ^fetch-perf-libs.sh \ +# ^programs/ \ +# ^sdk/ \ +# ^scripts/build-downstream-projects.sh \ +# ; then +# cat >> "$output_file" <<"EOF" +# - command: "scripts/build-downstream-projects.sh" +# name: "downstream-projects" +# timeout_in_minutes: 30 +# EOF +# else +# annotate --style info \ +# "downstream-projects skipped as no relevant files were modified" +# fi +# # Benches... +# if affects \ +# .rs$ \ +# Cargo.lock$ \ +# Cargo.toml$ \ +# ^ci/rust-version.sh \ +# ^ci/test-coverage.sh \ +# ^ci/test-bench.sh \ +# ; then +# command_step bench "ci/test-bench.sh" 30 +# else +# annotate --style info --context test-bench \ +# "Bench skipped as no .rs files were modified" +# fi command_step "local-cluster" \ ". ci/rust-version.sh; ci/docker-run.sh \$\$rust_stable_docker_image ci/test-local-cluster.sh" \ From 40b5b19ae2b6282fa94518403ee50addf88bcc86 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Fri, 25 Jun 2021 15:31:06 -0600 Subject: [PATCH 2/4] WIP: Add logging --- local-cluster/tests/local_cluster.rs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/local-cluster/tests/local_cluster.rs b/local-cluster/tests/local_cluster.rs index 6e7a241580b410..2b8bdfa41b37d1 100644 --- a/local-cluster/tests/local_cluster.rs +++ b/local-cluster/tests/local_cluster.rs @@ -2563,7 +2563,11 @@ fn do_test_optimistic_confirmation_violation_with_or_without_tower(with_tower: b if votes_on_c_fork.len() >= 4 { break; } + } else { + warn!("last_vote == base_slot"); } + } else { + warn!("last_vote_in_tower.is_none()"); } } assert!(!votes_on_c_fork.is_empty()); From 805e7461ff0d34fbd821cb5a5582f800a3a52235 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 28 Jun 2021 12:06:41 -0600 Subject: [PATCH 3/4] Run only relevant tests --- ci/test-stable.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/test-stable.sh b/ci/test-stable.sh index 60264b5a9205d5..58f01c6efc285f 100755 --- a/ci/test-stable.sh +++ b/ci/test-stable.sh @@ -74,8 +74,8 @@ test-stable-perf) _ "$cargo" stable run --manifest-path poh-bench/Cargo.toml ${V:+--verbose} -- --hashes-per-tick 10 ;; test-local-cluster) - _ "$cargo" stable build --release --bins ${V:+--verbose} - _ "$cargo" stable test --release --package solana-local-cluster ${V:+--verbose} -- --nocapture --test-threads=1 + # _ "$cargo" stable build --release --bins ${V:+--verbose} + _ "$cargo" stable test --release --package solana-local-cluster ${V:+--verbose} optimistic_confirmation -- --nocapture --test-threads=1 exit 0 ;; *) From 59c3e88380dff79beeae32293be0256552249a2d Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Mon, 28 Jun 2021 12:59:28 -0600 Subject: [PATCH 4/4] Skip shellcheck --- ci/buildkite-pipeline.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ci/buildkite-pipeline.sh b/ci/buildkite-pipeline.sh index ae8886613759c1..3abb4f86656bff 100755 --- a/ci/buildkite-pipeline.sh +++ b/ci/buildkite-pipeline.sh @@ -224,10 +224,10 @@ pull_or_push_steps() { wait_step # Check for any .sh file changes - if affects .sh$; then - command_step shellcheck "ci/shellcheck.sh" 5 - wait_step - fi + # if affects .sh$; then + # command_step shellcheck "ci/shellcheck.sh" 5 + # wait_step + # fi # Run the full test suite by default, skipping only if modifications are local # to some particular areas of the tree