Skip to content

Commit

Permalink
feat(core): update to work with Deadline 10.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rondeau-aws committed Nov 22, 2024
1 parent 637a54b commit 9291437
Show file tree
Hide file tree
Showing 39 changed files with 149 additions and 83 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,13 @@ else
# Non-TLS connections can connect to the repository directly
sudo $DEADLINE/deadlinecommand SetIniFileSetting ProxyUseSSL False
sudo $DEADLINE/deadlinecommand SetIniFileSetting ProxySSLCA ""
sudo $DEADLINE/deadlinecommand ChangeRepository Remote $ENDPOINT >/dev/null
ALL_USERS_OPTION=
if $DEADLINE/deadlinecommand --help | grep "^ChangeRepository " | grep -q "<Save For All Users>"; then
# Deadline 10.4 added an option to "Save For All Users".
# This is the default behavior in prior versions.
ALL_USERS_OPTION="True"
fi
sudo $DEADLINE/deadlinecommand ChangeRepository Remote $ENDPOINT '' '' $ALL_USERS_OPTION >/dev/null
fi

exit 0
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,34 @@
# Script to submit test Deadline jobs to be picked up by worker nodes based on their assigned group or pool
#
# Input:
# WORKER_OS: The operating system that the Worker node is running on. Will be either "Linux" or "Windows".
# JOB_NAME: Name for the test config/job submitted to Deadline. Will be either "group" or "pool"
# ARG: Command line arg added to `deadlinecommand` to submit the job to only the specific group/pool for the test case
# Output:
# A count of the number of entries in the output for `deadlinecommand GetSlavesRenderingJob` for the test job

set -euo pipefail

JOB_NAME=$1
ARG=$2
WORKER_OS=$1
JOB_NAME=$2
ARG=$3
DEADLINE="/opt/Thinkbox/Deadline10/bin"

case ${WORKER_OS^^} in
LINUX)
JOB_EXECUTABLE="/usr/bin/sleep"
;;
WINDOWS)
JOB_EXECUTABLE="timeout.exe"
;;
*)
echo "Error: unknown WORKER_OS from command line arguments: ${WORKER_OS}"
exit 1
;;
esac

# Send a sleep command to the render queue; based on the arg passed in, this job will be assigned to the test group or pool
JOB_ID=$($DEADLINE/deadlinecommand --prettyjson SubmitCommandLineJob -executable "/usr/bin/sleep" -arguments "10" -frames "1-10" -name $JOB_NAME $ARG)
JOB_ID=$($DEADLINE/deadlinecommand --prettyjson SubmitCommandLineJob -executable "$JOB_EXECUTABLE" -arguments "10" -frames "1-10" -name $JOB_NAME $ARG)
# We then pull the jobId from the output of `SubmitCommandLineJob`
JOB_ID=$(jq -r '.result' <<< "$JOB_ID")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ const bastionRegex = /bastionId/;
const rqRegex = /renderQueueEndpointWF(\d)/;

const testCases: Array<Array<any>> = [
[ 'Linux Worker HTTP mode', 1 ],
[ 'Windows Worker HTTP mode', 2 ],
[ 'Linux Worker HTTP mode', 1, 'Linux' ],
[ 'Windows Worker HTTP mode', 2, 'Windows' ],
];
let bastionId: any;
let renderQueueEndpoints: Array<string> = [];
Expand Down Expand Up @@ -45,7 +45,7 @@ beforeAll( async () => {
});
});

describe.each(testCases)('Deadline WorkerFleet tests (%s)', (_, id) => {
describe.each(testCases)('Deadline WorkerFleet tests (%s)', (_, id, workerOS) => {
describe('Worker node tests', () => {

// Before testing the render queue, send a command to configure the Deadline client to use that endpoint
Expand Down Expand Up @@ -139,7 +139,7 @@ describe.each(testCases)('Deadline WorkerFleet tests (%s)', (_, id) => {
'sudo -i',
'su - ec2-user >/dev/null',
'cd ~ec2-user',
`./testScripts/WF-submit-jobs-to-sets.sh "${name}" "${arg}"`,
`./testScripts/WF-submit-jobs-to-sets.sh "${workerOS}" "${name}" "${arg}"`,
],
},
};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,34 @@
# Script to submit test Deadline jobs to be picked up by worker nodes based on their assigned group or pool
#
# Input:
# WORKER_OS: The operating system that the Worker node is running on. Will be either "Linux" or "Windows".
# JOB_NAME: Name for the test config/job submitted to Deadline. Will be either "group" or "pool"
# ARG: Command line arg added to `deadlinecommand` to submit the job to only the specific group/pool for the test case
# Output:
# A count of the number of entries in the output for `deadlinecommand GetSlavesRenderingJob` for the test job

set -euo pipefail

JOB_NAME=$1
ARG=$2
WORKER_OS=$1
JOB_NAME=$2
ARG=$3
DEADLINE="/opt/Thinkbox/Deadline10/bin"

case ${WORKER_OS^^} in
LINUX)
JOB_EXECUTABLE="/usr/bin/sleep"
;;
WINDOWS)
JOB_EXECUTABLE="timeout.exe"
;;
*)
echo "Error: unknown WORKER_OS from command line arguments: ${WORKER_OS}"
exit 1
;;
esac

# Send a sleep command to the render queue; based on the arg passed in, this job will be assigned to the test group or pool
JOB_ID=$($DEADLINE/deadlinecommand --prettyjson SubmitCommandLineJob -executable "/usr/bin/sleep" -arguments "10" -frames "1-10" -name $JOB_NAME $ARG)
JOB_ID=$($DEADLINE/deadlinecommand --prettyjson SubmitCommandLineJob -executable "$JOB_EXECUTABLE" -arguments "10" -frames "1-10" -name $JOB_NAME $ARG)
# We then pull the jobId from the output of `SubmitCommandLineJob`
JOB_ID=$(jq -r '.result' <<< "$JOB_ID")

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ const rqRegex = /renderQueueEndpointWFS(\d)/;
const certRegex = /CertSecretARNWFS(\d)/;

const testCases: Array<Array<any>> = [
[ 'Linux Worker HTTPS (TLS) mode', 1 ],
[ 'Windows Worker HTTPS (TLS) mode', 2 ],
[ 'Linux Worker HTTPS (TLS) mode', 1, 'Linux' ],
[ 'Windows Worker HTTPS (TLS) mode', 2, 'Windows' ],
];
let bastionId: any;
let renderQueueEndpoints: Array<string> = [];
Expand Down Expand Up @@ -54,7 +54,7 @@ beforeAll( async () => {
});
});

describe.each(testCases)('Deadline WorkerFleetHttps tests (%s)', (_, id) => {
describe.each(testCases)('Deadline WorkerFleetHttps tests (%s)', (_, id, workerOS) => {

beforeAll( async () => {
if(secretARNs[id]) {
Expand Down Expand Up @@ -191,7 +191,7 @@ describe.each(testCases)('Deadline WorkerFleetHttps tests (%s)', (_, id) => {
'sudo -i',
'su - ec2-user >/dev/null',
'cd ~ec2-user',
`./testScripts/WFS-submit-jobs-to-sets.sh "${name}" "${arg}"`,
`./testScripts/WFS-submit-jobs-to-sets.sh "${workerOS}" "${name}" "${arg}"`,
],
},
};
Expand Down
20 changes: 17 additions & 3 deletions integ/lib/testing-tier.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ import * as path from 'path';
import { CfnOutput, Duration, Stack, StackProps } from 'aws-cdk-lib';
import {
BastionHostLinux,
IMachineImage,
InstanceType,
MachineImage,
Port,
Vpc,
} from 'aws-cdk-lib/aws-ec2';
Expand All @@ -16,7 +18,7 @@ import {
SessionManagerHelper,
X509CertificatePem,
} from 'aws-rfdk';
import { RenderQueue } from 'aws-rfdk/deadline';
import { RenderQueue, Version } from 'aws-rfdk/deadline';
import { Construct } from 'constructs';
import { NetworkTier } from '../components/_infrastructure/lib/network-tier';
import { IRenderFarmDb } from './storage-struct';
Expand Down Expand Up @@ -79,6 +81,7 @@ export abstract class TestingTier extends Stack {
vpc: this.vpc,
subnetSelection: { subnetGroupName: NetworkTier.subnetConfig.testRunner.name },
instanceType: new InstanceType('t3.small'),
machineImage: this.getMachineImageForDeadlineVersion(this.deadlineVersion),
});
if (process.env.DEV_MODE?.toLowerCase() === 'true') {
SessionManagerHelper.grantPermissionsTo(this.testInstance);
Expand All @@ -88,7 +91,6 @@ export abstract class TestingTier extends Stack {
new CfnOutput(this, 'bastionId', {
value: this.testInstance.instanceId,
});

}

/**
Expand Down Expand Up @@ -179,7 +181,6 @@ export abstract class TestingTier extends Stack {
'cd ~ec2-user',
`cp ${installerPath} ./deadline-client-installer.run`,
'chmod +x *.run',
'sudo yum install -y lsb',
'sudo ./deadline-client-installer.run --mode unattended',
`rm -f ${installerPath}`,
'rm -f ./deadline-client-installer.run',
Expand Down Expand Up @@ -274,4 +275,17 @@ export abstract class TestingTier extends Stack {
this.testInstance.instance.userData.addCommands( ...userDataCommands );
this.testInstance.instance.userData.addSignalOnExitCommand( this.testInstance.instance );
}

/**
* Return an Amazon Linux machine image that can run the specified version of Deadline.
*/
private getMachineImageForDeadlineVersion(deadlineVersion: string): IMachineImage {
const REMOVED_SUPPORT_FOR_AMAZON_LINUX_2 = new Version([10, 4, 0, 0]);

if (Version.parse(deadlineVersion).isLessThan(REMOVED_SUPPORT_FOR_AMAZON_LINUX_2)) {
return MachineImage.latestAmazonLinux2();
} else {
return MachineImage.latestAmazonLinux2023();
}
}
}
1 change: 1 addition & 0 deletions integ/test-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ export LINUX_DEADLINE_AMI_ID
export WINDOWS_DEADLINE_AMI_ID

# Configure test suites to include in end-to-end test
# - To skip a test, set it to true
export SKIP_deadline_01_repository_TEST
export SKIP_deadline_02_renderQueue_TEST
export SKIP_deadline_03_workerFleetHttp_TEST
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-rfdk/lib/core/lib/deployment-instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ export class DeploymentInstance extends Construct implements IScriptHost, IConne
this.asg = new AutoScalingGroup(this, 'ASG', {
instanceType: props.instanceType ?? InstanceType.of(InstanceClass.T3, InstanceSize.SMALL),
keyName: props.keyName,
machineImage: props.machineImage ?? MachineImage.latestAmazonLinux2(),
machineImage: props.machineImage ?? MachineImage.latestAmazonLinux2023(),
minCapacity: 1,
maxCapacity: 1,
securityGroup: props.securityGroup,
Expand Down
2 changes: 2 additions & 0 deletions packages/aws-rfdk/lib/core/lib/mongodb-instance.ts
Original file line number Diff line number Diff line change
Expand Up @@ -585,6 +585,8 @@ export class MongoDbInstance extends Construct implements IMongoDb, IGrantable {
'sudo chmod 750 /etc/mongod_certs/', // Directory needs to be executable.
// mongod user id might, potentially change on reboot. Make sure we own all mongo data
`sudo chown mongod.mongod -R ${MongoDbInstance.MONGO_DEVICE_MOUNT_POINT}`,
// We need yaml for some of our MongoDB configuration scripts
'sudo yum install -y python3-PyYAML',
// Configure mongod
'bash ./setMongoLimits.sh',
`bash ./setStoragePath.sh "${MongoDbInstance.MONGO_DEVICE_MOUNT_POINT}"`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,25 @@ function install_agent {
TMPDIR=$(mktemp -d)
pushd $TMPDIR 2>&1 > /dev/null

# Set the gpg home directory, where it stores configuration files.
# By default, this is in the user's home directory. This might not exist, causing errors.
# We don't need these files after installation, so we use a temporary directory.
export GNUPGHOME=${TMPDIR}

# Download CloudWatch agent installer
aws s3api get-object --region $region --bucket amazoncloudwatch-agent-$region --key amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm amazon-cloudwatch-agent.rpm

if [ "$SKIP_VERIFICATION" = false ]
then
aws s3api get-object --region $region --bucket amazoncloudwatch-agent-$region --key assets/amazon-cloudwatch-agent.gpg amazon-cloudwatch-agent.gpg
GPG_IMPORT_OUT=$(gpg --no-default-keyring --keyring ./keyring.gpg --import amazon-cloudwatch-agent.gpg 2>&1)
GPG_IMPORT_OUT=$(gpg --no-default-keyring --keyring ${TMPDIR}/keyring.gpg --import amazon-cloudwatch-agent.gpg 2>&1)
GPG_KEY=$(echo "${GPG_IMPORT_OUT}" | grep -Eow 'key [0-9A-F]+' | awk '{print $2}')
GPG_FINGERPRINT_OUT=$(gpg --no-default-keyring --keyring ./keyring.gpg --fingerprint ${GPG_KEY} 2>&1)
GPG_FINGERPRINT=$(echo "${GPG_FINGERPRINT_OUT}" | tr -d '[:blank:]' | grep -Eo 'fingerprint=[0-9A-F]{40}')
if test "${GPG_FINGERPRINT}" != "fingerprint=937616F3450B7D806CBD9725D58167303B789C72"
GPG_FINGERPRINT_OUT=$(gpg --no-default-keyring --keyring ${TMPDIR}/keyring.gpg --fingerprint --with-colons ${GPG_KEY} 2>&1)
# The "--with-colons" above requests output in a machine-readable colon separated format.
# For a description of the format, see https://github.com/gpg/gnupg/blob/master/doc/DETAILS
# We're looking for the "fpr" or "Fingerprint" record, which has the fingerprint in field 10.
GPG_FINGERPRINT=$(echo "${GPG_FINGERPRINT_OUT}" | grep '^fpr:' | cut -d ':' -f10)
if test "${GPG_FINGERPRINT}" != "937616F3450B7D806CBD9725D58167303B789C72"
then
# Key failed to verify. Alert AWS!!
echo "ERROR: Key failed to verify."
Expand All @@ -51,7 +59,7 @@ function install_agent {
fi

aws s3api get-object --region $region --bucket amazoncloudwatch-agent-$region --key amazon_linux/amd64/latest/amazon-cloudwatch-agent.rpm.sig amazon-cloudwatch-agent.rpm.sig
if ! gpg --no-default-keyring --keyring ./keyring.gpg --verify amazon-cloudwatch-agent.rpm.sig amazon-cloudwatch-agent.rpm 2>&1
if ! gpg --no-default-keyring --keyring ${TMPDIR}/keyring.gpg --verify amazon-cloudwatch-agent.rpm.sig amazon-cloudwatch-agent.rpm 2>&1
then
# CloudWatch agent installer failed to verify. Alert AWS!!
echo "ERROR: Agent installer failed to verify"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
function get_secret_string() {
SECRET_ID=$1
AWS_REGION=$(echo ${SECRET_ID} | cut -d: -f4)
PYTHON_SCRIPT="import json,sys; d=json.load(sys.stdin); print d[\"SecretString\"];"
PYTHON_SCRIPT="import json,sys; d=json.load(sys.stdin); print(d[\"SecretString\"]);"
set +x
export RET_VALUE=$(aws --region ${AWS_REGION} secretsmanager get-secret-value --secret-id "${SECRET_ID}" | python -c "${PYTHON_SCRIPT}" )
export RET_VALUE=$(aws --region ${AWS_REGION} secretsmanager get-secret-value --secret-id "${SECRET_ID}" | python3 -c "${PYTHON_SCRIPT}" )
set -x
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

set -xeufo pipefail

cat /etc/mongod.conf | python ./setupMongodLiveConfig.py > ./mongod.conf.new
cat /etc/mongod.conf | python3 ./setupMongodLiveConfig.py > ./mongod.conf.new
sudo mv ./mongod.conf.new /etc/mongod.conf
# Make sure mongod user can read the config file
sudo chmod 640 /etc/mongod.conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0

cat /etc/mongod.conf | python ./setupMongodNoAuth.py > ./mongod.conf.new
cat /etc/mongod.conf | python3 ./setupMongodNoAuth.py > ./mongod.conf.new
sudo mv ./mongod.conf.new /etc/mongod.conf
# Make sure mongod user can read the config file
sudo chmod 640 /etc/mongod.conf
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ fi

STORAGE_PATH=$1

cat /etc/mongod.conf | python ./setupMongodStorage.py "${STORAGE_PATH}" > ./mongod.conf.new
cat /etc/mongod.conf | python3 ./setupMongodStorage.py "${STORAGE_PATH}" > ./mongod.conf.new
sudo mv ./mongod.conf.new /etc/mongod.conf
# Make sure mongod user can read the config file
sudo chmod 640 /etc/mongod.conf
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/env python
#!/bin/env python3

# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
Expand Down Expand Up @@ -98,7 +98,7 @@ def main():
mongod_conf = yaml.load(sys.stdin)
modify_security(mongod_conf)
modify_net_options(mongod_conf)
print yaml.dump(mongod_conf, default_flow_style=False)
print(yaml.dump(mongod_conf, default_flow_style=False))

if __name__ == '__main__':
main()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/env python
#!/bin/env python3

# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
Expand Down Expand Up @@ -81,7 +81,7 @@ def main():
mongod_conf = yaml.load(sys.stdin)
modify_security(mongod_conf)
modify_network(mongod_conf)
print yaml.dump(mongod_conf, default_flow_style=False)
print(yaml.dump(mongod_conf, default_flow_style=False))

if __name__ == '__main__':
main()
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/env python
#!/bin/env python3

# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
# SPDX-License-Identifier: Apache-2.0
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-rfdk/lib/core/test/asset-constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
// ConfigureCloudWatchAgent.sh
export const CWA_ASSET_LINUX = {
Bucket: 'cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}',
Key: 'f3261b0f6923b012a8fce5cd6984211bc48b9977844b3fa44229234dc6f21d43',
Key: 'a1eed7232f6afcc474e870e7c3c01b7f4aec028de3a20eccc76ad9050032eecb',
};

// ConfigureCloudWatchAgent.ps1
Expand Down Expand Up @@ -38,5 +38,5 @@ export const INSTALL_MONGODB_3_6_SCRIPT_LINUX = {

export const MONGODB_3_6_CONFIGURATION_SCRIPTS = {
Bucket: 'cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}',
Key: '433ead41839a7d4dad68bf0149f907050caa6d95bb7b5b180e5ff21a5dad3c19',
Key: '3b571d3659f9f47af6005ca9619c6aec2a576cea5a53b8707544df0a80e368c8',
};
6 changes: 3 additions & 3 deletions packages/aws-rfdk/lib/core/test/cloudwatch-agent.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ describe('CloudWatchAgent', () => {
const host = new Instance(stack, 'Instance', {
instanceType: InstanceType.of(InstanceClass.T2, InstanceSize.LARGE),
machineImage: new AmazonLinuxImage({
generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
generation: AmazonLinuxGeneration.AMAZON_LINUX_2023,
}),
vpc,
});
Expand All @@ -69,7 +69,7 @@ describe('CloudWatchAgent', () => {
const host = new Instance(stack, 'Instance', {
instanceType: InstanceType.of(InstanceClass.T2, InstanceSize.LARGE),
machineImage: new AmazonLinuxImage({
generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
generation: AmazonLinuxGeneration.AMAZON_LINUX_2023,
}),
vpc,
});
Expand Down Expand Up @@ -216,7 +216,7 @@ describe('CloudWatchAgent', () => {
const host = new Instance(stack, 'Instance', {
instanceType: InstanceType.of(InstanceClass.T2, InstanceSize.LARGE),
machineImage: new AmazonLinuxImage({
generation: AmazonLinuxGeneration.AMAZON_LINUX_2,
generation: AmazonLinuxGeneration.AMAZON_LINUX_2023,
}),
vpc,
});
Expand Down
Loading

0 comments on commit 9291437

Please sign in to comment.