Skip to content

Commit 897ba65

Browse files
committed
Merge branch 'istio-commit-1.26.3' into release/v1.34
2 parents 7c7e483 + 4ee84e4 commit 897ba65

File tree

82 files changed

+1237
-1127
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+1237
-1127
lines changed

.bazelrc

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,6 @@ build:coverage --action_env=GCOV=llvm-profdata
246246
build:coverage --copt=-DNDEBUG
247247
# 1.5x original timeout + 300s for trace merger in all categories
248248
build:coverage --test_timeout=390,750,1500,5700
249-
build:coverage --define=dynamic_link_tests=true
250249
build:coverage --define=ENVOY_CONFIG_COVERAGE=1
251250
build:coverage --cxxopt="-DENVOY_CONFIG_COVERAGE=1"
252251
build:coverage --test_env=HEAPCHECK=
@@ -265,13 +264,18 @@ build:coverage --define=no_debug_info=1
265264
# `--no-relax` is required for coverage to not err with `relocation R_X86_64_REX_GOTPCRELX`
266265
build:coverage --linkopt=-Wl,-s,--no-relax
267266
build:coverage --test_env=ENVOY_IP_TEST_VERSIONS=v4only
267+
build:coverage --define=dynamic_link_tests=false
268268

269269
build:test-coverage --test_arg="-l trace"
270270
build:test-coverage --test_arg="--log-path /dev/null"
271271
build:test-coverage --test_tag_filters=-nocoverage,-fuzz_target
272272
build:fuzz-coverage --config=plain-fuzzer
273273
build:fuzz-coverage --run_under=@envoy//bazel/coverage:fuzz_coverage_wrapper.sh
274274
build:fuzz-coverage --test_tag_filters=-nocoverage
275+
# Existing fuzz tests don't need a full WASM runtime and in generally we don't really want to
276+
# fuzz dependencies anyways. On the other hand, disabling WASM reduces the build time and
277+
# resources required to build and run the tests.
278+
build:fuzz-coverage --define=wasm=disabled
275279

276280
build:cache-local --remote_cache=grpc://localhost:9092
277281

.github/config.yml

Lines changed: 0 additions & 202 deletions
Original file line numberDiff line numberDiff line change
@@ -35,66 +35,6 @@ checks:
3535
required: true
3636
on-run:
3737
- build-macos
38-
mobile-android:
39-
name: Mobile/Android
40-
required: true
41-
on-run:
42-
- mobile-android
43-
mobile-android-tests:
44-
name: Mobile/Android tests
45-
required: true
46-
on-run:
47-
- mobile-android-tests
48-
mobile-asan:
49-
name: Mobile/ASAN
50-
required: true
51-
on-run:
52-
- mobile-asan
53-
mobile-cc:
54-
name: Mobile/CC
55-
required: true
56-
on-run:
57-
- mobile-cc
58-
mobile-coverage:
59-
name: Mobile/Coverage
60-
required: true
61-
on-run:
62-
- mobile-coverage
63-
mobile-docs:
64-
name: Mobile/Docs
65-
on-run:
66-
- mobile-docs
67-
mobile-format:
68-
name: Mobile/Format
69-
required: true
70-
on-run:
71-
- mobile-format
72-
mobile-ios:
73-
name: Mobile/iOS
74-
required: true
75-
cache:
76-
on-run:
77-
- mobile-ios
78-
mobile-ios-tests:
79-
name: Mobile/iOS tests
80-
required: true
81-
on-run:
82-
- mobile-ios-tests
83-
mobile-perf:
84-
name: Mobile/Perf
85-
required: true
86-
on-run:
87-
- mobile-perf
88-
mobile-release-validation:
89-
name: Mobile/Release validation
90-
required: true
91-
on-run:
92-
- mobile-release-validation
93-
mobile-tsan:
94-
name: Mobile/TSAN
95-
required: true
96-
on-run:
97-
- mobile-tsan
9838
prechecks:
9939
name: Envoy/Prechecks
10040
on-run:
@@ -173,148 +113,6 @@ run:
173113
check-san:
174114
paths:
175115
- "**/*"
176-
mobile-android:
177-
paths:
178-
- .bazelrc
179-
- .bazelversion
180-
- .github/config.yml
181-
- bazel/external/quiche.BUILD
182-
- bazel/repository_locations.bzl
183-
- mobile/.bazelrc
184-
- mobile/**/*
185-
- source/common/**/*
186-
- tools/code_format/check_format.py
187-
mobile-android-all:
188-
paths:
189-
- .bazelrc
190-
- .bazelversion
191-
- .github/config.yml
192-
- bazel/external/quiche.BUILD
193-
- bazel/repository_locations.bzl
194-
- mobile/.bazelrc
195-
- mobile/**/*
196-
- source/common/**/*
197-
- tools/code_format/check_format.py
198-
push: never
199-
mobile-android-tests:
200-
paths:
201-
- .bazelrc
202-
- .bazelversion
203-
- .github/config.yml
204-
- bazel/external/quiche.BUILD
205-
- bazel/repository_locations.bzl
206-
- mobile/.bazelrc
207-
- mobile/**/*
208-
- tools/code_format/check_format.py
209-
mobile-asan:
210-
paths:
211-
- .bazelrc
212-
- .bazelversion
213-
- .github/config.yml
214-
- bazel/external/quiche.BUILD
215-
- bazel/repository_locations.bzl
216-
- mobile/.bazelrc
217-
- mobile/**/*
218-
- tools/code_format/check_format.py
219-
mobile-cc:
220-
paths:
221-
- .bazelrc
222-
- .bazelversion
223-
- .github/config.yml
224-
- api/**/*
225-
- bazel/external/quiche.BUILD
226-
- bazel/repository_locations.bzl
227-
- envoy/**/*
228-
- mobile/.bazelrc
229-
- mobile/**/*
230-
- source/**/*
231-
- test/config/**/*
232-
- test/integration/*
233-
- test/mocks/**/*
234-
- test/test_common/**/*
235-
mobile-coverage:
236-
paths:
237-
- .bazelrc
238-
- .bazelversion
239-
- .github/config.yml
240-
- bazel/external/quiche.BUILD
241-
- bazel/repository_locations.bzl
242-
- mobile/.bazelrc
243-
- mobile/**/*
244-
- tools/code_format/check_format.py
245-
mobile-format:
246-
paths:
247-
- .bazelrc
248-
- .bazelversion
249-
- .github/config.yml
250-
- bazel/external/quiche.BUILD
251-
- bazel/repository_locations.bzl
252-
- mobile/.bazelrc
253-
- mobile/**/*
254-
- tools/code_format/check_format.py
255-
mobile-ios:
256-
paths:
257-
- .bazelrc
258-
- .bazelversion
259-
- .github/config.yml
260-
- bazel/external/quiche.BUILD
261-
- bazel/repository_locations.bzl
262-
- mobile/.bazelrc
263-
- mobile/**/*
264-
- source/common/**/*
265-
- tools/code_format/check_format.py
266-
mobile-ios-all:
267-
paths:
268-
- .bazelrc
269-
- .bazelversion
270-
- .github/config.yml
271-
- bazel/external/quiche.BUILD
272-
- bazel/repository_locations.bzl
273-
- mobile/.bazelrc
274-
- mobile/**/*
275-
- source/common/**/*
276-
- tools/code_format/check_format.py
277-
push: never
278-
mobile-ios-tests:
279-
paths:
280-
- .bazelrc
281-
- .bazelversion
282-
- .github/config.yml
283-
- bazel/external/quiche.BUILD
284-
- bazel/repository_locations.bzl
285-
- mobile/.bazelrc
286-
- mobile/**/*
287-
- tools/code_format/check_format.py
288-
mobile-perf:
289-
paths:
290-
- .bazelrc
291-
- .bazelversion
292-
- .github/config.yml
293-
- bazel/external/quiche.BUILD
294-
- bazel/repository_locations.bzl
295-
- mobile/.bazelrc
296-
- mobile/**/*
297-
- tools/code_format/check_format.py
298-
mobile-release-validation:
299-
paths:
300-
- .bazelrc
301-
- .bazelversion
302-
- .github/config.yml
303-
- bazel/external/quiche.BUILD
304-
- bazel/repository_locations.bzl
305-
- mobile/.bazelrc
306-
- mobile/**/*
307-
- tools/code_format/check_format.py
308-
mobile-tsan:
309-
paths:
310-
- .bazelrc
311-
- .bazelversion
312-
- .github/config.yml
313-
- bazel/external/quiche.BUILD
314-
- bazel/repository_locations.bzl
315-
- mobile/.bazelrc
316-
- mobile/**/*
317-
- tools/code_format/check_format.py
318116
precheck-deps:
319117
paths:
320118
- .bazelrc

.github/workflows/_publish_verify.yml

Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,52 @@ jobs:
8383
- run: docker images | grep envoy
8484
shell: bash
8585
86+
distroless:
87+
permissions:
88+
contents: read
89+
packages: read
90+
name: ${{ matrix.name || matrix.target }}
91+
uses: ./.github/workflows/_run.yml
92+
with:
93+
bazel-extra: ${{ matrix.bazel-extra || '--config=remote-envoy-engflow' }}
94+
cache-build-image: ${{ matrix.cache-build-image }}
95+
cache-build-image-key-suffix: ${{ matrix.arch == 'arm64' && format('-{0}', matrix.arch) || '' }}
96+
container-command: ${{ matrix.container-command }}
97+
concurrency-suffix: -${{ matrix.arch || 'x64' }}
98+
downloads: ${{ matrix.downloads }}
99+
rbe: ${{ matrix.rbe }}
100+
request: ${{ inputs.request }}
101+
steps-pre: ${{ matrix.steps-pre }}
102+
source: ${{ matrix.source }}
103+
target: ${{ matrix.target }}
104+
trusted: ${{ inputs.trusted }}
105+
strategy:
106+
fail-fast: false
107+
matrix:
108+
include:
109+
- name: distroless
110+
target: verify-distroless
111+
downloads: |
112+
docker: build_images
113+
rbe: false
114+
source: |
115+
export NO_BUILD_SETUP=1
116+
steps-pre: |
117+
- run: |
118+
IMAGES=(
119+
envoy-distroless:distroless-dev)
120+
for image in "${IMAGES[@]}"; do
121+
src_name="$(echo ${image} | cut -d: -f1)"
122+
dest_name="$(echo ${image} | cut -d: -f2)"
123+
src="oci-archive:%{{ runner.temp }}/build_images/${src_name}.tar"
124+
dest="docker-daemon:envoyproxy/envoy:${dest_name}"
125+
echo "Copy image: ${src} ${dest}"
126+
skopeo copy -q "${src}" "${dest}"
127+
done
128+
shell: bash
129+
- run: docker images | grep envoy
130+
shell: bash
131+
86132
distro:
87133
secrets:
88134
gcs-cache-key: ${{ secrets.gcs-cache-key }}

0 commit comments

Comments
 (0)