From eff7c4dfb58bab4c32a0d3dba63687d8710594c1 Mon Sep 17 00:00:00 2001
From: Eugenio Romano <eugenio.romano@alfresco.com>
Date: Wed, 8 Aug 2018 01:40:10 +0100
Subject: [PATCH] move creation PR Docker at the end before after e2e

---
 .travis.yml          | 8 ++++----
 scripts/test-dist.sh | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ff2b16bef8..b85d70cf42 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -65,9 +65,7 @@ script:
 
 jobs:
     include:
-        - stage: Demo shell prod && Demo shell e2e && Check ADF exports
-          script: ./scripts/test-dist.sh -n $TRAVIS_BUILD_NUMBER && (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
-        - # Test Update version 2.0.0
+        - stage: Test Update version 2.0.0
           script: ./scripts/test-e2e-bc.sh
         - # Test expors
           script: npm run test-export
@@ -94,7 +92,9 @@ jobs:
           script: ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy $E2E_HOST -u $E2E_USERNAME -p $E2E_PASSWORD -e $E2E_EMAIL -b -save -dev -timeout 40000 --folder content-services
         - # Test insights
           script: ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy $E2E_HOST -u $E2E_USERNAME -p $E2E_PASSWORD -e $E2E_EMAIL -b -save -dev -timeout 40000 --folder insights
-        - stage: Deploy PR
+        - stage: Create Docker PR
+          script: ./scripts/test-dist.sh -n $TRAVIS_BUILD_NUMBER && (./scripts/pr-publish.sh -n $TRAVIS_BUILD_NUMBER -r $REPO_DOCKER -u $USERNAME_DOCKER -p $PASSWORD_DOCKER || exit 1)
+        - stage: Deploy Docker PR
           script: node ./scripts/pr-deploy.js -n $TRAVIS_BUILD_NUMBER -u $RANCHER_TOKEN -p $RANCHER_SECRET -s $REPO_RANCHER --image "docker:$REPO_DOCKER/adf/demo-shell:$TRAVIS_BUILD_NUMBER" --env $ENVIRONMENT_NAME -r $ENVIRONMENT_URL || exit 1
 
 # jobs:
diff --git a/scripts/test-dist.sh b/scripts/test-dist.sh
index ecd9125670..cecf9368e6 100755
--- a/scripts/test-dist.sh
+++ b/scripts/test-dist.sh
@@ -52,7 +52,7 @@ cp -R $DIR/../lib/dist/insights/* $DIR/../node_modules/@alfresco/adf-insights
 echo "====== Build dist demo shell ===== "
 
 npm run server-versions
-ng build dist --prod --base-href=$NAME/ --output-path demo-shell/dist/$NAME || exit 1
+ng build dist --base-href=$NAME/ --output-path demo-shell/dist/$NAME || exit 1
 
 echo "====== e2e test ===== "