Skip to content

Commit 82a57d1

Browse files
Merge remote-tracking branch 'origin/foundation-2019' into foundation-2020
2 parents 3fb9999 + 2f73ad1 commit 82a57d1

File tree

3 files changed

+19
-2
lines changed

3 files changed

+19
-2
lines changed

.circleci/scripts/smoke.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ else
6666
while read -r TEST_CLASS
6767
do
6868
echo "###### Testing: ${TEST_CLASS}"
69-
../compile.pl -N -DskipTests=false -DskipITs=false -DfailIfNoTests=false -Dtest.fork.count=0 -Dit.test="$TEST_CLASS" "-Psmoke.$SUITE" install verify
69+
../compile.pl -N -DskipTests=false -DskipITs=false -DfailIfNoTests=false -Dtest.fork.count=0 -Dit.test="$TEST_CLASS" '-P!smoke.all' "-Psmoke.$SUITE" install verify
7070
done < /tmp/this_node_it_tests
7171
fi
7272

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ By adopting this Code of Conduct, project maintainers commit themselves to fairl
2424

2525
This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community.
2626

27-
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at abuse@opennms.org. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
27+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at abuse@opennms.com. All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. Maintainers are obligated to maintain confidentiality with regard to the reporter of an incident.
2828

2929
This Code of Conduct is adapted from the Contributor Covenant, version 1.3.0, available from http://contributor-covenant.org/version/1/3/0/

smoke-test/pom.xml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,23 @@
179179
</plugins>
180180
</build>
181181
<profiles>
182+
<profile>
183+
<id>smoke.all</id>
184+
<activation>
185+
<activeByDefault>true</activeByDefault>
186+
</activation>
187+
<build>
188+
<plugins>
189+
<plugin>
190+
<groupId>org.apache.maven.plugins</groupId>
191+
<artifactId>maven-failsafe-plugin</artifactId>
192+
<configuration>
193+
<excludedGroups></excludedGroups>
194+
</configuration>
195+
</plugin>
196+
</plugins>
197+
</build>
198+
</profile>
182199
<profile>
183200
<id>smoke.core</id>
184201
<build>

0 commit comments

Comments
 (0)