diff --git a/.travis.yml b/.travis.yml index cc7537fbe0..120e26ff1c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -86,13 +86,13 @@ jobs: - stage: e2e Test # Test insights env: STAGE=insights script: node ./scripts/download-build-in-cs.js --username "$E2E_USERNAME" --password "$E2E_PASSWORD" --host "$E2E_HOST" --folder $TRAVIS_BUILD_NUMBER; ./scripts/test-e2e-lib.sh -host localhost:4200 -proxy "$E2E_HOST" -u "$E2E_USERNAME" -p "$E2E_PASSWORD" -e $E2E_EMAIL -b -save --folder insights --skip-lint --use-dist --timeout 7000 - - stage: Test Update version 2.0.0 - if: branch = development - env: STAGE=test-BC - script: ./scripts/test-e2e-bc.sh -b $TRAVIS_BUILD_NUMBER - - stage: Test Update version 2.0.0 - env: STAGE=test-export - script: npm run test-export +# - stage: Test Update version 2.0.0 +# if: branch = development +# env: STAGE=test-BC +# script: ./scripts/test-e2e-bc.sh -b $TRAVIS_BUILD_NUMBER +# - stage: Test Update version 2.0.0 +# env: STAGE=test-export +# script: npm run test-export - stage: Create Docker PR script: node ./scripts/download-build-in-cs.js --username "$E2E_USERNAME" --password "$E2E_PASSWORD" --host "$E2E_HOST" --folder $TRAVIS_BUILD_NUMBER --base-href $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 diff --git a/scripts/download-build-lib-in-cs.js b/scripts/download-build-lib-in-cs.js index b9b5455a83..be19ceb307 100644 --- a/scripts/download-build-lib-in-cs.js +++ b/scripts/download-build-lib-in-cs.js @@ -4,11 +4,8 @@ var http = require('http'); var fs = require('fs'); var path = require('path'); -var archiver = require('archiver'); var unzip = require('unzip-stream'); -var exec = require('child_process').exec; - var alfrescoJsApi; unzipRetry = (url, outputFolder, pacakge, tentativeNumber) => { @@ -35,7 +32,7 @@ unzipRetry = (url, outputFolder, pacakge, tentativeNumber) => { }, 10000); }) -} +}; downloadZip = async (url, outputFolder, pacakge, tentativeNumber) => { if (!tentativeNumber) { @@ -46,7 +43,7 @@ downloadZip = async (url, outputFolder, pacakge, tentativeNumber) => { console.log(`Download ${pacakge} in OutputFolder ${outputFolder}`) - var file = fs.createWriteStream(`${pacakge}.zip`); + let file = fs.createWriteStream(`${pacakge}.zip`); return await http.get(`http://${url}`, (response) => { response.pipe(file); file.on('finish', async () => { @@ -55,7 +52,7 @@ downloadZip = async (url, outputFolder, pacakge, tentativeNumber) => { }); }); }); -} +}; getUrl = async (folder, pacakge) => { let zipDemoNode; @@ -70,7 +67,7 @@ getUrl = async (folder, pacakge) => { return await alfrescoJsApi.content.getContentUrl(zipDemoNode.entry.id, true); -} +}; async function main() { @@ -78,7 +75,7 @@ async function main() { .version('0.1.0') .option('-p, --password [type]', 'password') .option('-u, --username [type]', 'username') - .option('-o, --output [type]', 'oputput folder') + .option('-o, --output [type]', 'output folder') .option('--base-href [type]', '') .option('-f, --folder [type]', 'Name of the folder') .option('-host, --host [type]', 'URL of the CS') diff --git a/scripts/test-e2e-bc.sh b/scripts/test-e2e-bc.sh index c717d9cabb..e4468132bd 100755 --- a/scripts/test-e2e-bc.sh +++ b/scripts/test-e2e-bc.sh @@ -27,7 +27,7 @@ MATERIAL_VERSION="5.1.1" NGX_TRANSLATE_VERSION="10.0.2" MOMENT_VERSION="2.20.1" RXJS_VERSION="6.0.0" -TYPESCRIPT_VERSION=2.6.2 +TYPESCRIPT_VERSION="2.9.2" npm install @@ -50,22 +50,13 @@ echo "====== COPY new build in node_modules ===== " rm -rf $DIR/../integration/base_ver_2_app/node_modules/@alfresco -node $DIR/download-build-lib-in-cs.js --username "$E2E_USERNAME" --password "$E2E_PASSWORD" --host "$E2E_HOST" --folder $TRAVIS_BUILD_NUMBER; - -mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-core/ && \ -cp -R $DIR/../node_modules/@alfresco/adf-core/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-core/ - -mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-content-services/ && \ -cp -R $DIR/../node_modules/@alfresco/adf-content-services/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-content-services/ - -mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-process-services/ && \ -cp -R $DIR/../node_modules/@alfresco/adf-process-services/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-process-services/ - -mkdir -p $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-insights/ && \ -cp -R $DIR/../node_modules/@alfresco/adf-insights/* $DIR/../integration/base_ver_2_app/node_modules/@alfresco/adf-insights/ +cd $DIR/.. +node $DIR/download-build-lib-in-cs.js --username "$E2E_USERNAME" --password "$E2E_PASSWORD" --host "$E2E_HOST" --folder $TRAVIS_BUILD_NUMBER -o /integration/base_ver_2_app/node_modules rm -rf $DIR/../node_modules/@angular rm -rf $DIR/../node_modules/@alfresco +cd $DIR/../integration/base_ver_2_app + npm run e2e