Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(IDX): inline --config=ci in main.sh #3960

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows-source/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: test --config=ci ${{ env.BAZEL_EXTRA_ARGS }}
BAZEL_COMMAND: test ${{ env.BAZEL_EXTRA_ARGS }}
BAZEL_TARGETS: //...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -169,7 +169,7 @@ jobs:
CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }}
with:
BAZEL_COMMAND: >-
test --config=ci --config=macos_ci
test --config=macos_ci
--test_tag_filters=test_macos
BAZEL_TARGETS: //rs/... //publish/binaries/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand All @@ -191,7 +191,7 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
build --config=ci --keep_going --config=fuzzing --build_tag_filters=libfuzzer
build --keep_going --config=fuzzing --build_tag_filters=libfuzzer
BAZEL_TARGETS: //rs/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- <<: *bazel-bep
Expand All @@ -205,7 +205,7 @@ jobs:
id: bazel-build-fuzzers-afl
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: build --config=ci --keep_going --config=afl
BAZEL_COMMAND: build --keep_going --config=afl
BAZEL_TARGETS: //rs/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- <<: *bazel-bep
Expand Down Expand Up @@ -257,7 +257,7 @@ jobs:
"$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh
rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}"
env:
BAZEL_COMMAND: build --config=ci
BAZEL_COMMAND: build
BAZEL_TARGETS: //...
MERGE_BASE_SHA: ${{ github.event.pull_request.base.sha }}
BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows-source/release-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_nightly
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_nightly
BAZEL_TARGETS: //rs/tests/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand All @@ -93,8 +92,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_staging
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_staging
BAZEL_TARGETS: //rs/tests/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand All @@ -111,8 +109,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_hotfix
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_hotfix
BAZEL_TARGETS: //rs/tests/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -185,7 +182,7 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: |
test --config=ci --config=systest --keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }}
test --config=systest --keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }}
BAZEL_TARGETS: "//rs/tests/dre:guest_os_qualification"
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down
15 changes: 5 additions & 10 deletions .github/workflows-source/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ jobs:

# Run bare metal installation test
# shellcheck disable=SC2046,SC2086
bazel --output_base=/var/tmp/bazel-output run ${BAZEL_CI_CONFIG} \
bazel --output_base=/var/tmp/bazel-output run --config=ci \
//ic-os/setupos/envs/dev:launch_bare_metal -- \
--config_path "$(realpath ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
--csv_filename "$(realpath file1)" \
Expand All @@ -84,7 +84,7 @@ jobs:

# Run bare metal node performance benchmarks
# shellcheck disable=SC2046,SC2086
bazel --output_base=/var/tmp/bazel-output run ${BAZEL_CI_CONFIG} \
bazel --output_base=/var/tmp/bazel-output run --config=ci \
//ic-os/setupos/envs/dev:launch_bare_metal -- \
--config_path "$(realpath ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
--csv_filename "$(realpath file1)" \
Expand All @@ -95,7 +95,6 @@ jobs:
--benchmark
bazel clean
env:
BAZEL_CI_CONFIG: "--config=ci"
ZH2_DLL01_CSV_SECRETS: "${{ secrets.ZH2_DLL01_CSV_SECRETS }}"
ZH2_FILE_SHARE_KEY: "${{ secrets.ZH2_FILE_SHARE_KEY }}"

Expand All @@ -111,8 +110,7 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test
--config=ci --keep_going
test --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 }}
Expand All @@ -132,8 +130,7 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test
--config=ci --keep_going
test --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 }}
Expand All @@ -159,9 +156,7 @@ jobs:
with:
# note: there's just one performance cluster, so the job can't be parallelized
BAZEL_COMMAND: >-
test
--config=ci
--test_tag_filters=system_test_benchmark --//bazel:enable_upload_perf_systest_results=True --keep_going --jobs 1
test --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 }}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows-source/schedule-hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,10 +62,8 @@ jobs:
env:
CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }}
with:
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 }}
Expand All @@ -84,8 +82,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_hourly
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_hourly
BAZEL_TARGETS: //rs/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/ci-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: test --config=ci ${{ env.BAZEL_EXTRA_ARGS }}
BAZEL_COMMAND: test ${{ env.BAZEL_EXTRA_ARGS }}
BAZEL_TARGETS: //...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -139,7 +139,7 @@ jobs:
CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }}
with:
BAZEL_COMMAND: >-
test --config=ci --config=macos_ci --test_tag_filters=test_macos
test --config=macos_ci --test_tag_filters=test_macos
BAZEL_TARGETS: //rs/... //publish/binaries/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Upload bazel-bep
Expand Down Expand Up @@ -180,7 +180,7 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
build --config=ci --keep_going --config=fuzzing --build_tag_filters=libfuzzer
build --keep_going --config=fuzzing --build_tag_filters=libfuzzer
BAZEL_TARGETS: //rs/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Upload bazel-bep
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
id: bazel-build-fuzzers-afl
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: build --config=ci --keep_going --config=afl
BAZEL_COMMAND: build --keep_going --config=afl
BAZEL_TARGETS: //rs/...
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
- name: Upload bazel-bep
Expand Down Expand Up @@ -297,7 +297,7 @@ jobs:
"$CI_PROJECT_DIR"/ci/scripts/run-build-ic.sh
rm -rf "/cache/job/${CI_JOB_NAME}/${CI_RUN_ID}"
env:
BAZEL_COMMAND: build --config=ci
BAZEL_COMMAND: build
BAZEL_TARGETS: //...
MERGE_BASE_SHA: ${{ github.event.pull_request.base.sha }}
BRANCH_HEAD_SHA: ${{ github.event.pull_request.head.sha }}
Expand Down
11 changes: 4 additions & 7 deletions .github/workflows/release-testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_nightly
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_nightly
BAZEL_TARGETS: //rs/tests/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -87,8 +86,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_staging
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_staging
BAZEL_TARGETS: //rs/tests/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -129,8 +127,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_hotfix
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_hotfix
BAZEL_TARGETS: //rs/tests/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down Expand Up @@ -246,7 +243,7 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: |
test --config=ci --config=systest --keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }}
test --config=systest --keep_going --test_timeout=7200 --test_env=OLD_VERSION=${{ matrix.version }}
BAZEL_TARGETS: "//rs/tests/dre:guest_os_qualification"
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down
17 changes: 5 additions & 12 deletions .github/workflows/schedule-daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:

# Run bare metal installation test
# shellcheck disable=SC2046,SC2086
bazel --output_base=/var/tmp/bazel-output run ${BAZEL_CI_CONFIG} \
bazel --output_base=/var/tmp/bazel-output run --config=ci \
//ic-os/setupos/envs/dev:launch_bare_metal -- \
--config_path "$(realpath ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
--csv_filename "$(realpath file1)" \
Expand All @@ -50,7 +50,7 @@ jobs:

# Run bare metal node performance benchmarks
# shellcheck disable=SC2046,SC2086
bazel --output_base=/var/tmp/bazel-output run ${BAZEL_CI_CONFIG} \
bazel --output_base=/var/tmp/bazel-output run --config=ci \
//ic-os/setupos/envs/dev:launch_bare_metal -- \
--config_path "$(realpath ./ic-os/dev-tools/bare_metal_deployment/zh2-dll01.yaml)" \
--csv_filename "$(realpath file1)" \
Expand All @@ -61,7 +61,6 @@ jobs:
--benchmark
bazel clean
env:
BAZEL_CI_CONFIG: "--config=ci"
ZH2_DLL01_CSV_SECRETS: "${{ secrets.ZH2_DLL01_CSV_SECRETS }}"
ZH2_FILE_SHARE_KEY: "${{ secrets.ZH2_FILE_SHARE_KEY }}"
fi-tests-nightly:
Expand All @@ -87,10 +86,9 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test
test --keep_going


--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 }}
Expand Down Expand Up @@ -132,10 +130,9 @@ jobs:
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test
test --keep_going


--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 }}
Expand Down Expand Up @@ -183,11 +180,7 @@ jobs:
with:
# note: there's just one performance cluster, so the job can't be parallelized
BAZEL_COMMAND: >-
test


--config=ci
--test_tag_filters=system_test_benchmark --//bazel:enable_upload_perf_systest_results=True --keep_going --jobs 1
test --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 }}
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/schedule-hourly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,10 @@ jobs:
env:
CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }}
with:
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 }}
Expand Down Expand Up @@ -77,8 +75,7 @@ jobs:
id: bazel-test-all
uses: ./.github/actions/bazel-test-all/
with:
BAZEL_COMMAND: >-
test --config=ci --keep_going --test_tag_filters=system_test_hourly
BAZEL_COMMAND: test --keep_going --test_tag_filters=system_test_hourly
BAZEL_TARGETS: //rs/...
BUILDEVENT_APIKEY: ${{ secrets.HONEYCOMB_TOKEN }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/schedule-rust-bench.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ jobs:
run: |
./ci/scripts/rust-benchmarks.sh
env:
BAZEL_CI_CONFIG: "--config=ci"
BAZEL_COMMAND: "run"
BAZEL_COMMAND: run
CI_JOB_URL: "${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}"
RUST_BACKTRACE: "full"
TARGETS: ${{ matrix.targets }}
6 changes: 1 addition & 5 deletions .github/workflows/system-tests-k8s.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ jobs:
with:
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 }}
Expand Down Expand Up @@ -154,10 +153,7 @@ jobs:
env:
CLOUD_CREDENTIALS_CONTENT: ${{ secrets.CLOUD_CREDENTIALS_CONTENT }}
with:
BAZEL_COMMAND: >-
test
--config=ci
--local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --k8s --flaky_test_attempts=3
BAZEL_COMMAND: test --local_test_jobs=${{ env.JOBS }} --test_tag_filters=k8s --k8s --flaky_test_attempts=3
BAZEL_TARGETS: ${{ env.TARGETS }}
GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}

Expand Down
1 change: 1 addition & 0 deletions ci/bazel-scripts/main.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ bazel_args=(
--output_base=/var/tmp/bazel-output # Output base wiped after run
${BAZEL_COMMAND}
${BAZEL_TARGETS}
--config=ci # this script is meant to be run on CI, so we default to CI config
--color=yes
--build_metadata=BUILDBUDDY_LINKS="[CI Job](${CI_JOB_URL})"
--ic_version="${CI_COMMIT_SHA}"
Expand Down
Loading