Skip to content

Commit

Permalink
feat(deadline)!: upgrade Deadline repo to 10.3.2.1 and DocDB to 5.0.0 (
Browse files Browse the repository at this point in the history
…#1221)

fix(integ): increased timeouts to fix test failures
fix(integ): use the newer rds-ca-rsa2048-g1 CA certs as the original rds-ca-2019 CA certs have expired
  • Loading branch information
loachri authored Aug 8, 2024
1 parent f1002cb commit f9b989a
Show file tree
Hide file tree
Showing 12 changed files with 18,252 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export class ServiceTier extends cdk.Stack {
version: this.version,
database: props.database,
fileSystem: props.mountableFileSystem,
repositoryInstallationTimeout: cdk.Duration.minutes(20),
repositoryInstallationTimeout: cdk.Duration.minutes(30),
repositoryInstallationPrefix: "/",
secretsManagementSettings: {
enabled: props.enableSecretsManagement,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ export class StorageTierDocDB extends StorageTier {
masterUser: {
username: 'adminuser',
},
engineVersion: '3.6.0',
engineVersion: '5.0.0',
backup: {
// We recommend setting the retention of your backups to 15 days
// for security reasons. The default retention is just one day.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ export class SEPStack extends Stack {
const repository = new Repository(this, 'Repository', {
vpc,
version: recipes.version,
repositoryInstallationTimeout: Duration.minutes(20),
repositoryInstallationTimeout: Duration.minutes(30),
// TODO - Evaluate deletion protection for your own needs. These properties are set to RemovalPolicy.DESTROY
// to cleanly remove everything when this stack is destroyed. If you would like to ensure
// that these resources are not accidentally deleted, you should set these properties to RemovalPolicy.RETAIN
Expand Down
2 changes: 1 addition & 1 deletion examples/deadline/Local-Zone/ts/lib/service-tier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class ServiceTier extends Stack {
database: RemovalPolicy.DESTROY,
filesystem: RemovalPolicy.DESTROY,
},
repositoryInstallationTimeout: Duration.minutes(20),
repositoryInstallationTimeout: Duration.minutes(30),
vpcSubnets: repositorySubnets,
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export class RepositoryTestingTier extends TestingTier {
'cd ~ec2-user',
'mkdir -p testScripts',
'cd testScripts',
'wget https://s3.amazonaws.com/rds-downloads/rds-combined-ca-bundle.pem',
'wget https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem',
);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ if [ -d "$CERT" ]; then
# The domain zone for the mongo instance used is hard-coded during setup
DB_ADDRESS="mongo.renderfarm.local:27017"
else
CERT_CA="./testScripts/rds-combined-ca-bundle.pem"
CERT_CA="./testScripts/global-bundle.pem"

# DocDB contains the endpoint address to use in its secret
ENDPOINT=$(jq -r '.host' <<< "$DB_SECRET_STRING")
Expand All @@ -38,7 +38,8 @@ else

fi

# Mongo command to query for "deadline10db" database
mongo --quiet --ssl --host="$DB_ADDRESS" --sslCAFile="$CERT_CA" --username="$DB_USERNAME" --password="$DB_PASS" --eval='printjson( db.adminCommand( { listDatabases: 1, nameOnly: true, filter: { "name": "deadline10db" } } ) )'

# Mongo command to query for "deadline10db" database.
# We delete Timestamp fields from the EJSON result to avoid errors when parsing
# them in Python.
mongo --quiet --ssl --host="$DB_ADDRESS" --sslCAFile="$CERT_CA" --username="$DB_USERNAME" --password="$DB_PASS" --eval='(function(){var output=db.adminCommand({ listDatabases: 1, nameOnly: true, filter: { "name": "deadline10db" } } );delete output.onTime;delete output.operationTime;printjson(output)})()'
exit 0
2 changes: 1 addition & 1 deletion integ/jest.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ module.exports = {
transform: {
'^.+\\.tsx?$': 'ts-jest'
},
testTimeout: 60000,
testTimeout: 300000,
setupFilesAfterEnv: [
"<rootDir>/components/deadline/common/jest-matchers.js"
]
Expand Down
2 changes: 1 addition & 1 deletion integ/lib/storage-struct.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ export class StorageStruct extends Construct {
database: databaseConnection,
fileSystem: deadlineMountableEfs,
version: props.version,
repositoryInstallationTimeout: Duration.minutes(20),
repositoryInstallationTimeout: Duration.minutes(30),
logGroupProps: {
logGroupPrefix: `/${Stack.of(this).stackName}-${id}/`,
retention: RetentionDays.TWO_MONTHS,
Expand Down
Loading

0 comments on commit f9b989a

Please sign in to comment.