Do not wait for ttl shutdown
parent
c7417caf05
commit
9e232ed4e9
|
|
@ -247,55 +247,6 @@ class AWS {
|
||||||
ParameterValue: buildParameters.githubToken,
|
ParameterValue: buildParameters.githubToken,
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
yield this.run(buildUid, buildParameters.awsStackName, 'alpine', ['/bin/sh'], [
|
|
||||||
'-c',
|
|
||||||
`
|
|
||||||
apk update;
|
|
||||||
apk add zip
|
|
||||||
zip -r ./${buildUid}/output.zip ./${buildUid}/repo/build
|
|
||||||
ls
|
|
||||||
`,
|
|
||||||
], '/data', '/data/', [
|
|
||||||
{
|
|
||||||
name: 'GITHUB_SHA',
|
|
||||||
value: process.env.GITHUB_SHA,
|
|
||||||
},
|
|
||||||
], [
|
|
||||||
{
|
|
||||||
ParameterKey: 'GithubToken',
|
|
||||||
ParameterValue: buildParameters.githubToken,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
yield this.run(buildUid, buildParameters.awsStackName, 'amazon/aws-cli', ['/bin/sh'], [
|
|
||||||
'-c',
|
|
||||||
`
|
|
||||||
aws s3 cp ./${buildUid}/output.zip s3://game-ci-storage/${buildUid}
|
|
||||||
rm -r ${buildUid}
|
|
||||||
ls
|
|
||||||
`,
|
|
||||||
], '/data', '/data/', [
|
|
||||||
{
|
|
||||||
name: 'GITHUB_SHA',
|
|
||||||
value: process.env.GITHUB_SHA,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
name: 'AWS_DEFAULT_REGION',
|
|
||||||
value: process.env.AWS_DEFAULT_REGION,
|
|
||||||
},
|
|
||||||
], [
|
|
||||||
{
|
|
||||||
ParameterKey: 'GithubToken',
|
|
||||||
ParameterValue: buildParameters.githubToken,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ParameterKey: 'AWSAccessKeyID',
|
|
||||||
ParameterValue: process.env.AWS_ACCESS_KEY_ID,
|
|
||||||
},
|
|
||||||
{
|
|
||||||
ParameterKey: 'AWSSecretAccessKey',
|
|
||||||
ParameterValue: process.env.AWS_SECRET_ACCESS_KEY,
|
|
||||||
},
|
|
||||||
]);
|
|
||||||
yield this.run(buildUid, buildParameters.awsStackName, baseImage.toString(), ['/bin/sh'], [
|
yield this.run(buildUid, buildParameters.awsStackName, baseImage.toString(), ['/bin/sh'], [
|
||||||
'-c',
|
'-c',
|
||||||
`
|
`
|
||||||
|
|
@ -640,9 +591,10 @@ class AWS {
|
||||||
yield CF.waitFor('stackDeleteComplete', {
|
yield CF.waitFor('stackDeleteComplete', {
|
||||||
StackName: taskDefStackName,
|
StackName: taskDefStackName,
|
||||||
}).promise();
|
}).promise();
|
||||||
yield CF.waitFor('stackDeleteComplete', {
|
// Currently too slow and causes too much waiting
|
||||||
StackName: taskDefStackNameTTL,
|
// await CF.waitFor('stackDeleteComplete', {
|
||||||
}).promise();
|
// StackName: taskDefStackNameTTL,
|
||||||
|
// }).promise();
|
||||||
core.info('Cleanup complete');
|
core.info('Cleanup complete');
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -452,9 +452,10 @@ class AWS {
|
||||||
StackName: taskDefStackName,
|
StackName: taskDefStackName,
|
||||||
}).promise();
|
}).promise();
|
||||||
|
|
||||||
await CF.waitFor('stackDeleteComplete', {
|
// Currently too slow and causes too much waiting
|
||||||
StackName: taskDefStackNameTTL,
|
// await CF.waitFor('stackDeleteComplete', {
|
||||||
}).promise();
|
// StackName: taskDefStackNameTTL,
|
||||||
|
// }).promise();
|
||||||
|
|
||||||
core.info('Cleanup complete');
|
core.info('Cleanup complete');
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue