Always run acceptance testsv2.6-rc2

I can't trust Maven to run the tests with -Pacceptance. At least
half of my attempts produced no tests run. This is of zero value to
me as a build system, but our contributors have determined Gerrit
will remain stuck with Maven.

Stick contributors with the burden of running the acceptance tests
by default. This way we know the tests are executed.

Change-Id: I678e42651efc162f66929c605247583d7ef6cc8a

2 files changed, 13 insertions, 3 deletions

diff --git a/gerrit-acceptance-tests/pom.xml b/gerrit-acceptance-tests/pom.xml
index 410ae66b60..e79f8a7f5f 100644
--- a/gerrit-acceptance-tests/pom.xml
+++ b/gerrit-acceptance-tests/pom.xml
@@ -115,6 +115,11 @@ limitations under the License.
   <profiles>
     <profile>
       <id>acceptance</id>
+      <activation>
+        <property>
+          <name>!gerrit.acceptance-tests.skip</name>
+        </property>
+      </activation>
       <build>
         <plugins>
           <plugin>
diff --git a/tools/release.sh b/tools/release.sh
index a63a7a16fc..88e4a00763 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-flags=-Pacceptance
+flags=
 
 while [ $# -gt 0 ]
 do
@@ -13,8 +13,13 @@ do
 		flags="$flags -Dgerrit.plugins.skip=true"
 		shift
 		;;
+	--no-tests|--without-tests)
+		flags="$flags -Dgerrit.acceptance-tests.skip=true"
+		flags="$flags -Dmaven.tests.skip=true"
+		shift
+		;;
 	*)
-		echo >&2 "usage: $0 [--no-documentation] [--no-plugins]"
+		echo >&2 "usage: $0 [--no-documentation] [--no-plugins] [--no-tests]"
 		exit 1
 	esac
 done
@@ -29,7 +34,7 @@ then
 fi
 
 ./tools/version.sh --release &&
-mvn clean package $flags
+mvn clean package verify $flags
 rc=$?
 ./tools/version.sh --reset