Skip to content

Commit

Permalink
[hotfix] Invert activation of new and legacy code by introducing -Dle…
Browse files Browse the repository at this point in the history
…gacyCode flag
  • Loading branch information
tillrohrmann committed Apr 2, 2018
1 parent af5279e commit 71913cd
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 20 deletions.
20 changes: 10 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,52 +39,52 @@ matrix:
- jdk: "oraclejdk8"
env:
- TEST="core"
- PROFILE="-Dhadoop.version=2.8.3 -Dnew"
- PROFILE="-Dhadoop.version=2.8.3"
- CACHE_NAME=JDK8_H280_CO
- jdk: "oraclejdk8"
env:
- TEST="libraries"
- PROFILE="-Dhadoop.version=2.8.3 -Dnew"
- PROFILE="-Dhadoop.version=2.8.3"
- CACHE_NAME=JDK8_H280_L
- jdk: "oraclejdk8"
env:
- TEST="connectors"
- PROFILE="-Dhadoop.version=2.8.3 -Dnew -Pinclude-kinesis"
- PROFILE="-Dhadoop.version=2.8.3 -Pinclude-kinesis"
- CACHE_NAME=JDK8_H280_CN
- jdk: "oraclejdk8"
env:
- TEST="tests"
- PROFILE="-Dhadoop.version=2.8.3 -Dnew"
- PROFILE="-Dhadoop.version=2.8.3"
- CACHE_NAME=JDK8_H280_T
- jdk: "oraclejdk8"
env:
- TEST="misc"
- PROFILE="-Dhadoop.version=2.8.3 -Dnew -Dinclude_hadoop_aws"
- PROFILE="-Dhadoop.version=2.8.3 -Dinclude_hadoop_aws"
- CACHE_NAME=JDK8_H280_M
- jdk: "openjdk8"
env:
- TEST="core"
- PROFILE="-Dhadoop.version=2.4.1"
- PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_CO
- jdk: "openjdk8"
env:
- TEST="libraries"
- PROFILE="-Dhadoop.version=2.4.1"
- PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_L
- jdk: "openjdk8"
env:
- TEST="connectors"
- PROFILE="-Dhadoop.version=2.4.1 -Pinclude-kinesis"
- PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode -Pinclude-kinesis"
- CACHE_NAME=JDK8_H241_CN
- jdk: "openjdk8"
env:
- TEST="tests"
- PROFILE="-Dhadoop.version=2.4.1"
- PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_T
- jdk: "openjdk8"
env:
- TEST="misc"
- PROFILE="-Dhadoop.version=2.4.1"
- PROFILE="-Dhadoop.version=2.4.1 -DlegacyCode"
- CACHE_NAME=JDK8_H241_M

git:
Expand Down
14 changes: 4 additions & 10 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,7 @@ under the License.
<powermock.version>1.6.5</powermock.version>
<hamcrest.version>1.3</hamcrest.version>
<japicmp.skip>false</japicmp.skip>
<!-- run all groups except new by default -->
<test.excludedGroups>org.apache.flink.testutils.category.New</test.excludedGroups>
<codebase>legacy</codebase>
<codebase>new</codebase>
<!--
Keeping the MiniKDC version fixed instead of taking hadoop version dependency
to support testing Kafka, ZK etc., modules that does not have Hadoop dependency
Expand Down Expand Up @@ -593,16 +591,14 @@ under the License.
<profiles>

<profile>
<id>new</id>
<id>legacyCode</id>
<activation>
<property>
<name>new</name>
<name>legacyCode</name>
</property>
</activation>
<properties>
<!-- clear the excluded groups list -->
<test.excludedGroups></test.excludedGroups>
<codebase>new</codebase>
<codebase>legacy</codebase>
</properties>
</profile>

Expand Down Expand Up @@ -1118,8 +1114,6 @@ under the License.
<!-- Do NOT use a version >=2.19.X, as test cases may get stuck before execution. See SUREFIRE-1255 -->
<version>2.18.1</version>
<configuration>
<groups>${test.groups}</groups>
<excludedGroups>${test.excludedGroups}</excludedGroups>
<forkCount>${flink.forkCount}</forkCount>
<reuseForks>${flink.reuseForks}</reuseForks>
<systemPropertyVariables>
Expand Down

0 comments on commit 71913cd

Please sign in to comment.