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

This commit is contained in:
John Watson 2020-11-05 20:48:40 -08:00 committed by GitHub
parent d69752a6be
commit 1a7a117a16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 3 additions and 22 deletions

View File

@ -39,7 +39,6 @@ jobs:
arguments: check --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }} arguments: check --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }}
properties: | properties: |
testAdditionalJavaVersions=${{ matrix.testAdditionalJavaVersions }} 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 }} org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}
- uses: codecov/codecov-action@v1 - uses: codecov/codecov-action@v1
if: ${{ matrix.coverage }} if: ${{ matrix.coverage }}

View File

@ -70,16 +70,12 @@ jobs:
job-id: jdk11 job-id: jdk11
remote-build-cache-proxy-enabled: false remote-build-cache-proxy-enabled: false
arguments: build --stacktrace -Prelease.version=${{ github.event.inputs.version }} arguments: build --stacktrace -Prelease.version=${{ github.event.inputs.version }}
properties: |
enable.docker.tests=true
- name: Publish artifacts - name: Publish artifacts
uses: burrunan/gradle-cache-action@v1.5 uses: burrunan/gradle-cache-action@v1.5
with: with:
job-id: jdk11 job-id: jdk11
remote-build-cache-proxy-enabled: false remote-build-cache-proxy-enabled: false
arguments: final --stacktrace -Prelease.version=${{ github.event.inputs.version }} arguments: final --stacktrace -Prelease.version=${{ github.event.inputs.version }}
properties: |
enable.docker.tests=true
env: env:
BINTRAY_USER: ${{ secrets.BINTRAY_USER }} BINTRAY_USER: ${{ secrets.BINTRAY_USER }}
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }} BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}

View File

@ -39,7 +39,6 @@ jobs:
arguments: check --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }} arguments: check --stacktrace ${{ matrix.coverage && ':opentelemetry-all:jacocoTestReport' || '' }}
properties: | properties: |
testAdditionalJavaVersions=${{ matrix.testAdditionalJavaVersions }} 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 }} org.gradle.java.installations.paths=${{ steps.setup-java-8.outputs.path }},${{ steps.setup-java-11.outputs.path }}
- uses: codecov/codecov-action@v1 - uses: codecov/codecov-action@v1
if: ${{ matrix.coverage }} if: ${{ matrix.coverage }}

View File

@ -23,8 +23,6 @@ jobs:
job-id: jdk11 job-id: jdk11
remote-build-cache-proxy-enabled: false remote-build-cache-proxy-enabled: false
arguments: updateVersionInDocs build --stacktrace -Prelease.version=${{ github.event.inputs.version }} arguments: updateVersionInDocs build --stacktrace -Prelease.version=${{ github.event.inputs.version }}
properties: |
enable.docker.tests=true
- name: Setup git name - name: Setup git name
run: | run: |
git config user.name github-actions git config user.name github-actions

View File

@ -101,10 +101,8 @@ Continuous integration builds the project, runs the tests, and runs multiple
types of static analysis. types of static analysis.
1. Note: Currently, to run the full suite of tests, you'll need to be running a docker daemon. 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, The tests that require docker are disabled if docker is not present. If you wish to run them,
you can enable the docker tests by setting a gradle property of you must run a local docker daemon.
``"enable.docker.tests"`` to true. See the gradle.properties file in the root of the project
for more details.
2. Clone the repository recursively 2. Clone the repository recursively

View File

@ -409,7 +409,6 @@ configure(opentelemetryProjects) {
} }
tasks.withType(Test) { tasks.withType(Test) {
systemProperties project.properties.subMap(["enable.docker.tests"])
useJUnitPlatform() useJUnitPlatform()
// At a test failure, log the stack trace to the console so that we don't // At a test failure, log the stack trace to the console so that we don't

View File

@ -2,7 +2,3 @@ org.gradle.parallel=true
org.gradle.workers.max=2 org.gradle.workers.max=2
org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=512m 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

View File

@ -13,10 +13,6 @@ task fatJar(type: Jar) {
with jar with jar
} }
test.onlyIf {
property('enable.docker.tests') == "true"
}
dependencies { dependencies {
api project(':opentelemetry-api') api project(':opentelemetry-api')

View File

@ -33,7 +33,7 @@ import org.testcontainers.utility.MountableFile;
* executable JAR added to it and executed which will send a trace to the Jaeger instance. The test * 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. * verifies that the trace is received by Jaeger.
*/ */
@Testcontainers @Testcontainers(disabledWithoutDocker = true)
class JaegerExporterIntegrationTest { class JaegerExporterIntegrationTest {
private static final ObjectMapper objectMapper = new ObjectMapper(); private static final ObjectMapper objectMapper = new ObjectMapper();