From c84bb250fbf70efed291f15ecf49648c34bdd77d Mon Sep 17 00:00:00 2001 From: Eugenio Romano Date: Mon, 10 Feb 2020 00:33:14 +0000 Subject: [PATCH] Fix build scripts (#5461) * improve check env script * fix update script children --- scripts/check-env/check-cs-env.js | 68 +++++++++++-------- .../travis/update/trigger-travis-children.sh | 13 +--- 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/scripts/check-env/check-cs-env.js b/scripts/check-env/check-cs-env.js index e3c631570d..3d8e0a7a18 100755 --- a/scripts/check-env/check-cs-env.js +++ b/scripts/check-env/check-cs-env.js @@ -44,34 +44,35 @@ async function checkEnv() { } async function checkDiskSpaceFullEnv() { - this.alfrescoJsApi = new alfrescoApi.AlfrescoApiCompatibility({ - provider: 'ECM', - hostEcm: program.host - }); - - await this.alfrescoJsApi.login(program.username, program.password); - - let folder; - try { - folder = await alfrescoJsApi.nodes.addNode('-my-', { - 'name': `try-env`, - 'relativePath': `Builds`, - 'nodeType': 'cm:folder' - }, {}, { - 'overwrite': true + + this.alfrescoJsApi = new alfrescoApi.AlfrescoApiCompatibility({ + provider: 'ECM', + hostEcm: program.host }); - } catch (error) { - folder = await alfrescoJsApi.nodes.getNode('-my-', { - 'relativePath': `Builds/try-env`, - 'nodeType': 'cm:folder' - }, {}, { - 'overwrite': true - }); - } + await this.alfrescoJsApi.login(program.username, program.password); + + let folder; + + try { + folder = await alfrescoJsApi.nodes.addNode('-my-', { + 'name': `try-env`, + 'relativePath': `Builds`, + 'nodeType': 'cm:folder' + }, {}, { + 'overwrite': true + }); + + } catch (error) { + folder = await alfrescoJsApi.nodes.getNode('-my-', { + 'relativePath': `Builds/try-env`, + 'nodeType': 'cm:folder' + }, {}, { + 'overwrite': true + }); + } - try { let pathFile = path.join(__dirname, '../../', 'README.md'); let file = fs.createReadStream(pathFile); @@ -89,11 +90,20 @@ async function checkDiskSpaceFullEnv() { this.alfrescoJsApi.node.deleteNode(uploadedFile.entry.id, {permanent: true}); } catch (error) { - console.log('============================================================='); - console.log('================ Not able to upload a file =================='); - console.log('================ Possible cause CS is full =================='); - console.log('============================================================='); - process.exit(1); + counter++; + + if (MAX_RETRY === counter) { + console.log('============================================================='); + console.log('================ Not able to upload a file =================='); + console.log('================ Possible cause CS is full =================='); + console.log('============================================================='); + process.exit(1); + } else { + console.log(`Retry in 1 minute attempt N ${counter}`); + sleep(TIMEOUT); + checkDiskSpaceFullEnv(); + } + } } diff --git a/scripts/travis/update/trigger-travis-children.sh b/scripts/travis/update/trigger-travis-children.sh index c9262bfd64..bfdba43c29 100755 --- a/scripts/travis/update/trigger-travis-children.sh +++ b/scripts/travis/update/trigger-travis-children.sh @@ -1,15 +1,4 @@ -#!/bin/sh -f - -# Trigger a new Travis-CI job. - -# Usage: -# trigger-travis.sh [--pro] [--branch BRANCH] GITHUBID GITHUBPROJECT TRAVIS_ACCESS_TOKEN [MESSAGE] -# For example: -# trigger-travis.sh typetools checker-framework `cat ~/private/.travis-access-token` "Trigger for testing" - -# For full documentation, see -# https://github.com/plume-lib/trigger-travis/ - +#!/usr/bin/env bash eval repos=( "alfresco-modeler-app" "alfresco-process-workspace-app"