Skip to content

Commit

Permalink
STORM-3242: Adds "examples", "externals" profiles
Browse files Browse the repository at this point in the history 
The existing modules have been moved into like-named Maven profiles that are
enabled by default.

Updates travis-ci script to use new profiles

https://maven.apache.org/guides/introduction/introduction-to-profiles.html

> All profiles that are active by default are automatically deactivated
> when a profile in the POM is activated on the command line or through
> its activation config.

Therefore we should activate the new profiles whenever we explicitly
activate another profile.

Moves sql and flux to externals profile
  • Loading branch information
Derek Dagit committed Oct 4, 2018
1 parent c47c23c commit a9ff440
Show file tree
Hide file tree
Showing 4 changed files with 65 additions and 51 deletions.
2 changes: 2 additions & 0 deletions DEVELOPER.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,8 @@ The following commands must be run from the top-level directory.

If you wish to skip the unit tests you can do this by adding `-DskipTests` to the command line.

If you wish to skip the examples and external modules, you can do this by adding `-P '!examples,!externals'` to the command line.

In case you modified `storm.thrift`, you have to regenerate thrift code as java and python code before compiling whole project.

```sh
Expand Down
2 changes: 1 addition & 1 deletion dev-tools/travis/travis-install.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ then
fi

cd ${STORM_SRC_ROOT_DIR}
python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install.txt" mvn clean install -DskipTests -Pnative '-P!include-shaded-deps' --batch-mode
python ${TRAVIS_SCRIPT_DIR}/save-logs.py "install.txt" mvn clean install -DskipTests -Pnative,examples,externals '-P!include-shaded-deps' --batch-mode
BUILD_RET_VAL=$?

if [[ "$BUILD_RET_VAL" != "0" ]];
Expand Down
4 changes: 1 addition & 3 deletions dev-tools/travis/travis-script.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export STORM_TEST_TIMEOUT_MS=150000
# Travis only has 3GB of memory, lets use 1GB for build, and 1.5GB for forked JVMs
export MAVEN_OPTS="-Xmx1024m"

mvn --batch-mode test -fae -Pnative,all-tests '-P!include-shaded-deps' -Prat -pl "$TEST_MODULES"
mvn --batch-mode test -fae -Pnative,all-tests,examples,externals '-P!include-shaded-deps' -Prat -pl "$TEST_MODULES"
BUILD_RET_VAL=$?

for dir in `find . -type d -and -wholename \*/target/\*-reports`;
Expand All @@ -60,5 +60,3 @@ do
done

exit ${BUILD_RET_VAL}
fi

108 changes: 61 additions & 47 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,53 +355,6 @@
<module>storm-clojure</module>
<module>storm-clojure-test</module>
<module>storm-submit-tools</module>
<module>flux</module>
<module>sql</module>

<!-- externals -->
<module>external/storm-autocreds</module>
<module>external/storm-hdfs</module>
<module>external/storm-hdfs-blobstore</module>
<module>external/storm-hbase</module>
<module>external/storm-hive</module>
<module>external/storm-jdbc</module>
<module>external/storm-redis</module>
<module>external/storm-eventhubs</module>
<module>external/storm-elasticsearch</module>
<module>external/storm-solr</module>
<module>external/storm-metrics</module>
<module>external/storm-cassandra</module>
<module>external/storm-mqtt</module>
<module>external/storm-mongodb</module>
<module>external/storm-kafka-client</module>
<module>external/storm-kafka-migration</module>
<module>external/storm-opentsdb</module>
<module>external/storm-kafka-monitor</module>
<module>external/storm-kinesis</module>
<module>external/storm-jms</module>
<module>external/storm-pmml</module>
<module>external/storm-rocketmq</module>
<module>external/storm-blobstore-migration</module>
<module>integration-test</module>

<!-- examples -->
<module>examples/storm-starter</module>
<module>examples/storm-loadgen</module>
<module>examples/storm-mongodb-examples</module>
<module>examples/storm-redis-examples</module>
<module>examples/storm-opentsdb-examples</module>
<module>examples/storm-solr-examples</module>
<module>examples/storm-kafka-client-examples</module>
<module>examples/storm-jdbc-examples</module>
<module>examples/storm-hdfs-examples</module>
<module>examples/storm-hbase-examples</module>
<module>examples/storm-hive-examples</module>
<module>examples/storm-elasticsearch-examples</module>
<module>examples/storm-mqtt-examples</module>
<module>examples/storm-pmml-examples</module>
<module>examples/storm-jms-examples</module>
<module>examples/storm-rocketmq-examples</module>
<module>examples/storm-perf</module>
</modules>

<dependencies>
Expand Down Expand Up @@ -654,6 +607,67 @@
<clojure.test.declared.namespace.only>true</clojure.test.declared.namespace.only>
</properties>
</profile>
<profile>
<id>externals</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>external/storm-autocreds</module>
<module>external/storm-hdfs</module>
<module>external/storm-hdfs-blobstore</module>
<module>external/storm-hbase</module>
<module>external/storm-hive</module>
<module>external/storm-jdbc</module>
<module>external/storm-redis</module>
<module>external/storm-eventhubs</module>
<module>external/storm-elasticsearch</module>
<module>external/storm-solr</module>
<module>external/storm-metrics</module>
<module>external/storm-cassandra</module>
<module>external/storm-mqtt</module>
<module>external/storm-mongodb</module>
<module>external/storm-kafka-client</module>
<module>external/storm-kafka-migration</module>
<module>external/storm-opentsdb</module>
<module>external/storm-kafka-monitor</module>
<module>external/storm-kinesis</module>
<module>external/storm-jms</module>
<module>external/storm-pmml</module>
<module>external/storm-rocketmq</module>
<module>external/storm-blobstore-migration</module>
<module>integration-test</module>

<!-- The following modules have dependencies on external modules. -->
<module>flux</module>
<module>sql</module>
</modules>
</profile>
<profile>
<id>examples</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>examples/storm-starter</module>
<module>examples/storm-loadgen</module>
<module>examples/storm-mongodb-examples</module>
<module>examples/storm-redis-examples</module>
<module>examples/storm-opentsdb-examples</module>
<module>examples/storm-solr-examples</module>
<module>examples/storm-kafka-client-examples</module>
<module>examples/storm-jdbc-examples</module>
<module>examples/storm-hdfs-examples</module>
<module>examples/storm-hbase-examples</module>
<module>examples/storm-hive-examples</module>
<module>examples/storm-elasticsearch-examples</module>
<module>examples/storm-mqtt-examples</module>
<module>examples/storm-pmml-examples</module>
<module>examples/storm-jms-examples</module>
<module>examples/storm-rocketmq-examples</module>
<module>examples/storm-perf</module>
</modules>
</profile>
</profiles>

<distributionManagement>
Expand Down

0 comments on commit a9ff440

Please sign in to comment.