Skip to content

Commit b944e3f

Browse files
committed
R2024a release!
1 parent 2f19148 commit b944e3f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+21274
-21265
lines changed

packer/v1/build-matlab-ami.pkr.hcl

+17-10
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023-2024 The MathWorks Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
# The following variables may have different value across releases and
44
# it is recommended to modify them via the release-specific configuration file.
@@ -29,15 +29,10 @@ variable "RELEASE" {
2929
}
3030
}
3131

32-
variable "BASE_AMI" {
32+
variable "BASE_AMI_NAME" {
3333
type = string
34-
default = "ami-07543813a68cc4fe9"
35-
description = "Default AMI ID refers to the Ubuntu Server 22.04 image provided by Canonical."
36-
37-
validation {
38-
condition = substr(var.BASE_AMI, 0, 4) == "ami-"
39-
error_message = "The BASE_AMI must start with \"ami-\"."
40-
}
34+
default = "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"
35+
description = "Default AMI name refers to the Ubuntu Server 22.04 image provided by Canonical."
4136
}
4237

4338
variable "BUILD_SCRIPTS" {
@@ -136,6 +131,8 @@ variable "AMI_TAGS" {
136131
Name = "Packer Build"
137132
Build = "MATLAB"
138133
Type = "matlab-on-aws"
134+
Base_AMI_ID = "{{ .SourceAMI }}"
135+
Base_AMI_Name = "{{ .SourceAMIName }}"
139136
}
140137
description = "The tags Packer adds to the resultant machine image."
141138
}
@@ -169,7 +166,15 @@ source "amazon-ebs" "AMI_Builder" {
169166
volume_type = "gp2"
170167
}
171168
region = "us-east-1"
172-
source_ami = "${var.BASE_AMI}"
169+
source_ami_filter {
170+
filters = {
171+
"virtualization-type" = "hvm"
172+
"name" = "${var.BASE_AMI_NAME}"
173+
"root-device-type" = "ebs"
174+
}
175+
owners = ["099720109477"] # Canonical's owner ID https://documentation.ubuntu.com/aws/en/latest/aws-how-to/instances/find-ubuntu-images/
176+
most_recent = true
177+
}
173178
ssh_username = "ubuntu"
174179
run_tags = "${var.INSTANCE_TAGS}"
175180
tags = "${var.AMI_TAGS}"
@@ -235,6 +240,8 @@ build {
235240
specified_products = "${var.PRODUCTS}"
236241
specified_spkgs = "${var.SPKGS}"
237242
build_scripts = join(", ", "${var.BUILD_SCRIPTS}")
243+
base_ami_id = "{{ .SourceAMI }}"
244+
base_ami_name = "{{ .SourceAMIName }}"
238245
}
239246
}
240247
}

packer/v1/build/cleanup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright 2023 The MathWorks Inc.
3+
# Copyright 2023-2024 The MathWorks, Inc.
44

55
# Exit on any failure, treat unset substitution variables as errors
66
set -euo pipefail

packer/v1/build/config/matlab/generate_toolbox_cache.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The MathWorks Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22
"""! @brief Python program to generate the toolbox-cache xml for MATLAB
33
44
generate_toolbox_cache.py file takes matlabroot and toolbox-cache xml destination folder as inputs,

packer/v1/build/config/matlab/mhlmvars.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The MathWorks Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
# Placed in profile.d to run at login
44

packer/v1/build/config/matlab/mlm_def.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# The file is read when starting a shell session.
55
####################
66

7-
# Copyright 2024 The MathWorks Inc.
7+
# Copyright 2024 The MathWorks, Inc.
88

99
# MLM_LICENSE_FILE: License MATLAB using a license file.
1010
# Change this line to license MATLAB with:

packer/v1/build/config/matlab/mw_context_tag.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 The MathWorks Inc.
1+
# Copyright 2023-2024 The MathWorks, Inc.
22

33
# The following environment variable allows MathWorks to understand how this MathWorks
44
# product (MATLAB on AWS) is being used. This information helps us make MATLAB even better.

0 commit comments

Comments
 (0)