Skip to content

Commit

Permalink
[ci] fix e2e log level (#546)
Browse files Browse the repository at this point in the history
* fix e2e log level

* add morpheusvm logging
  • Loading branch information
patrick-ogrady authored Oct 12, 2023
1 parent 385c853 commit fe58943
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 8 deletions.
1 change: 1 addition & 0 deletions examples/morpheusvm/scripts/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ echo "running e2e tests"
./tests/e2e/e2e.test \
--ginkgo.v \
--network-runner-log-level verbo \
--avalanchego-log-level ${LOGLEVEL} \
--network-runner-grpc-endpoint="0.0.0.0:12352" \
--network-runner-grpc-gateway-endpoint="0.0.0.0:12353" \
--avalanchego-path=${AVALANCHEGO_PATH} \
Expand Down
19 changes: 15 additions & 4 deletions examples/morpheusvm/tests/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ var (
requestTimeout time.Duration

networkRunnerLogLevel string
avalanchegoLogLevel string
gRPCEp string
gRPCGatewayEp string

Expand Down Expand Up @@ -83,6 +84,13 @@ func init() {
"gRPC server endpoint",
)

flag.StringVar(
&avalanchegoLogLevel,
"avalanchego-log-level",
"info",
"log level for avalanchego",
)

flag.StringVar(
&gRPCEp,
"network-runner-grpc-endpoint",
Expand Down Expand Up @@ -216,9 +224,9 @@ var _ = ginkgo.BeforeSuite(func() {
runner_sdk.WithPluginDir(pluginDir),
// We don't disable PUT gossip here because the E2E test adds multiple
// non-validating nodes (which will fall behind).
runner_sdk.WithGlobalNodeConfig(`{
"log-level":"info",
"log-display-level":"info",
runner_sdk.WithGlobalNodeConfig(fmt.Sprintf(`{
"log-level":"%s",
"log-display-level":"%s",
"proposervm-use-current-height":true,
"throttler-inbound-validator-alloc-size":"10737418240",
"throttler-inbound-at-large-alloc-size":"10737418240",
Expand All @@ -238,7 +246,10 @@ var _ = ginkgo.BeforeSuite(func() {
"http-host":"",
"http-allowed-origins": "*",
"http-allowed-hosts": "*"
}`),
}`,
avalanchegoLogLevel,
avalanchegoLogLevel,
)),
)
cancel()
gomega.Expect(err).Should(gomega.BeNil())
Expand Down
1 change: 1 addition & 0 deletions examples/tokenvm/scripts/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ echo "running e2e tests"
./tests/e2e/e2e.test \
--ginkgo.v \
--network-runner-log-level verbo \
--avalanchego-log-level ${LOGLEVEL} \
--network-runner-grpc-endpoint="0.0.0.0:12352" \
--network-runner-grpc-gateway-endpoint="0.0.0.0:12353" \
--avalanchego-path=${AVALANCHEGO_PATH} \
Expand Down
19 changes: 15 additions & 4 deletions examples/tokenvm/tests/e2e/e2e_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ var (
requestTimeout time.Duration

networkRunnerLogLevel string
avalanchegoLogLevel string
gRPCEp string
gRPCGatewayEp string

Expand Down Expand Up @@ -85,6 +86,13 @@ func init() {
"gRPC server endpoint",
)

flag.StringVar(
&avalanchegoLogLevel,
"avalanchego-log-level",
"info",
"log level for avalanchego",
)

flag.StringVar(
&gRPCEp,
"network-runner-grpc-endpoint",
Expand Down Expand Up @@ -210,9 +218,9 @@ var _ = ginkgo.BeforeSuite(func() {
runner_sdk.WithPluginDir(pluginDir),
// We don't disable PUT gossip here because the E2E test adds multiple
// non-validating nodes (which will fall behind).
runner_sdk.WithGlobalNodeConfig(`{
"log-level":"info",
"log-display-level":"info",
runner_sdk.WithGlobalNodeConfig(fmt.Sprintf(`{
"log-level":"%s",
"log-display-level":"%s",
"proposervm-use-current-height":true,
"throttler-inbound-validator-alloc-size":"10737418240",
"throttler-inbound-at-large-alloc-size":"10737418240",
Expand All @@ -232,7 +240,10 @@ var _ = ginkgo.BeforeSuite(func() {
"http-host":"",
"http-allowed-origins": "*",
"http-allowed-hosts": "*"
}`),
}`,
avalanchegoLogLevel,
avalanchegoLogLevel,
)),
)
cancel()
gomega.Expect(err).Should(gomega.BeNil())
Expand Down

0 comments on commit fe58943

Please sign in to comment.