ci: fix property names for selecting bower/npm profiles

vaadin · Nov 17, 2020 · 8ba9bdd · 8ba9bdd
1 parent d3b99e9
commit 8ba9bdd
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -179,8 +179,8 @@ then
 else
   mode="-Dfailsafe.forkCount=$FORK_COUNT -Dcom.vaadin.testbench.Parameters.testsInParallel=$TESTS_IN_PARALLEL"
   ### Run IT's in merged module
-  cmd="mvn verify -B -q -Drun-it -Drelease -Dvaadin.productionMode -Dfailsafe.rerunFailingTestsCount=2 $mode $args -pl integration-tests/$pomFile -Dtest=none $(reuse_browser $TESTBENCH_REUSE_BROWSER)"
-  tcLog "Running merged ITs - mvn verify -B -Drun-it -Drelease -pl integration-tests/$pomFile ..."
+  cmd="mvn verify -B -q -D$TEST_MODE -Drelease -Dvaadin.productionMode -Dfailsafe.rerunFailingTestsCount=2 $mode $args -pl integration-tests/$pomFile -Dtest=none $(reuse_browser $TESTBENCH_REUSE_BROWSER)"
+  tcLog "Running merged ITs - mvn verify -B -D$TEST_MODE -Drelease -pl integration-tests/$pomFile ..."
   echo $cmd
   $cmd
   error=$?
@@ -199,7 +199,7 @@ else
       then
         failed=`echo "$failed" | tr '\n' ','`
         mode="-Dfailsafe.forkCount=2 -Dcom.vaadin.testbench.Parameters.testsInParallel=3"
-        cmd="mvn verify -B -q -Drun-it -Drelease -Dvaadin.productionMode -DskipFrontend $mode $args -pl integration-tests/$pomFile -Dtest=none -Dit.test=$failed $(reuse_browser false)"
+        cmd="mvn verify -B -q -D$TEST_MODE -Drelease -Dvaadin.productionMode -DskipFrontend $mode $args -pl integration-tests/$pomFile -Dtest=none -Dit.test=$failed $(reuse_browser false)"
         tcLog "Re-Running $nfailed failed IT classes ..."
         echo $cmd
         $cmd

diff --git a/scripts/run.sh b/scripts/run.sh
@@ -8,6 +8,8 @@
 [ -n "$FORKS" ] && args="-Dfailsafe.forkCount=$FORKS";
 ## bu default local tests are runn in headless, but can be disabled
 [ "$HEADLESS" = false ] && args="$args -DdisableHeadless"
+## run bower mode or npm
+[ -n "$BOWER" ] && it=bower-it || it=npm-it
 
 ## List all modules and ask for one to the user
 askModule() {
@@ -96,9 +98,9 @@ case $option in
    5) askSauce; askModule; askITests; askUTests; askJetty; runFrontend; cmd="mvn verify -am -B -q -pl $module-flow-parent/$module-flow-integration-tests $utests $itests $frontend $jetty $args -Dtest.use.hub=true -Psaucelabs -Dsauce.user=$SAUCE_USER -Dsauce.sauceAccessKey=$SAUCE_ACCESS_KEY";;
    6) cmd="mvn clean test-compile -DskipFrontend -B -q -T 1C";;
    7) cmd="mvn install -B -DskipTests -Drelease -T 1C";;
-   8) mergeITs; askITests; askUTests; askJetty; runFrontend; cmd="mvn verify -q -am -B -Drun-it -pl integration-tests $utests $itests $frontend $jetty $args";;
-   9) mergeITs; cmd="mvn jetty:run -am -B -q -DskipTests -Drun-it -pl integration-tests"; browser=true;;
-   10) askSauce; mergeITs; askITests; askUTests; askJetty; runFrontend; cmd="mvn verify -am -B -q -pl integration-tests -Drun-it $utests $itests $frontend $jetty $args -Dtest.use.hub=true -Psaucelabs -Dsauce.user=$SAUCE_USER -Dsauce.sauceAccessKey=$SAUCE_ACCESS_KEY";;
+   8) mergeITs; askITests; askUTests; askJetty; runFrontend; cmd="mvn verify -q -am -B -D$it -pl integration-tests $utests $itests $frontend $jetty $args";;
+   9) mergeITs; cmd="mvn jetty:run -am -B -q -DskipTests -D$it -pl integration-tests"; browser=true;;
+   10) askSauce; mergeITs; askITests; askUTests; askJetty; runFrontend; cmd="mvn verify -am -B -q -pl integration-tests -D$it $utests $itests $frontend $jetty $args -Dtest.use.hub=true -Psaucelabs -Dsauce.user=$SAUCE_USER -Dsauce.sauceAccessKey=$SAUCE_ACCESS_KEY";;
 esac
 
 ## execute mvn command and check error status