From 48ef644c90077d9dbc16bb8ab2df11d103faf5e4 Mon Sep 17 00:00:00 2001 From: Trask Stalnaker Date: Mon, 27 Jul 2020 23:21:40 -0700 Subject: [PATCH] Run integrationTest as part of test (#817) --- .circleci/config.yml | 4 ++-- gradle/instrumentation.gradle | 2 +- gradle/java.gradle | 21 ++++++++++----------- 3 files changed, 13 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a321cbf763..420ea23f4c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -33,7 +33,7 @@ jobs: name: Build Project command: >- GRADLE_OPTS="-Dorg.gradle.jvmargs='-Xmx1G -Xms64M' -Dota.forkedMaxHeapSize=1G -Dota.forkedMinHeapSize=64M" - ./gradlew clean build shadowJar -x test -x integrationTest + ./gradlew clean build shadowJar -x test << pipeline.parameters.gradle_flags >> --max-workers=8 @@ -183,7 +183,7 @@ workflows: requires: - build name: test_8 - testTask: testJava8 integrationTestJava8 + testTask: testJava8 filters: tags: only: /.*/ diff --git a/gradle/instrumentation.gradle b/gradle/instrumentation.gradle index bbbc1b940c..cd6b91f6e7 100644 --- a/gradle/instrumentation.gradle +++ b/gradle/instrumentation.gradle @@ -83,4 +83,4 @@ task integrationTest(type: Test) { } } -check.dependsOn integrationTest \ No newline at end of file +test.finalizedBy integrationTest diff --git a/gradle/java.gradle b/gradle/java.gradle index 62061c9292..5653a6c70f 100644 --- a/gradle/java.gradle +++ b/gradle/java.gradle @@ -9,12 +9,12 @@ apply from: "$rootDir/gradle/codenarc.gradle" apply from: "$rootDir/gradle/spotbugs.gradle" def applyCodeCoverage = !( - project.path.startsWith(":smoke-tests") || - //TODO why some tests fail on java 11 if jacoco is present? - project.path == ":opentelemetry-javaagent" || - project.path == ":load-generator" || - project.path.startsWith(":benchmark") || - project.path.startsWith(":instrumentation")) + project.path.startsWith(":smoke-tests") || + //TODO why some tests fail on java 11 if jacoco is present? + project.path == ":opentelemetry-javaagent" || + project.path == ":load-generator" || + project.path.startsWith(":benchmark") || + project.path.startsWith(":instrumentation")) if (applyCodeCoverage) { apply from: "$rootDir/gradle/jacoco.gradle" @@ -108,10 +108,10 @@ dependencies { jar { manifest { attributes( - "Implementation-Title": project.name, - "Implementation-Version": project.version, - "Implementation-Vendor": "OpenTelemetry", - "Implementation-URL": "https://github.com/open-telemetry/opentelemetry-java-instrumentation", + "Implementation-Title": project.name, + "Implementation-Version": project.version, + "Implementation-Vendor": "OpenTelemetry", + "Implementation-URL": "https://github.com/open-telemetry/opentelemetry-java-instrumentation", ) } } @@ -260,7 +260,6 @@ def addTestRule(String testTaskName) { } addTestRule("test") -addTestRule("integrationTest") addTestRule("latestDepTest") tasks.withType(Test).configureEach {