diff --git a/examples/templates/tenant/tenant/config.yml b/examples/templates/tenant/tenant/config.yml index bd5a2d1f..ac8b8b6f 100644 --- a/examples/templates/tenant/tenant/config.yml +++ b/examples/templates/tenant/tenant/config.yml @@ -29,18 +29,17 @@ ec2_runner_specs: ami_kms_key_arn: runner_os: runner_architecture: - runner_user: ubuntu + runner_user: placement: - host_resource_group_arn: arn:aws:resource-groups:eu-west-1:123456789012:group/acme-dedicated-hosts + host_resource_group_arn: tenancy: host - availability_zone: eu-west-1b - license_specifications: - - license_configuration_arn: arn:aws:license-manager:eu-west-1:123456789012:license-configuration:lic-0123456789abcdef0 - use_dedicated_host: true - vpc_id: vpc-0abc1234def567890 - subnet_ids: - - subnet-0abc1234def567890 + availability_zone: max_instances: + license_specifications: + use_dedicated_host: + vpc_id: + subnet_ids: + - instance_types: - pool_config: diff --git a/modules/platform/ec2_deployment/main.tf b/modules/platform/ec2_deployment/main.tf index fd504efb..e8bfdc28 100644 --- a/modules/platform/ec2_deployment/main.tf +++ b/modules/platform/ec2_deployment/main.tf @@ -68,9 +68,9 @@ module "runners" { # Retention period for the logs in days. logging_retention_in_days = var.runner_configs.logging_retention_in_days - webhook_lambda_zip = "/tmp/${var.runner_configs.prefix}/webhook.zip" - runner_binaries_syncer_lambda_zip = "/tmp/${var.runner_configs.prefix}/runner-binaries-syncer.zip" - runners_lambda_zip = "/tmp/${var.runner_configs.prefix}/runners.zip" + webhook_lambda_zip = "${data.external.download_lambdas.result.path}/webhook.zip" + runner_binaries_syncer_lambda_zip = "${data.external.download_lambdas.result.path}/runner-binaries-syncer.zip" + runners_lambda_zip = "${data.external.download_lambdas.result.path}/runners.zip" # Configure the various types of runners we provide, along with on-demand # versus standby pools, etc. diff --git a/modules/platform/ec2_deployment/scripts/download_lambdas.sh b/modules/platform/ec2_deployment/scripts/download_lambdas.sh index 1b154ec7..9591d2c6 100755 --- a/modules/platform/ec2_deployment/scripts/download_lambdas.sh +++ b/modules/platform/ec2_deployment/scripts/download_lambdas.sh @@ -9,12 +9,18 @@ fi DOWNLOAD_PATH="$1" VERSION="$2" -rm -rf "$DOWNLOAD_PATH" -mkdir -p "$DOWNLOAD_PATH" +if [ -n "$USE_CACHE" ] && [ -n "$CACHE_PATH" ] && [ -d "$CACHE_PATH" ]; then + echo "USE_CACHE is set and $CACHE_PATH exists, skipping download." >&2 + DOWNLOAD_PATH="$CACHE_PATH" + VERSION="local-cache" +else + rm -rf "$DOWNLOAD_PATH" + mkdir -p "$DOWNLOAD_PATH" -# Download files to the specified director -wget --no-verbose -P "$DOWNLOAD_PATH" "https://github.com/github-aws-runners/terraform-aws-github-runner/releases/download/${VERSION}/runner-binaries-syncer.zip" -wget --no-verbose -P "$DOWNLOAD_PATH" "https://github.com/github-aws-runners/terraform-aws-github-runner/releases/download/${VERSION}/runners.zip" -wget --no-verbose -P "$DOWNLOAD_PATH" "https://github.com/github-aws-runners/terraform-aws-github-runner/releases/download/${VERSION}/webhook.zip" + # Download files to the specified directory + wget --no-verbose -P "$DOWNLOAD_PATH" "https://github.com/github-aws-runners/terraform-aws-github-runner/releases/download/${VERSION}/runner-binaries-syncer.zip" + wget --no-verbose -P "$DOWNLOAD_PATH" "https://github.com/github-aws-runners/terraform-aws-github-runner/releases/download/${VERSION}/runners.zip" + wget --no-verbose -P "$DOWNLOAD_PATH" "https://github.com/github-aws-runners/terraform-aws-github-runner/releases/download/${VERSION}/webhook.zip" +fi -echo -n "{\"version\":\"${VERSION}\"}" +echo -n "{\"version\":\"${VERSION}\",\"path\":\"${DOWNLOAD_PATH}\"}"