Skip to content

Commit

Permalink
Updated RFDK version
Browse files Browse the repository at this point in the history
  • Loading branch information
horsmand committed Jun 22, 2021
1 parent fd37e2d commit dec2bbd
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
8 changes: 4 additions & 4 deletions examples/deadline/Local-Zone/python/package/lib/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ def __init__(self):
self.availability_zones_local: List[str] = ['us-west-2-lax-1a']

# The version of Deadline to use on the render farm. Leave as None for the latest release or specify a version
# to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.15"
self.deadline_version: Optional[str] = '10.1.15'
# to pin to. Some examples of pinned version values are "10", "10.1", or "10.1.16"
self.deadline_version: Optional[str] = '10.1.16'

# A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID
# A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.16.8 AMI ID
# from us-west-2 is filled in. It can be used as-is, added to, or replaced. Ideally the version here
# should match the one used for staging the render queue and usage based licensing recipes.
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0c8431fc72742c110'}
self.deadline_client_linux_ami_map: Mapping[str, str] = {'us-west-2': 'ami-0aa3610842bc3534d'}

# (Optional) The name of the EC2 keypair to associate with the instances.
self.key_pair_name: Optional[str] = None
Expand Down
12 changes: 6 additions & 6 deletions examples/deadline/Local-Zone/python/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
packages=setuptools.find_packages(where="package"),

install_requires=[
"aws-cdk.aws-ec2==1.106.1",
"aws-cdk.aws-elasticloadbalancingv2==1.106.1",
"aws-cdk.aws-route53==1.106.1",
"aws-cdk.core==1.106.1",
"aws-rfdk==0.33.0",
"jsii==1.29.0",
"aws-cdk.aws-ec2==1.108.1",
"aws-cdk.aws-elasticloadbalancingv2==1.108.1",
"aws-cdk.aws-route53==1.108.1",
"aws-cdk.core==1.108.1",
"aws-rfdk==0.35.0",
"jsii==1.30.0",
],

python_requires=">=3.7",
Expand Down
10 changes: 5 additions & 5 deletions examples/deadline/Local-Zone/ts/bin/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ class AppConfig {

/**
* The version of Deadline to use on the render farm. Some examples of pinned version values are "10", "10.1", or
* "10.1.15"
* @default 10.1.15 is used, to match the worker AMI ID provided below
* "10.1.16"
* @default 10.1.16 is used, to match the worker AMI ID provided below
*/
public readonly deadlineVersion: string = '10.1.15';
public readonly deadlineVersion: string = '10.1.16';

/**
* A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.15.2 AMI ID from us-west-2
* A map of regions to Deadline Client Linux AMIs. As an example, the Linux Deadline 10.1.16.8 AMI ID from us-west-2
* is filled in. It can be used as-is, added to, or replaced. Ideally the version here should match the one in
* package.json used for staging the render queue and usage based licensing recipes.
*/
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0c8431fc72742c110'};
public readonly deadlineClientLinuxAmiMap: Record<string, string> = {['us-west-2']: 'ami-0aa3610842bc3534d'};

/**
* (Optional) The name of the EC2 keypair to associate with instances.
Expand Down
16 changes: 8 additions & 8 deletions examples/deadline/Local-Zone/ts/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "all-in-farm-local-zone",
"version": "0.33.0",
"version": "0.35.0",
"bin": {
"app": "bin/app.js"
},
Expand All @@ -13,17 +13,17 @@
"watch": "tsc -w"
},
"devDependencies": {
"@types/node": "^15.6.1",
"aws-cdk": "1.106.1",
"@types/node": "^15.12.2",
"aws-cdk": "1.108.1",
"ts-node": "^9.1.1",
"typescript": "~4.3.2"
},
"dependencies": {
"@aws-cdk/aws-ec2": "1.106.1",
"@aws-cdk/aws-elasticloadbalancingv2": "1.106.1",
"@aws-cdk/aws-route53": "1.106.1",
"@aws-cdk/core": "1.106.1",
"aws-rfdk": "0.33.0",
"@aws-cdk/aws-ec2": "1.108.1",
"@aws-cdk/aws-elasticloadbalancingv2": "1.108.1",
"@aws-cdk/aws-route53": "1.108.1",
"@aws-cdk/core": "1.108.1",
"aws-rfdk": "0.35.0",
"source-map-support": "^0.5.19"
}
}
2 changes: 1 addition & 1 deletion scripts/rfdk_build_environment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# SPDX-License-Identifier: Apache-2.0

# This is a helper script for entering a docker build environment suitable for
# building the RFDK. To use: Run this script from the root directory of the RFDK
# building the RFDK. To use: Run this script from the root directory of the RFDK
# repository.

# Make sure we're running from the root of the CDK repo
Expand Down

0 comments on commit dec2bbd

Please sign in to comment.