Skip to content

Commit

Permalink
Upgrade to new proxy to pick up Envoy cluster warming + Makefile fix (i…
Browse files Browse the repository at this point in the history
…stio#4292)

* Upgrade to new proxy to pick up Envoy cluster warming

* Add dependency on istio.deps

* Workaround grpc cds failure

* Print the md5 of envoy used to start the local process

* pick-up fix for envoy.conf.template

* Re-trigger circleci
  • Loading branch information
andraxylia authored Mar 18, 2018
1 parent 1c763c1 commit 8eb6288
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion istio.deps
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"repoName": "proxy",
"prodBranch": "master",
"file": "",
"lastStableSHA": "80ec4f6c2a672b00e55d34ef9b5d26a42a98da42"
"lastStableSHA": "61f324cee65ef20b2550eee012a1697cee94c6df"
}
]
9 changes: 9 additions & 0 deletions tests/integration/example/integration.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,15 @@ TESTSPATH='tests/integration/example/tests'
TOTAL_FAILURE=0
SUMMARY='Tests Summary'

printf "Envoy date:"
ls -l ${ENVOY_BINARY}

printf "Mixer date:"
ls -l ${MIXER_BINARY}

printf "Envoy hash:"
md5sum ${ENVOY_BINARY}

TESTARG=(-envoy_binary ${ENVOY_BINARY} -envoy_start_script ${START_ENVOY} -mixer_binary ${MIXER_BINARY} -fortio_binary fortio)

go test -v ./tests/integration/example/tests/sample1 ${TESTARG[@]} $@
Expand Down

0 comments on commit 8eb6288

Please sign in to comment.