Skip to content

Commit

Permalink
build(bazel): fix benchmark in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
gregmagolan committed Nov 2, 2018
1 parent 7d2a746 commit b265161
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 6 deletions.
19 changes: 16 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,13 @@ var_5: &setup_bazel_remote_execution
name: "Setup bazel RBE remote execution"
command: openssl aes-256-cbc -d -in .circleci/gcp_token -k "$CI_REPO_NAME" -out /home/circleci/.gcp_credentials && echo "export GOOGLE_APPLICATION_CREDENTIALS=/home/circleci/.gcp_credentials" >> $BASH_ENV && sudo bash -c "cat .circleci/rbe-bazel.rc >> /etc/bazel.bazelrc"

var_6: &setup_bazel_local_execution
run:
name: "Setup bazel local execution"
command: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc

# Settings common to each job
var_6: &job_defaults
var_7: &job_defaults
working_directory: ~/ng
docker:
- image: *default_docker_image
Expand Down Expand Up @@ -87,7 +92,7 @@ jobs:
- *setup_bazel_remote_execution
- run: yarn bazel test //... --build_tag_filters=-ivy-only --test_tag_filters=-ivy-only,-local
# Now run RBE incompatible tests locally.
- run: sudo cp .circleci/bazel.rc /etc/bazel.bazelrc
- *setup_bazel_local_execution
- run: yarn bazel test //... --build_tag_filters=-ivy-only,local --test_tag_filters=-ivy-only,local

# CircleCI will allow us to go back and view/download these artifacts from past builds.
Expand Down Expand Up @@ -118,6 +123,9 @@ jobs:
# Temporary job to test what will happen when we flip the Ivy flag to true
test_ivy_aot:
<<: *job_defaults
docker:
# Needed because the e2e tests depends on Chrome being available
- image: *browsers_docker_image
resource_class: xlarge
steps:
- checkout:
Expand All @@ -127,10 +135,15 @@ jobs:
- *define_env_vars
- *setup_circleci_bazel_config
- *yarn_install
- *setup_bazel_remote_execution

# Setup remote execution and run RBE-compatible tests
- *setup_bazel_remote_execution
- run: yarn test-ivy-aot //...

# Now run RBE incompatible tests locally
- *setup_bazel_local_execution
- run: yarn test-ivy-aot-local //...

test_aio:
<<: *job_defaults
docker:
Expand Down
3 changes: 1 addition & 2 deletions modules/benchmarks/src/largetable/render3/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ protractor_web_test(
on_prepare = ":protractor.on_prepare.js",
server = ":devserver",
tags = [
"fixme-ivy-aot",
"fixme-ivy-jit",
"ivy-only",
"local", # Depends on locally installed chrome
],
deps = [
"//modules/benchmarks/src/largetable:perf_lib",
Expand Down
3 changes: 2 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
"update-webdriver": "webdriver-manager update --gecko false $CHROMEDRIVER_VERSION_ARG",
"check-env": "gulp check-env",
"commitmsg": "node ./scripts/git/commit-msg.js",
"test-ivy-aot": "bazel test --define=compile=aot --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot",
"test-ivy-aot": "bazel test --define=compile=aot --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,-local",
"test-ivy-aot-local": "bazel test --define=compile=aot --build_tag_filters=-no-ivy-aot,-fixme-ivy-aot --test_tag_filters=-no-ivy-aot,-fixme-ivy-aot,local",
"test-fixme-ivy-aot": "bazel test --define=compile=aot --build_tag_filters=-no-ivy-aot --test_tag_filters=-no-ivy-aot",
"bazel": "bazel"
},
Expand Down

0 comments on commit b265161

Please sign in to comment.