Skip to content

Commit 3bf8045

Browse files
mattmoorknative-prow-robot
authored andcommitted
Auto-update dependencies (#2293)
Produced via: `dep ensure -update knative.dev/test-infra knative.dev/pkg` /assign n3wscott
1 parent 5943b28 commit 3bf8045

File tree

4 files changed

+4
-20
lines changed

4 files changed

+4
-20
lines changed

Gopkg.lock

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/knative.dev/test-infra/scripts/README.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,7 @@ tests to be executed, in the right order (i.e., build, then unit, then
6868
integration tests).
6969

7070
Use the flags `--build-tests`, `--unit-tests` and `--integration-tests` to run a
71-
specific set of tests. The flag `--emit-metrics` is used to emit metrics when
72-
running the tests, and is automatically handled by the default action for
73-
integration tests (see above).
71+
specific set of tests.
7472

7573
To run a specific program as a test, use the `--run-test` flag, and provide the
7674
program as the argument. If arguments are required for the program, pass
@@ -167,12 +165,7 @@ This is a helper script for Knative E2E test scripts. To use it:
167165
(or `report_go_test()` if you need a more fine-grained control) and call
168166
`fail_test()` or `success()` if any of them failed. The environment variable
169167
`KO_DOCKER_REPO` and `E2E_PROJECT_ID` will be set according to the test
170-
cluster. You can also use the following boolean (0 is false, 1 is true)
171-
environment variables for the logic:
172-
173-
- `EMIT_METRICS`: true if `--emit-metrics` was passed.
174-
175-
All environment variables above are marked read-only.
168+
cluster.
176169

177170
**Notes:**
178171

vendor/knative.dev/test-infra/scripts/e2e-tests.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,6 @@ function teardown_test_resources() {
8181
function go_test_e2e() {
8282
local test_options=""
8383
local go_options=""
84-
(( EMIT_METRICS )) && test_options="-emitmetrics"
8584
[[ ! " $@" == *" -tags="* ]] && go_options="-tags=e2e"
8685
report_go_test -v -race -count=1 ${go_options} $@ ${test_options}
8786
}
@@ -228,7 +227,6 @@ function create_test_cluster() {
228227
echo "Test script is ${E2E_SCRIPT}"
229228
# Set arguments for this script again
230229
local test_cmd_args="--run-tests"
231-
(( EMIT_METRICS )) && test_cmd_args+=" --emit-metrics"
232230
(( SKIP_KNATIVE_SETUP )) && test_cmd_args+=" --skip-knative-setup"
233231
[[ -n "${GCP_PROJECT}" ]] && test_cmd_args+=" --gcp-project ${GCP_PROJECT}"
234232
[[ -n "${E2E_SCRIPT_CUSTOM_FLAGS[@]}" ]] && test_cmd_args+=" ${E2E_SCRIPT_CUSTOM_FLAGS[@]}"
@@ -419,7 +417,6 @@ function fail_test() {
419417
}
420418

421419
RUN_TESTS=0
422-
EMIT_METRICS=0
423420
SKIP_KNATIVE_SETUP=0
424421
SKIP_ISTIO_ADDON=0
425422
GCP_PROJECT=""
@@ -455,7 +452,6 @@ function initialize() {
455452
# Try parsing flag as a standard one.
456453
case ${parameter} in
457454
--run-tests) RUN_TESTS=1 ;;
458-
--emit-metrics) EMIT_METRICS=1 ;;
459455
--skip-knative-setup) SKIP_KNATIVE_SETUP=1 ;;
460456
--skip-istio-addon) SKIP_ISTIO_ADDON=1 ;;
461457
*)
@@ -486,7 +482,6 @@ function initialize() {
486482
(( SKIP_ISTIO_ADDON )) || GKE_ADDONS="--addons=Istio"
487483

488484
readonly RUN_TESTS
489-
readonly EMIT_METRICS
490485
readonly GCP_PROJECT
491486
readonly IS_BOSKOS
492487
readonly EXTRA_CLUSTER_CREATION_FLAGS

vendor/knative.dev/test-infra/scripts/presubmit-tests.sh

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,6 @@ function run_integration_tests() {
269269
function default_integration_test_runner() {
270270
local options=""
271271
local failed=0
272-
(( EMIT_METRICS )) && options="--emit-metrics"
273272
for e2e_test in $(find test/ -name e2e-*tests.sh); do
274273
echo "Running integration test ${e2e_test}"
275274
if ! ${e2e_test} ${options}; then
@@ -283,7 +282,6 @@ function default_integration_test_runner() {
283282
RUN_BUILD_TESTS=0
284283
RUN_UNIT_TESTS=0
285284
RUN_INTEGRATION_TESTS=0
286-
EMIT_METRICS=0
287285

288286
# Process flags and run tests accordingly.
289287
function main() {
@@ -335,7 +333,6 @@ function main() {
335333
--build-tests) RUN_BUILD_TESTS=1 ;;
336334
--unit-tests) RUN_UNIT_TESTS=1 ;;
337335
--integration-tests) RUN_INTEGRATION_TESTS=1 ;;
338-
--emit-metrics) EMIT_METRICS=1 ;;
339336
--all-tests)
340337
RUN_BUILD_TESTS=1
341338
RUN_UNIT_TESTS=1
@@ -354,7 +351,6 @@ function main() {
354351
readonly RUN_BUILD_TESTS
355352
readonly RUN_UNIT_TESTS
356353
readonly RUN_INTEGRATION_TESTS
357-
readonly EMIT_METRICS
358354
readonly TEST_TO_RUN
359355

360356
cd ${REPO_ROOT_DIR}

0 commit comments

Comments
 (0)