Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
nebula
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
exchain
nebula
Commits
8f516faf
Unverified
Commit
8f516faf
authored
Apr 05, 2024
by
Joshua Gutow
Committed by
GitHub
Apr 06, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
CI: Less verbose output (#10059)
parent
56e23b84
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
28 additions
and
8 deletions
+28
-8
config.yml
.circleci/config.yml
+13
-7
Makefile
op-e2e/Makefile
+2
-1
parse_json_test_output.sh
ops/scripts/parse_json_test_output.sh
+13
-0
No files found.
.circleci/config.yml
View file @
8f516faf
...
@@ -136,8 +136,8 @@ jobs:
...
@@ -136,8 +136,8 @@ jobs:
name
:
Cannon Go tests
name
:
Cannon Go tests
command
:
|
command
:
|
mkdir -p /testlogs
mkdir -p /testlogs
gotestsum --format=
standard-quiet --junitfile=/tmp/test-results/cannon.xml
\
gotestsum --format=
testname --junitfile=/tmp/test-results/cannon.xml --jsonfile=/testlogs/log.json
\
-- -parallel=2 -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
2>&1 | tee /testlogs/test.log
-- -parallel=2 -coverpkg=github.com/ethereum-optimism/optimism/cannon/... -coverprofile=coverage.out ./...
working_directory
:
cannon
working_directory
:
cannon
-
run
:
-
run
:
name
:
upload Cannon coverage
name
:
upload Cannon coverage
...
@@ -146,7 +146,7 @@ jobs:
...
@@ -146,7 +146,7 @@ jobs:
path
:
/tmp/test-results
path
:
/tmp/test-results
-
store_artifacts
:
-
store_artifacts
:
path
:
/testlogs
path
:
/testlogs
when
:
on_fail
when
:
always
cannon-build-test-vectors
:
cannon-build-test-vectors
:
docker
:
docker
:
-
image
:
<<pipeline.parameters.ci_builder_image>>
-
image
:
<<pipeline.parameters.ci_builder_image>>
...
@@ -851,11 +851,11 @@ jobs:
...
@@ -851,11 +851,11 @@ jobs:
-
golang-build-cache-
-
golang-build-cache-
-
run
:
-
run
:
name
:
prep results dir
name
:
prep results dir
command
:
mkdir -p /tmp/test-results
command
:
mkdir -p /tmp/test-results
&& mkdir -p /testlogs
-
run
:
-
run
:
name
:
run tests
name
:
run tests
command
:
|
command
:
|
gotestsum --format=
standard-verbose --junitfile=/tmp/test-results/<<parameters.module>>.xml
\
gotestsum --format=
testname --junitfile=/tmp/test-results/<<parameters.module>>.xml --jsonfile=/testlogs/log.json
\
-- -parallel=8 -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out ./...
-- -parallel=8 -coverpkg=github.com/ethereum-optimism/optimism/... -coverprofile=coverage.out ./...
working_directory
:
<<parameters.module>>
working_directory
:
<<parameters.module>>
-
save_cache
:
-
save_cache
:
...
@@ -868,6 +868,9 @@ jobs:
...
@@ -868,6 +868,9 @@ jobs:
#command: codecov --verbose --clean --flags bedrock-go-tests
#command: codecov --verbose --clean --flags bedrock-go-tests
-
store_test_results
:
-
store_test_results
:
path
:
/tmp/test-results
path
:
/tmp/test-results
-
store_artifacts
:
path
:
/testlogs
when
:
always
go-e2e-test
:
go-e2e-test
:
parameters
:
parameters
:
...
@@ -954,7 +957,7 @@ jobs:
...
@@ -954,7 +957,7 @@ jobs:
export OP_E2E_CANNON_ENABLED="false"
export OP_E2E_CANNON_ENABLED="false"
# Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
# Note: We don't use circle CI test splits because we need to split by test name, not by package. There is an additional
# constraint that gotestsum does not currently (nor likely will) accept files from different pacakges when building.
# constraint that gotestsum does not currently (nor likely will) accept files from different pacakges when building.
JUNIT_FILE=/tmp/test-results/<<parameters.module>>_<<parameters.target>>.xml
make <<parameters.target>> 2>&1 | tee /testlogs/test.log
JUNIT_FILE=/tmp/test-results/<<parameters.module>>_<<parameters.target>>.xml
JSON_LOG_FILE=/testlogs/test.log make <<parameters.target>>
working_directory
:
<<parameters.module>>
working_directory
:
<<parameters.module>>
-
store_artifacts
:
-
store_artifacts
:
path
:
/testlogs
path
:
/testlogs
...
@@ -998,10 +1001,13 @@ jobs:
...
@@ -998,10 +1001,13 @@ jobs:
name
:
Test
name
:
Test
command
:
|
command
:
|
mkdir -p /test-results
mkdir -p /test-results
gotestsum --format=
standard-verbose --junitfile /test-results/tests.xml
-- -parallel=2
gotestsum --format=
testname --junitfile /test-results/tests.xml --jsonfile /test-results/log.json
-- -parallel=2
working_directory
:
<<parameters.working_directory>>
working_directory
:
<<parameters.working_directory>>
-
store_test_results
:
-
store_test_results
:
path
:
/test-results
path
:
/test-results
-
store_artifacts
:
path
:
/testlogs
when
:
always
-
when
:
-
when
:
condition
:
condition
:
equal
:
[
true
,
<<parameters.build>>
]
equal
:
[
true
,
<<parameters.build>>
]
...
...
op-e2e/Makefile
View file @
8f516faf
# Generally, JUNIT_FILE is set in CI but may be specified to an arbitrary file location to emulate CI locally
# Generally, JUNIT_FILE is set in CI but may be specified to an arbitrary file location to emulate CI locally
# If JUNIT_FILE is set, JSON_LOG_FILE should also be set
ifdef
JUNIT_FILE
ifdef
JUNIT_FILE
go_test
=
OP_TESTLOG_DISABLE_COLOR
=
true
OP_E2E_DISABLE_PARALLEL
=
false
gotestsum
--format
=
standard-verbose
--junitfile
=
$(JUNIT
_FILE)
--
-failfast
go_test
=
OP_TESTLOG_DISABLE_COLOR
=
true
OP_E2E_DISABLE_PARALLEL
=
false
gotestsum
--format
=
testname
--junitfile
=
$(JUNIT_FILE)
--jsonfile
=
$(JSON_LOG
_FILE)
--
-failfast
# Note: -parallel must be set to match the number of cores in the resource class
# Note: -parallel must be set to match the number of cores in the resource class
go_test_flags
=
-timeout
=
60m
-parallel
=
8
go_test_flags
=
-timeout
=
60m
-parallel
=
8
else
else
...
...
ops/scripts/parse_json_test_output.sh
0 → 100755
View file @
8f516faf
#!/bin/bash
set
-euo
pipefail
if
[
"$#"
-ne
2
]
;
then
echo
"Usage:
$0
<test name> <json file>"
exit
1
fi
TEST_NAME
=
"
$1
"
JSON_FILE
=
"
$2
"
jq
--raw-output
--join-output
--arg
testName
"
${
TEST_NAME
}
"
'select(.Test == $testName and .Action == "output").Output'
"
${
JSON_FILE
}
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment