diff --git a/.github/actions/bazel-test-all/action.yaml b/.github/actions/bazel-test-all/action.yaml index edaf5bff286..39053f8e34e 100644 --- a/.github/actions/bazel-test-all/action.yaml +++ b/.github/actions/bazel-test-all/action.yaml @@ -5,14 +5,7 @@ inputs: required: true default: 'test' BAZEL_TARGETS: - required: false - default: '//...' - BAZEL_CI_CONFIG: - required: false - default: '--config=ci' - BAZEL_EXTRA_ARGS: - required: false - default: '' + required: true BUILDEVENT_APIKEY: required: false SSH_PRIVATE_KEY_BACKUP_POD: @@ -72,8 +65,6 @@ runs: env: BAZEL_COMMAND: ${{ inputs.BAZEL_COMMAND }} BAZEL_TARGETS: ${{ inputs.BAZEL_TARGETS }} - BAZEL_CI_CONFIG: ${{ inputs.BAZEL_CI_CONFIG }} - BAZEL_EXTRA_ARGS: ${{ inputs.BAZEL_EXTRA_ARGS }} BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }} BUILDEVENT_APIKEY: ${{ inputs.BUILDEVENT_APIKEY }} CI_EVENT_NAME: ${{ github.event_name }} diff --git a/.github/workflows-source/ci-main.yml b/.github/workflows-source/ci-main.yml index 3016e63a011..3a01cc36d8b 100644 --- a/.github/workflows-source/ci-main.yml +++ b/.github/workflows-source/ci-main.yml @@ -137,11 +137,8 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//..." - BAZEL_CI_CONFIG: "--config=ci" - # check if PR title contains release and set timeout filters accordingly - BAZEL_EXTRA_ARGS: ${{ env.BAZEL_EXTRA_ARGS }} + BAZEL_COMMAND: test --config=ci ${{ env.BAZEL_EXTRA_ARGS }} + BAZEL_TARGETS: //... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -171,10 +168,10 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: - BAZEL_CI_CONFIG: "--config=ci --config macos_ci" - BAZEL_COMMAND: test - BAZEL_EXTRA_ARGS: '--test_tag_filters=test_macos' - BAZEL_TARGETS: "//rs/... //publish/binaries/..." + BAZEL_COMMAND: >- + test --config=ci --config=macos_ci + --test_tag_filters=test_macos + BAZEL_TARGETS: //rs/... //publish/binaries/... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep - name: Purge Bazel Output @@ -193,9 +190,9 @@ jobs: id: bazel-build-fuzzers uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "build" - BAZEL_TARGETS: "//rs/..." - BAZEL_EXTRA_ARGS: "--keep_going --config=fuzzing --build_tag_filters=libfuzzer" + BAZEL_COMMAND: >- + build --config=ci --keep_going --config=fuzzing --build_tag_filters=libfuzzer + BAZEL_TARGETS: //rs/... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -208,9 +205,8 @@ jobs: id: bazel-build-fuzzers-afl uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "build" - BAZEL_TARGETS: "//rs/..." - BAZEL_EXTRA_ARGS: "--keep_going --config=afl" + BAZEL_COMMAND: build --config=ci --keep_going --config=afl + BAZEL_TARGETS: //rs/... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -261,7 +257,8 @@ jobs: "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}" env: - BAZEL_COMMAND: "build" + BAZEL_COMMAND: build --config=ci + BAZEL_TARGETS: //... MERGE_BASE_SHA: ${{ github.event.pull_request.base.sha }} BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }} RUN_ON_DIFF_ONLY: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} diff --git a/.github/workflows-source/release-testing.yml b/.github/workflows-source/release-testing.yml index b6de577d822..5321929e110 100644 --- a/.github/workflows-source/release-testing.yml +++ b/.github/workflows-source/release-testing.yml @@ -76,10 +76,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/tests/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_nightly" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_nightly + BAZEL_TARGETS: //rs/tests/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -94,10 +93,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/tests/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_staging" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_staging + BAZEL_TARGETS: //rs/tests/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -113,10 +111,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/tests/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_hotfix" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_hotfix + BAZEL_TARGETS: //rs/tests/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -187,10 +184,9 @@ jobs: - name: Run qualification for version ${{ matrix.version }} from the tip of the branch uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" + BAZEL_COMMAND: | + test --config=ci --config=systest --keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }} BAZEL_TARGETS: "//rs/tests/dre:guest_os_qualification" - BAZEL_CI_CONFIG: "--config=systest" - BAZEL_EXTRA_ARGS: "--keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }}" BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep diff --git a/.github/workflows-source/schedule-daily.yml b/.github/workflows-source/schedule-daily.yml index 6d04e776fe9..3ff947c469d 100644 --- a/.github/workflows-source/schedule-daily.yml +++ b/.github/workflows-source/schedule-daily.yml @@ -110,10 +110,11 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/ledger_suite/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=fi_tests_nightly --test_env=SSH_AUTH_SOCK --test_timeout=43200" + BAZEL_COMMAND: >- + test + --config=ci --keep_going + --test_tag_filters=fi_tests_nightly --test_env=SSH_AUTH_SOCK --test_timeout=43200 + BAZEL_TARGETS: //rs/ledger_suite/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} SSH_PRIVATE_KEY_BACKUP_POD: ${{ secrets.SSH_PRIVATE_KEY_BACKUP_POD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} @@ -130,10 +131,11 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/nns/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=nns_tests_nightly --test_env=SSH_AUTH_SOCK --test_env=NNS_CANISTER_UPGRADE_SEQUENCE=all" + BAZEL_COMMAND: >- + test + --config=ci --keep_going + --test_tag_filters=nns_tests_nightly --test_env=SSH_AUTH_SOCK --test_env=NNS_CANISTER_UPGRADE_SEQUENCE=all + BAZEL_TARGETS: //rs/nns/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} SSH_PRIVATE_KEY_BACKUP_POD: ${{ secrets.SSH_PRIVATE_KEY_BACKUP_POD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} @@ -155,11 +157,12 @@ jobs: id: bazel-system-test-benchmarks uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: ${{ env.BENCHMARK_TARGETS }} - BAZEL_CI_CONFIG: "--config=ci" # note: there's just one performance cluster, so the job can't be parallelized - BAZEL_EXTRA_ARGS: "--test_tag_filters=system_test_benchmark --//bazel:enable_upload_perf_systest_results=True --keep_going --jobs 1" + BAZEL_COMMAND: >- + test + --config=ci + --test_tag_filters=system_test_benchmark --//bazel:enable_upload_perf_systest_results=True --keep_going --jobs 1 + BAZEL_TARGETS: ${{ env.BENCHMARK_TARGETS }} BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep diff --git a/.github/workflows-source/schedule-hourly.yml b/.github/workflows-source/schedule-hourly.yml index 86d6ae977be..17a7388c614 100644 --- a/.github/workflows-source/schedule-hourly.yml +++ b/.github/workflows-source/schedule-hourly.yml @@ -62,9 +62,12 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_COMMAND: "build" - BAZEL_EXTRA_ARGS: "--repository_cache= --disk_cache= --noremote_accept_cached --remote_instance_name=${CI_COMMIT_SHA} --@rules_rust//rust/settings:pipelined_compilation=True" + BAZEL_CI_CONFIG: "" + BAZEL_COMMAND: >- + build + --config=ci + --repository_cache= --disk_cache= --noremote_accept_cached --remote_instance_name=${CI_COMMIT_SHA} --@rules_rust//rust/settings:pipelined_compilation=True + BAZEL_TARGETS: //... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep @@ -81,10 +84,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_hourly" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_hourly + BAZEL_TARGETS: //rs/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - <<: *bazel-bep diff --git a/.github/workflows/ci-main.yml b/.github/workflows/ci-main.yml index b433ecfb18d..ff7dc3d6525 100644 --- a/.github/workflows/ci-main.yml +++ b/.github/workflows/ci-main.yml @@ -94,11 +94,8 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//..." - BAZEL_CI_CONFIG: "--config=ci" - # check if PR title contains release and set timeout filters accordingly - BAZEL_EXTRA_ARGS: ${{ env.BAZEL_EXTRA_ARGS }} + BAZEL_COMMAND: test --config=ci ${{ env.BAZEL_EXTRA_ARGS }} + BAZEL_TARGETS: //... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep @@ -141,10 +138,9 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: - BAZEL_CI_CONFIG: "--config=ci --config macos_ci" - BAZEL_COMMAND: test - BAZEL_EXTRA_ARGS: '--test_tag_filters=test_macos' - BAZEL_TARGETS: "//rs/... //publish/binaries/..." + BAZEL_COMMAND: >- + test --config=ci --config=macos_ci --test_tag_filters=test_macos + BAZEL_TARGETS: //rs/... //publish/binaries/... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep # runs only if previous step succeeded or failed; @@ -183,9 +179,9 @@ jobs: id: bazel-build-fuzzers uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "build" - BAZEL_TARGETS: "//rs/..." - BAZEL_EXTRA_ARGS: "--keep_going --config=fuzzing --build_tag_filters=libfuzzer" + BAZEL_COMMAND: >- + build --config=ci --keep_going --config=fuzzing --build_tag_filters=libfuzzer + BAZEL_TARGETS: //rs/... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep # runs only if previous step succeeded or failed; @@ -218,9 +214,8 @@ jobs: id: bazel-build-fuzzers-afl uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "build" - BAZEL_TARGETS: "//rs/..." - BAZEL_EXTRA_ARGS: "--keep_going --config=afl" + BAZEL_COMMAND: build --config=ci --keep_going --config=afl + BAZEL_TARGETS: //rs/... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep # runs only if previous step succeeded or failed; @@ -302,7 +297,8 @@ jobs: "$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}" env: - BAZEL_COMMAND: "build" + BAZEL_COMMAND: build --config=ci + BAZEL_TARGETS: //... MERGE_BASE_SHA: ${{ github.event.pull_request.base.sha }} BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }} RUN_ON_DIFF_ONLY: ${{ github.event_name == 'pull_request' && !contains(github.event.pull_request.labels.*.name, 'CI_ALL_BAZEL_TARGETS') }} diff --git a/.github/workflows/release-testing.yml b/.github/workflows/release-testing.yml index b4ce89044fb..1162ae57879 100644 --- a/.github/workflows/release-testing.yml +++ b/.github/workflows/release-testing.yml @@ -45,10 +45,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/tests/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_nightly" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_nightly + BAZEL_TARGETS: //rs/tests/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep @@ -88,10 +87,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/tests/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_staging" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_staging + BAZEL_TARGETS: //rs/tests/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep @@ -131,10 +129,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/tests/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_hotfix" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_hotfix + BAZEL_TARGETS: //rs/tests/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep @@ -248,10 +245,9 @@ jobs: - name: Run qualification for version ${{ matrix.version }} from the tip of the branch uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" + BAZEL_COMMAND: | + test --config=ci --config=systest --keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }} BAZEL_TARGETS: "//rs/tests/dre:guest_os_qualification" - BAZEL_CI_CONFIG: "--config=systest" - BAZEL_EXTRA_ARGS: "--keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }}" BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - # runs only if previous step succeeded or failed; diff --git a/.github/workflows/schedule-daily.yml b/.github/workflows/schedule-daily.yml index 412bb5b016c..21065b8acf3 100644 --- a/.github/workflows/schedule-daily.yml +++ b/.github/workflows/schedule-daily.yml @@ -86,10 +86,13 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/ledger_suite/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=fi_tests_nightly --test_env=SSH_AUTH_SOCK --test_timeout=43200" + BAZEL_COMMAND: >- + test + + + --config=ci --keep_going + --test_tag_filters=fi_tests_nightly --test_env=SSH_AUTH_SOCK --test_timeout=43200 + BAZEL_TARGETS: //rs/ledger_suite/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} SSH_PRIVATE_KEY_BACKUP_POD: ${{ secrets.SSH_PRIVATE_KEY_BACKUP_POD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} @@ -128,10 +131,13 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/nns/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=nns_tests_nightly --test_env=SSH_AUTH_SOCK --test_env=NNS_CANISTER_UPGRADE_SEQUENCE=all" + BAZEL_COMMAND: >- + test + + + --config=ci --keep_going + --test_tag_filters=nns_tests_nightly --test_env=SSH_AUTH_SOCK --test_env=NNS_CANISTER_UPGRADE_SEQUENCE=all + BAZEL_TARGETS: //rs/nns/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} SSH_PRIVATE_KEY_BACKUP_POD: ${{ secrets.SSH_PRIVATE_KEY_BACKUP_POD }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} @@ -175,11 +181,14 @@ jobs: id: bazel-system-test-benchmarks uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: ${{ env.BENCHMARK_TARGETS }} - BAZEL_CI_CONFIG: "--config=ci" # note: there's just one performance cluster, so the job can't be parallelized - BAZEL_EXTRA_ARGS: "--test_tag_filters=system_test_benchmark --//bazel:enable_upload_perf_systest_results=True --keep_going --jobs 1" + BAZEL_COMMAND: >- + test + + + --config=ci + --test_tag_filters=system_test_benchmark --//bazel:enable_upload_perf_systest_results=True --keep_going --jobs 1 + BAZEL_TARGETS: ${{ env.BENCHMARK_TARGETS }} BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep diff --git a/.github/workflows/schedule-hourly.yml b/.github/workflows/schedule-hourly.yml index 4de08170e28..edd483b7ba6 100644 --- a/.github/workflows/schedule-hourly.yml +++ b/.github/workflows/schedule-hourly.yml @@ -33,9 +33,14 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_COMMAND: "build" - BAZEL_EXTRA_ARGS: "--repository_cache= --disk_cache= --noremote_accept_cached --remote_instance_name=${CI_COMMIT_SHA} --@rules_rust//rust/settings:pipelined_compilation=True" + BAZEL_CI_CONFIG: "" + BAZEL_COMMAND: >- + build + + + --config=ci + --repository_cache= --disk_cache= --noremote_accept_cached --remote_instance_name=${CI_COMMIT_SHA} --@rules_rust//rust/settings:pipelined_compilation=True + BAZEL_TARGETS: //... GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep # runs only if previous step succeeded or failed; @@ -72,10 +77,9 @@ jobs: id: bazel-test-all uses: ./.github/actions/bazel-test-all/ with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "//rs/..." - BAZEL_CI_CONFIG: "--config=ci" - BAZEL_EXTRA_ARGS: "--keep_going --test_tag_filters=system_test_hourly" + BAZEL_COMMAND: >- + test --config=ci --keep_going --test_tag_filters=system_test_hourly + BAZEL_TARGETS: //rs/... BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep diff --git a/.github/workflows/system-tests-k8s.yml b/.github/workflows/system-tests-k8s.yml index f508ac4aa87..00d2be94eee 100644 --- a/.github/workflows/system-tests-k8s.yml +++ b/.github/workflows/system-tests-k8s.yml @@ -80,10 +80,11 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "${{ env.TARGETS }}" - BAZEL_CI_CONFIG: "--config=ci --repository_cache=/cache/bazel" - BAZEL_EXTRA_ARGS: "--local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s,-manual,-colocated,-long_test,-system_test_hourly,-system_test_nightly --k8s" + BAZEL_COMMAND: >- + test + --config=ci + --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s,-manual,-colocated,-long_test,-system_test_hourly,-system_test_nightly --k8s + BAZEL_TARGETS: ${{ env.TARGETS }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep @@ -151,10 +152,11 @@ jobs: env: CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }} with: - BAZEL_COMMAND: "test" - BAZEL_TARGETS: "${{ env.TARGETS }}" - BAZEL_CI_CONFIG: "--config=ci --repository_cache=/cache/bazel" - BAZEL_EXTRA_ARGS: "--local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --k8s --flaky_test_attempts=3" + BAZEL_COMMAND: >- + test + --config=ci + --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --k8s --flaky_test_attempts=3 + BAZEL_TARGETS: ${{ env.TARGETS }} GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }} - name: Upload bazel-bep diff --git a/ci/bazel-scripts/diff.sh b/ci/bazel-scripts/diff.sh index 7f3d16aec38..a6395d07a9d 100755 --- a/ci/bazel-scripts/diff.sh +++ b/ci/bazel-scripts/diff.sh @@ -55,9 +55,9 @@ if [ ${#files[@]} -eq 0 ]; then exit 0 fi -if [ "${BAZEL_COMMAND:-}" == "build" ]; then +if [[ $BAZEL_COMMAND =~ ^build[[:space:]] ]]; then TARGETS=$(bazel query "rdeps(//..., set(${files[*]}))") -elif [ "${BAZEL_COMMAND:-}" == "test" ]; then +elif [[ $BAZEL_COMMAND =~ ^test[[:space:]] ]]; then EXCLUDED_TAGS=(manual $EXCLUDED_TEST_TAGS) EXCLUDED_TAGS=$( IFS='|' @@ -65,7 +65,7 @@ elif [ "${BAZEL_COMMAND:-}" == "test" ]; then ) TARGETS=$(bazel query "kind(test, rdeps(//..., set(${files[*]}))) except attr('tags', '$EXCLUDED_TAGS', //...)") else - echo "Unknown BAZEL_COMMAND: ${BAZEL_COMMAND:-}" >&2 + echo "Cannot infer command from BAZEL_COMMAND: ${BAZEL_COMMAND:-}" >&2 exit 1 fi diff --git a/ci/bazel-scripts/main.sh b/ci/bazel-scripts/main.sh index 7836aa169ac..e1eb460c2b1 100755 --- a/ci/bazel-scripts/main.sh +++ b/ci/bazel-scripts/main.sh @@ -91,15 +91,13 @@ stream_awk_program=' bazel_args=( --output_base=/var/tmp/bazel-output # Output base wiped after run ${BAZEL_COMMAND} + ${BAZEL_TARGETS} --color=yes - ${BAZEL_CI_CONFIG} --build_metadata=BUILDBUDDY_LINKS="[CI Job](${CI_JOB_URL})" --ic_version="${CI_COMMIT_SHA}" --ic_version_rc_only="${ic_version_rc_only}" --release_build="${release_build}" --s3_upload="${s3_upload:-"False"}" - ${BAZEL_EXTRA_ARGS:-} - ${BAZEL_TARGETS} ) # Unless explicitly provided, we set a default --repository_cache to a volume mounted inside our runners