inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-09-17 14:21:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix pr-deploy script

Browse Source
This commit is contained in:
Eugenio Romano
2018-10-11 22:16:26 +01:00
parent 898c2be633
commit 156a6cafbf
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -90,7 +90,7 @@ jobs:
- stage: Create Docker PR - 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) 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 - 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 script: node --no-deprecation ./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: # jobs:
# include: # include:

13
scripts/pr-deploy.js
View File

@@ -28,7 +28,7 @@ async function main() {
.option('-u, --username [type]', 'username RANCHER') .option('-u, --username [type]', 'username RANCHER')
.parse(process.argv); .parse(process.argv);
auth = 'Basic ' + new Buffer(program.username + ':' + program.password).toString('base64') auth = 'Basic ' + new Buffer(program.username + ':' + program.password).toString('base64');
var project = await asyncRequest({ var project = await asyncRequest({
url: program.server + `/v1/project?name=${program.env}`, url: program.server + `/v1/project?name=${program.env}`,
@@ -41,11 +41,11 @@ async function main() {
}, },
body: "" body: ""
}).catch((error) => { }).catch((error) => {
console.log('Project name errror'+ error); console.log('Project name error'+ error);
}); });
var stacks = await asyncRequest({ var stacks = await asyncRequest({
url: `${program.server}/v2-beta/projects/1a2747/stacks?limit=-1&sort=name`, url: `${program.server}/v2-beta/projects/${project.data[0].id}/stacks?limit=-1&sort=name`,
method: 'GET', method: 'GET',
json: true, json: true,
headers: { headers: {
@@ -55,11 +55,12 @@ async function main() {
}, },
body: "" body: ""
}).catch((error) => { }).catch((error) => {
console.log('Stacks errror'+ error); console.log('Stacks error'+ error);
}); });
var stackId = stacks.data[0].id; var stackId = stacks.data[0].id;
var environmentId = project.data[0].id var environmentId = project.data[0].id;
console.log("StackId " + stackId); console.log("StackId " + stackId);
console.log("ID environment " + environmentId); console.log("ID environment " + environmentId);
@@ -240,7 +241,7 @@ async function main() {
loadBalancerGet.lbConfig.portRules.push(newRule); loadBalancerGet.lbConfig.portRules.push(newRule);
var loadBalancerUpdate = await asyncRequest({ await asyncRequest({
url: `${program.server}/v2-beta/projects/${environmentId}/loadbalancerservices/${loadBalancerId}`, url: `${program.server}/v2-beta/projects/${environmentId}/loadbalancerservices/${loadBalancerId}`,
method: 'PUT', method: 'PUT',
json: true, json: true,