Skip to content

Commit

Permalink
replace redundant commands in docker-compose files with generic one (#…
Browse files Browse the repository at this point in the history
…1010)

Motivation: keep it DRY

Modifications: move redundant commands from 18-04-5.0 and 16.04-5.1 to the generic task definitions
  • Loading branch information
tomerd committed May 21, 2019
1 parent 925ab65 commit ed50f8a
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
2 changes: 0 additions & 2 deletions docker/docker-compose.1604.51.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ services:

unit-tests:
image: swift-nio:16.04-5.1
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"

integration-tests:
image: swift-nio:16.04-5.1

test:
image: swift-nio:16.04-5.1
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors && ./scripts/integration_tests.sh"
environment:
- MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=30600
- MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=583100
Expand Down
2 changes: 0 additions & 2 deletions docker/docker-compose.1804.50.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,12 @@ services:

unit-tests:
image: swift-nio:18.04-5.0
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"

integration-tests:
image: swift-nio:18.04-5.0

test:
image: swift-nio:18.04-5.0
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors && ./scripts/integration_tests.sh"
environment:
- MAX_ALLOCS_ALLOWED_1000_reqs_1_conn=31200
- MAX_ALLOCS_ALLOWED_1_reqs_1000_conn=1155050 # was: 685050
Expand Down
4 changes: 2 additions & 2 deletions docker/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@ services:

unit-tests:
<<: *common
command: /bin/bash -cl "swift test -Xswiftc -DNIO_CI_BUILD"
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors"

integration-tests:
<<: *common
command: /bin/bash -cl "./scripts/integration_tests.sh"

test:
<<: *common
command: /bin/bash -cl "swift test -Xswiftc -DNIO_CI_BUILD && ./scripts/integration_tests.sh"
command: /bin/bash -cl "swift test -Xswiftc -warnings-as-errors && ./scripts/integration_tests.sh"

echo:
<<: *common
Expand Down

0 comments on commit ed50f8a

Please sign in to comment.