update (#18)

* update
* workspace
* update
* workspace
* build container
* deps
* update setup_clang_toolchain
* give bazel some room
* update bazel opts
* bazelin'
* try first building
* coverage seems hard
* update

Author: yuval-k

BUILD

@@ -24,7 +24,6 @@ envoy_cc_library(
         "//source/extensions/filters/http/aws_lambda:aws_lambda_filter_config_lib",
         "//source/extensions/filters/http/nats/streaming:nats_streaming_filter_config_lib",
         "//source/extensions/filters/http/transformation:transformation_filter_config_lib",
-        "//source/extensions/filters/network/consul_connect:config",
     ],
 )
 

WORKSPACE

@@ -4,24 +4,14 @@ load("//bazel:repositories.bzl", "envoy_gloo_dependencies")
 
 envoy_gloo_dependencies()
 
+load("@envoy//bazel:api_binding.bzl", "envoy_api_binding")
+envoy_api_binding()
+
 load("@envoy//bazel:api_repositories.bzl", "envoy_api_dependencies")
 envoy_api_dependencies()
 
-load("@envoy//bazel:repositories.bzl", "GO_VERSION", "envoy_dependencies")
-load("@envoy//bazel:cc_configure.bzl", "cc_configure")
-
+load("@envoy//bazel:repositories.bzl", "envoy_dependencies")
 envoy_dependencies()
 
-load("@rules_foreign_cc//:workspace_definitions.bzl", "rules_foreign_cc_dependencies")
-rules_foreign_cc_dependencies()
-
-
-cc_configure()
-
-load("@envoy_api//bazel:repositories.bzl", "api_dependencies")
-api_dependencies()
-
-load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_dependencies")
-go_rules_dependencies()
-go_register_toolchains(go_version = GO_VERSION)
-
+load("@envoy//bazel:dependency_imports.bzl", "envoy_dependency_imports")
+envoy_dependency_imports()

bazel/repository_locations.bzl

@@ -1,6 +1,6 @@
 REPOSITORY_LOCATIONS = dict(
     envoy = dict(
-        commit = "9e3871ade779664ffb0a8f09b11688878253a082",
+        commit = "f2129cbfeff3b206fb5d00bbae06049a4a21383e",
         remote = "https://github.com/envoyproxy/envoy",
     ),
     inja = dict(

ci/do_ci.sh

@@ -17,11 +17,11 @@ fi
 ENVOY_SRCDIR=$PWD
 ENVOY_CIDIR=${ENVOY_SRCDIR}/ci
 # replace bazel cache to be in our volume
+export USER=bazel
 export TEST_TMPDIR=${BUILD_DIR}/tmp
-export USER=root
-
-BAZEL_OPTIONS="--package_path %workspace%:${ENVOY_SRCDIR}"
+export BAZEL="bazel"
 
+export PPROF_PATH=/thirdparty_build/bin/pprof
 [ -z "${NUM_CPUS}" ] && NUM_CPUS=`grep -c ^processor /proc/cpuinfo`
 
 # Create a fake home. Python site libs tries to do getpwuid(3) if we don't and the CI
@@ -32,30 +32,58 @@ mkdir -p "${FAKE_HOME}"
 export HOME="${FAKE_HOME}"
 export PYTHONUSERBASE="${FAKE_HOME}"
 
-export BAZEL_BUILD_OPTIONS="--strategy=Genrule=standalone --genrule_strategy=standalone \
-  --spawn_strategy=standalone \
-  --verbose_failures ${BAZEL_OPTIONS} --action_env=HOME --action_env=PYTHONUSERBASE \
-  --jobs=${NUM_CPUS} --show_task_finish ${BAZEL_BUILD_EXTRA_OPTIONS}"
-
-export BAZEL_TEST_OPTIONS="${BAZEL_BUILD_OPTIONS} --test_env=HOME --test_env=PYTHONUSERBASE \
-  --test_env=UBSAN_OPTIONS=print_stacktrace=1 \
-  --cache_test_results=no --test_output=all ${BAZEL_EXTRA_TEST_OPTIONS}"
+if [[ -f "/etc/redhat-release" ]]
+then
+  export BAZEL_BUILD_EXTRA_OPTIONS="--copt=-DENVOY_IGNORE_GLIBCXX_USE_CXX11_ABI_ERROR=1 --action_env=PATH ${BAZEL_BUILD_EXTRA_OPTIONS}"
+else
+  export BAZEL_BUILD_EXTRA_OPTIONS="--action_env=PATH=/bin:/usr/bin:/usr/lib/llvm-8/bin --linkopt=-fuse-ld=lld ${BAZEL_BUILD_EXTRA_OPTIONS}"
+fi
 
 # added by yuval-k for the integration tests to run on google cloud build
-export BAZEL_TEST_OPTIONS="${BAZEL_TEST_OPTIONS} --test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=errors"
+export BAZEL_EXTRA_TEST_OPTIONS="--test_env=ENVOY_IP_TEST_VERSIONS=v4only --test_output=errors"
+
+export BAZEL_QUERY_OPTIONS="${BAZEL_OPTIONS}"
+export BAZEL_BUILD_OPTIONS="--verbose_failures ${BAZEL_OPTIONS} --action_env=HOME --action_env=PYTHONUSERBASE \
+  --local_cpu_resources=${NUM_CPUS} --show_task_finish --experimental_generate_json_trace_profile \
+  --test_env=HOME --test_env=PYTHONUSERBASE --cache_test_results=no --test_output=all \
+  ${BAZEL_BUILD_EXTRA_OPTIONS} ${BAZEL_EXTRA_TEST_OPTIONS}"
 
 function setup_gcc_toolchain() {
-  export CC=gcc
-  export CXX=g++
-  echo "$CC/$CXX toolchain configured"
+  if [[ -z "${ENVOY_RBE}" ]]; then
+    export CC=gcc
+    export CXX=g++
+    export BAZEL_COMPILER=gcc
+    echo "$CC/$CXX toolchain configured"
+  else
+    export BAZEL_BUILD_OPTIONS="--config=rbe-toolchain-gcc ${BAZEL_BUILD_OPTIONS}"
+  fi
 }
 
 function setup_clang_toolchain() {
-  export PATH=/usr/lib/llvm-8/bin:$PATH
-  export CC=clang
-  export CXX=clang++
-  export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer
-  echo "$CC/$CXX toolchain configured"
+  if [[ -z "${ENVOY_RBE}" ]]; then
+    export PATH=/usr/lib/llvm-8/bin:$PATH
+    export CC=clang
+    export CXX=clang++
+    export BAZEL_COMPILER=clang
+    export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer
+    echo "$CC/$CXX toolchain configured"
+  else
+    export BAZEL_BUILD_OPTIONS="--config=rbe-toolchain-clang ${BAZEL_BUILD_OPTIONS}"
+  fi
+}
+
+function setup_clang_libcxx_toolchain() {
+  if [[ -z "${ENVOY_RBE}" ]]; then
+    export PATH=/usr/lib/llvm-8/bin:$PATH
+    export CC=clang
+    export CXX=clang++
+    export BAZEL_COMPILER=clang
+    export ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-8/bin/llvm-symbolizer
+    export BAZEL_BUILD_OPTIONS="--config=libc++ ${BAZEL_BUILD_OPTIONS}"
+    echo "$CC/$CXX toolchain with libc++ configured"
+  else
+    export BAZEL_BUILD_OPTIONS="--config=rbe-toolchain-clang-libc++ ${BAZEL_BUILD_OPTIONS}"
+  fi
 }
 
 function cleanup() {
@@ -79,7 +107,9 @@ case "$1" in
     ${ENVOY_SRCDIR}test/run_envoy_bazel_coverage.sh
     ;;
 "test")
-    bazel test ${BAZEL_TEST_OPTIONS} -c opt //test/...
+     bazel test ${BAZEL_BUILD_OPTIONS} -c opt //test/extensions/...
+#    bazel build ${BAZEL_BUILD_OPTIONS} -c opt //test/...
+#    bazel test ${BAZEL_BUILD_OPTIONS} -c opt //test/...
     ;;
 "build")
     bazel build ${BAZEL_BUILD_OPTIONS} -c opt :envoy

cloudbuild.yaml

@@ -1,5 +1,5 @@
 steps:
-- name: 'envoyproxy/envoy-build:cfc514546bc0284536893cca5fa43d7128edcd35'
+- name: 'envoyproxy/envoy-build:cd8574de783791b3353579b489222bfda74888da'
   args: ['ci/do_ci.sh', 'test']
   volumes:
   - name: 'vol-build'
@@ -8,7 +8,7 @@ steps:
   - 'COMMIT_SHA=$COMMIT_SHA'
   timeout: 900s
 
-- name: 'envoyproxy/envoy-build:cfc514546bc0284536893cca5fa43d7128edcd35'
+- name: 'envoyproxy/envoy-build:cd8574de783791b3353579b489222bfda74888da'
   args: ['ci/do_ci.sh', 'build']
   volumes:
   - name: 'vol-build'