Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove the enable.docker.tests gradle property since TestContainers handles it now #2028

Merged
merged 1 commit into from
Nov 6, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/master-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ jobs:
arguments: check --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }}
properties: |
testAdditionalJavaVersions=${{ matrix.testAdditionalJavaVersions }}
enable.docker.tests=${{ matrix.os == 'ubuntu-latest' }}
org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}
- uses: codecov/codecov-action@v1
if: ${{ matrix.coverage }}
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/patch-release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,12 @@ jobs:
job-id: jdk11
remote-build-cache-proxy-enabled: false
arguments: build --stacktrace -Prelease.version=${{ github.event.inputs.version }}
properties: |
enable.docker.tests=true
- name: Publish artifacts
uses: burrunan/gradle-cache-action@v1.5
with:
job-id: jdk11
remote-build-cache-proxy-enabled: false
arguments: final --stacktrace -Prelease.version=${{ github.event.inputs.version }}
properties: |
enable.docker.tests=true
env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/pr-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ jobs:
arguments: check --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }}
properties: |
testAdditionalJavaVersions=${{ matrix.testAdditionalJavaVersions }}
enable.docker.tests=${{ matrix.os == 'ubuntu-latest' }}
org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}
- uses: codecov/codecov-action@v1
if: ${{ matrix.coverage }}
2 changes: 0 additions & 2 deletions .github/workflows/release-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ jobs:
job-id: jdk11
remote-build-cache-proxy-enabled: false
arguments: updateVersionInDocs build --stacktrace -Prelease.version=${{ github.event.inputs.version }}
properties: |
enable.docker.tests=true
- name: Setup git name
run: |
git config user.name github-actions
Expand Down
6 changes: 2 additions & 4 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,8 @@ Continuous integration builds the project, runs the tests, and runs multiple
types of static analysis.

1. Note: Currently, to run the full suite of tests, you'll need to be running a docker daemon.
The tests that require docker are disabled by default. If you wish to run them,
you can enable the docker tests by setting a gradle property of
``"enable.docker.tests"`` to true. See the gradle.properties file in the root of the project
for more details.
The tests that require docker are disabled if docker is not present. If you wish to run them,
you must run a local docker daemon.

2. Clone the repository recursively

Expand Down
1 change: 0 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ configure(opentelemetryProjects) {
}

tasks.withType(Test) {
systemProperties project.properties.subMap(["enable.docker.tests"])
useJUnitPlatform()

// At a test failure, log the stack trace to the console so that we don't
Expand Down
4 changes: 0 additions & 4 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,3 @@ org.gradle.parallel=true
org.gradle.workers.max=2
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m

### Override this property to 'true' to enable the end-to-end tests that use docker.
### This can be done via -Penable.docker.tests=true on the command line, or by
### setting this property to true in the gradle.properties in your home directory.
enable.docker.tests=false
4 changes: 0 additions & 4 deletions integration-tests/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,6 @@ task fatJar(type: Jar) {
with jar
}

test.onlyIf {
property('enable.docker.tests') == "true"
}

dependencies {
api project(':opentelemetry-api')

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
* executable JAR added to it and executed which will send a trace to the Jaeger instance. The test
* verifies that the trace is received by Jaeger.
*/
@Testcontainers
@Testcontainers(disabledWithoutDocker = true)
class JaegerExporterIntegrationTest {

private static final ObjectMapper objectMapper = new ObjectMapper();
Expand Down