Enable build and QA for dogfood branch

diff --git a/cix.sh b/cix.sh
index 74159ae5ae4b2ded7d821ee1ca23425c8e0c5459..024e416453939eda072cff627300792623a85426 100755 (executable)
--- a/cix.sh
+++ b/cix.sh
@@ -17,6 +17,9 @@ case "$RUN_ACTIVITY" in
     if [[ "$GITHUB_BRANCH" == "PULLREQUEST-"* ]] && [[ "$DB_ENGINE" != "postgresql93" ]]; then
       # execute PR QA only on postgres
       exit 0
+    elif [[ "$GITHUB_BRANCH" == "dogfood-on-next" ]] && [[ "$DB_ENGINE" != "postgresql93" ]]; then   
+      # execute dogfood QA only on postgres
+      exit 0
     else
       mvn clean package -B -e -V -f tests/plugins/pom.xml
 

diff --git a/travis.sh b/travis.sh
index 7145df65bb8a256c75c35ea906088ff4645c9faa..27f6978343125144cb428e76883adeac08717ceb 100755 (executable)
--- a/travis.sh
+++ b/travis.sh
@@ -169,7 +169,7 @@ BUILD)
         -Dsonar.analysis.pipeline=$TRAVIS_BUILD_NUMBER \
         -Dsonar.analysis.sha1=$TRAVIS_COMMIT \
         -Dsonar.analysis.repository=$TRAVIS_REPO_SLUG
-
+  
   elif [ "$TRAVIS_PULL_REQUEST" != "false" ] && [ -n "${GITHUB_TOKEN:-}" ]; then
     echo 'Build and analyze internal pull request'
 
@@ -192,6 +192,14 @@ BUILD)
         -Dsonar.pullrequest.id=$TRAVIS_PULL_REQUEST \
         -Dsonar.pullrequest.github.id=$TRAVIS_PULL_REQUEST \
         -Dsonar.pullrequest.github.repository=$TRAVIS_REPO_SLUG
+
+  elif [[ "$TRAVIS_BRANCH" == "dogfood-on-next" ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then
+    echo 'Build dogfood branch'
+
+    mvn org.jacoco:jacoco-maven-plugin:prepare-agent deploy \
+        $MAVEN_ARGS \
+        -Pdeploy-sonarsource,release
+        
   else
     echo 'Build feature branch or external pull request'