diff --git a/.github/workflows/boulder-ci.yml b/.github/workflows/boulder-ci.yml index 3144a80b8a4..54968d2289b 100644 --- a/.github/workflows/boulder-ci.yml +++ b/.github/workflows/boulder-ci.yml @@ -30,8 +30,8 @@ jobs: matrix: # Add additional docker image tags here and all tests will be run with the additional image. BOULDER_TOOLS_TAG: - - go1.15.7_2021-03-16 - - go1.16.2_2021-03-16 + - go1.15.7_2021-03-26 + - go1.16.2_2021-03-26 # Tests command definitions. Use the entire docker-compose command you want to run. tests: # Run ./test.sh --help for a description of each of the flags. diff --git a/docker-compose.yml b/docker-compose.yml index d2d16f359d2..c5d84e1c63b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,7 +1,7 @@ version: '3' services: boulder: - image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.15.7_2021-03-16} + image: &boulder_image letsencrypt/boulder-tools:${BOULDER_TOOLS_TAG:-go1.15.7_2021-03-26} environment: FAKE_DNS: 10.77.77.77 BOULDER_CONFIG_DIR: test/config diff --git a/test.sh b/test.sh index 5be74a940f9..951218f470d 100755 --- a/test.sh +++ b/test.sh @@ -76,8 +76,7 @@ function run_and_expect_silence() { # function run_unit_tests() { if [ "${RACE}" == true ]; then - # Run the full suite of tests once with the -race flag. Since this isn't - # running tests individually we can't collect coverage information. + # Run the full suite of tests once with the -race flag. go test -race "${UNIT_PACKAGES[@]}" "${FILTER[@]}" else # When running locally, we skip the -race flag for speedier test runs. We @@ -91,25 +90,6 @@ function run_unit_tests() { fi } -function run_test_coverage() { - # Run each test by itself for CI, so we can get coverage. We skip using - # the -race flag here because we have already done a full test run with - # -race in `run_unit_tests` and it adds substantial overhead to run every - # test with -race independently - go test -p 1 -cover -coverprofile=.coverprofile ./... - - # Gather all the coverprofiles - gover - - # We don't use the run function here because sometimes goveralls fails to - # contact the server and exits with non-zero status, but we don't want to - # treat that as a failure. - - # note: not currently enabled in CI passes due to coveralls failing to map - # our github actions token to our coveralls account - goveralls -v -coverprofile=gover.coverprofile -service=github -} - # # Main CLI Parser # @@ -127,7 +107,6 @@ With no options passed, runs standard battery of tests (lint, unit, and integati -p