Skip to content

Commit d2eb1ec

Browse files
authored
Reenable remote build caching (#244)
## What is the goal of this PR? Speed up builds by utilizing remote caching provided by BuildBuddy. ## What are the changes implemented in this PR? Reenable build caching (without remote execution) on all CI jobs
1 parent a35817b commit d2eb1ec

File tree

2 files changed

+13
-35
lines changed

2 files changed

+13
-35
lines changed

.bazelrc

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,9 @@ test --incompatible_strict_action_env
2323

2424
# what is defined in this section will be applied when bazel is invoked like this: bazel ... --config=rbe ...
2525
build:rbe --project_id=grakn-dev
26-
build:rbe --remote_instance_name=projects/grakn-dev/instances/default_instance
2726
build:rbe --remote_cache=cloud.buildbuddy.io
28-
build:rbe --remote_executor=cloud.buildbuddy.io
2927
build:rbe --bes_backend=cloud.buildbuddy.io
3028
build:rbe --bes_results_url=https://app.buildbuddy.io/invocation/
3129
build:rbe --tls_client_certificate=/opt/credentials/buildbuddy-cert.pem
3230
build:rbe --tls_client_key=/opt/credentials/buildbuddy-key.pem
33-
build:rbe --host_platform=@graknlabs_dependencies//image/rbe:ubuntu-1604
34-
build:rbe --platforms=@graknlabs_dependencies//image/rbe:ubuntu-1604
35-
build:rbe --extra_execution_platforms=@graknlabs_dependencies//image/rbe:ubuntu-1604
36-
build:rbe --host_javabase=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/java:jdk
37-
build:rbe --javabase=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/java:jdk
38-
build:rbe --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
39-
build:rbe --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
40-
build:rbe --extra_toolchains=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/config:cc-toolchain
41-
build:rbe --crosstool_top=@bazel_toolchains//configs/ubuntu16_04_clang/11.0.0/bazel_3.0.0/cc:toolchain
42-
build:rbe --jobs=50
4331
build:rbe --remote_timeout=3600
44-
build:rbe --bes_timeout=600s
45-
build:rbe --spawn_strategy=remote
46-
build:rbe --strategy=Javac=remote
47-
build:rbe --strategy=Closure=remote
48-
build:rbe --genrule_strategy=remote
49-
build:rbe --define=EXECUTOR=remote
50-
build:rbe --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
51-
build:rbe --experimental_strict_action_env=true

.grabl/automation.yml

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,36 +50,34 @@ build:
5050
export ARTIFACT_USERNAME=$REPO_GRAKN_USERNAME
5151
export ARTIFACT_PASSWORD=$REPO_GRAKN_PASSWORD
5252
bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
53-
bazel build //...
54-
bazel run @graknlabs_dependencies//tool/checkstyle:test-coverage
55-
bazel test $(bazel query 'kind(checkstyle_test, //...)') --test_output=errors
53+
bazel build --config=rbe //...
54+
bazel run --config=rbe @graknlabs_dependencies//tool/checkstyle:test-coverage
55+
bazel test --config=rbe $(bazel query 'kind(checkstyle_test, //...)') --test_output=errors
5656
build-dependency:
5757
image: graknlabs-ubuntu-20.04
5858
command: |
5959
dependencies/maven/update.sh
6060
git diff --exit-code dependencies/maven/artifacts.snapshot
61-
bazel run @graknlabs_dependencies//tool/unuseddeps:unused-deps -- list
61+
bazel run --config=rbe @graknlabs_dependencies//tool/unuseddeps:unused-deps -- list
6262
test-integration:
6363
image: graknlabs-ubuntu-20.04
6464
command: |
6565
export ARTIFACT_USERNAME=$REPO_GRAKN_USERNAME
6666
export ARTIFACT_PASSWORD=$REPO_GRAKN_PASSWORD
6767
bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
68-
bazel test //test/integration/... --test_output=streamed
69-
# TODO: use --config=rbe once Grakn Core runs in RBE
68+
bazel test --config=rbe //test/integration/... --test_output=streamed
7069
test-behaviour:
7170
image: graknlabs-ubuntu-20.04
7271
command: |
7372
export ARTIFACT_USERNAME=$REPO_GRAKN_USERNAME
7473
export ARTIFACT_PASSWORD=$REPO_GRAKN_PASSWORD
7574
bazel run @graknlabs_dependencies//distribution/artifact:create-netrc
76-
bazel test //test/behaviour/connection/... --test_output=streamed --jobs=1
77-
bazel test //test/behaviour/concept/... --test_output=streamed
78-
bazel test //test/behaviour/graql/language/match/... --test_output=streamed
79-
bazel test //test/behaviour/graql/language/get/... --test_output=streamed
80-
bazel test //test/behaviour/graql/language/define/... --test_output=streamed
75+
bazel test --config=rbe //test/behaviour/connection/... --test_output=streamed --jobs=1
76+
bazel test --config=rbe //test/behaviour/concept/... --test_output=streamed
77+
bazel test --config=rbe //test/behaviour/graql/language/match/... --test_output=streamed
78+
bazel test --config=rbe //test/behaviour/graql/language/get/... --test_output=streamed
79+
bazel test --config=rbe //test/behaviour/graql/language/define/... --test_output=streamed
8180
# TODO: delete --jobs=1 if we fix the issue with excess memory usage
82-
# TODO: use --config=rbe once Grakn Core runs in RBE
8381
# TODO: add more Graql Language tests as they are fixed
8482
deploy-maven-snapshot:
8583
image: graknlabs-ubuntu-20.04
@@ -90,7 +88,7 @@ build:
9088
command: |
9189
export DEPLOY_MAVEN_USERNAME=$REPO_GRAKN_USERNAME
9290
export DEPLOY_MAVEN_PASSWORD=$REPO_GRAKN_PASSWORD
93-
bazel run --define version=$(git rev-parse HEAD) //:deploy-maven -- snapshot
91+
bazel run --config=rbe --define version=$(git rev-parse HEAD) //:deploy-maven -- snapshot
9492
test-deployment-maven:
9593
image: graknlabs-ubuntu-20.04
9694
dependencies: [deploy-maven-snapshot]
@@ -123,11 +121,11 @@ release:
123121
export RELEASE_NOTES_TOKEN=$REPO_GITHUB_TOKEN
124122
bazel run @graknlabs_dependencies//tool/release:create-notes -- client-java $(cat VERSION) ./RELEASE_TEMPLATE.md
125123
export DEPLOY_GITHUB_TOKEN=$REPO_GITHUB_TOKEN
126-
bazel run --define version=$(cat VERSION) //:deploy-github -- $GRABL_COMMIT
124+
bazel run --config=rbe --define version=$(cat VERSION) //:deploy-github -- $GRABL_COMMIT
127125
deploy-maven-release:
128126
image: graknlabs-ubuntu-20.04
129127
dependencies: [deploy-github]
130128
command: |
131129
export DEPLOY_MAVEN_USERNAME=$REPO_GRAKN_USERNAME
132130
export DEPLOY_MAVEN_PASSWORD=$REPO_GRAKN_PASSWORD
133-
bazel run --define version=$(cat VERSION) //:deploy-maven -- release
131+
bazel run --config=rbe --define version=$(cat VERSION) //:deploy-maven -- release

0 commit comments

Comments
 (0)