remove the enable.docker.tests gradle property since TestContainers h…

…andles it now (open-telemetry#2028)
MariusVolkhart · Nov 6, 2020 · 1a7a117 · 1a7a117
1 parent d69752a
commit 1a7a117
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 22 deletions.
diff --git a/.github/workflows/master-build.yml b/.github/workflows/master-build.yml
@@ -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 }}

diff --git a/.github/workflows/patch-release-build.yml b/.github/workflows/patch-release-build.yml
@@ -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/[email protected]
         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 }}

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -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 }}
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
@@ -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

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -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
 

diff --git a/build.gradle b/build.gradle
@@ -409,7 +409,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

diff --git a/gradle.properties b/gradle.properties
@@ -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
diff --git a/integration-tests/build.gradle b/integration-tests/build.gradle
@@ -13,10 +13,6 @@ task fatJar(type: Jar) {
     with jar
 }
 
-test.onlyIf {
-    property('enable.docker.tests') == "true" 
-}
-
 dependencies {
     api project(':opentelemetry-api')
 

diff --git a/integration-tests/src/test/java/io/opentelemetry/JaegerExporterIntegrationTest.java b/integration-tests/src/test/java/io/opentelemetry/JaegerExporterIntegrationTest.java
@@ -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();