Skip to content

Commit 388f8a5

Browse files
michaelrossherronmichaelrossherron
committed
Updated netgen version for ci. Reverted base Windows AMI to server 2019
1 parent b16b760 commit 388f8a5

8 files changed

Lines changed: 50 additions & 43 deletions

File tree

‎infrastructure/ami-windows-studio.pkr.hcl‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ variable "installation_path" {
2727

2828
data "amazon-ami" "windows" {
2929
filters = {
30-
name = "packer-provisioned-windows-2022-intel-oneapi-*"
30+
name = "packer-provisioned-windows-2019-intel-oneapi-*"
3131
root-device-type = "ebs"
3232
}
3333

@@ -52,7 +52,7 @@ variable "skip_create_ami" {
5252
}
5353

5454
source "amazon-ebs" "windows" {
55-
ami_name = "packer-provisioned-windows-2022-febio-studio-${local.buildtime}"
55+
ami_name = "packer-provisioned-windows-2019-febio-studio-${local.buildtime}"
5656
instance_type = "c5a.8xlarge"
5757
source_ami = data.amazon-ami.windows.id
5858

@@ -75,7 +75,7 @@ source "amazon-ebs" "windows" {
7575
launch_block_device_mappings {
7676
device_name = "/dev/sda1"
7777
volume_size = 150
78-
volume_type = "gp2"
78+
volume_type = "gp3"
7979
delete_on_termination = true
8080
}
8181
}
@@ -109,24 +109,30 @@ build {
109109
env = local.environment
110110
}
111111

112+
# provisioner "powershell" {
113+
# script = "./common/windows/msmpi.ps1"
114+
# env = local.environment
115+
# }
116+
112117
provisioner "powershell" {
113-
script = "./common/windows/msmpi.ps1"
118+
script = "./common/windows/aws.ps1"
114119
env = local.environment
115120
}
116121

122+
# vcpkg
117123
provisioner "powershell" {
118-
script = "./common/windows/aws.ps1"
124+
script = "./common/windows/vcpkg-installer.ps1"
119125
env = local.environment
120126
}
121127

122-
# qt
123-
provisioner "windows-shell" {
124-
script = "./common/windows/qt.bat"
125-
env = local.environment
128+
#vcpkg packages
129+
provisioner "file" {
130+
source = "./common/windows/vcpkg.json"
131+
destination = "${local.vcpkg_package_path}\\"
126132
}
127133

128134
provisioner "powershell" {
129-
script = "./common/windows/install-builder.ps1"
135+
script = "./common/windows/vcpkg-package-install.ps1"
130136
env = local.environment
131137
}
132138

@@ -136,25 +142,31 @@ build {
136142
env = local.environment
137143
}
138144

139-
provisioner "powershell" {
140-
script = "./common/windows/ffmpeg.ps1"
145+
# itk
146+
provisioner "windows-shell" {
147+
script = "./common/windows/itk.bat"
141148
env = local.environment
142149
}
143150

144-
# vcpkg
145-
provisioner "powershell" {
146-
script = "./common/windows/vcpkg-installer.ps1"
151+
# sitk
152+
provisioner "windows-shell" {
153+
script = "./common/windows/sitk.bat"
147154
env = local.environment
148155
}
149156

150-
#vcpkg packages
151-
provisioner "file" {
152-
source = "./common/windows/vcpkg.json"
153-
destination = "${local.vcpkg_package_path}\\"
157+
# qt
158+
provisioner "windows-shell" {
159+
script = "./common/windows/qt.bat"
160+
env = local.environment
154161
}
155162

156163
provisioner "powershell" {
157-
script = "./common/windows/vcpkg-package-install.ps1"
164+
script = "./common/windows/install-builder.ps1"
165+
env = local.environment
166+
}
167+
168+
provisioner "powershell" {
169+
script = "./common/windows/ffmpeg.ps1"
158170
env = local.environment
159171
}
160172

@@ -182,18 +194,6 @@ build {
182194
env = local.environment
183195
}
184196

185-
# itk
186-
provisioner "windows-shell" {
187-
script = "./common/windows/itk.bat"
188-
env = local.environment
189-
}
190-
191-
# sitk
192-
provisioner "windows-shell" {
193-
script = "./common/windows/sitk.bat"
194-
env = local.environment
195-
}
196-
197197
# occt
198198
provisioner "windows-shell" {
199199
script = "./common/windows/occt.bat"
@@ -221,7 +221,7 @@ build {
221221
# sysprep for next launch
222222
provisioner "powershell" {
223223
inline = [
224-
"& 'C:\\Program Files\\Amazon\\EC2Launch\\EC2Launch.exe' sysprep"
224+
"C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule",
225225
]
226226
}
227227
}

‎infrastructure/ami-windows.pkr.hcl‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ data "amazon-parameterstore" "winrm_username" {
3434

3535
data "amazon-ami" "windows" {
3636
filters = {
37-
name = "Windows_Server-2022-English-Full-Base-*"
37+
name = "Windows_Server-2019-English-Full-Base-*"
3838
root-device-type = "ebs"
3939
}
4040

@@ -49,7 +49,7 @@ variable "skip_create_ami" {
4949
}
5050

5151
source "amazon-ebs" "windows" {
52-
ami_name = "packer-provisioned-windows-2022-intel-oneapi-${local.buildtime}"
52+
ami_name = "packer-provisioned-windows-2019-intel-oneapi-${local.buildtime}"
5353
instance_type = "c4.2xlarge"
5454
source_ami = data.amazon-ami.windows.id
5555
communicator = "winrm"
@@ -68,7 +68,7 @@ source "amazon-ebs" "windows" {
6868
launch_block_device_mappings {
6969
device_name = "/dev/sda1"
7070
volume_size = 100
71-
volume_type = "gp2"
71+
volume_type = "gp3"
7272
delete_on_termination = true
7373
}
7474
}
@@ -147,7 +147,7 @@ build {
147147
# # sysprep for next launch
148148
provisioner "powershell" {
149149
inline = [
150-
"& 'C:\\Program Files\\Amazon\\EC2Launch\\EC2Launch.exe' sysprep"
150+
"C:\\ProgramData\\Amazon\\EC2-Windows\\Launch\\Scripts\\InitializeInstance.ps1 -Schedule",
151151
]
152152
}
153153

‎infrastructure/common/linux/dependencies/netgen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ set -o errexit
33
set -o verbose
44

55
NETGEN="https://github.com/NGSolve/netgen.git"
6-
BRANCH="v6.2.2406"
6+
BRANCH="v6.2.2501"
77

88
build_and_install() {
99
local source=$1

‎infrastructure/common/linux/dependencies/python.sh‎

100644100755
File mode changed.

‎infrastructure/common/macos/netgen.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/zsh
22
pushd $SOURCE_PATH
33

4-
git clone --depth 1 --branch "v6.2.2406" "https://github.com/NGSolve/netgen.git"
4+
git clone --depth 1 --branch "v6.2.2501" "https://github.com/NGSolve/netgen.git"
55
pushd netgen
66
cmake . -L -B cmbuild \
77
-DCMAKE_BUILD_TYPE=Release \

‎infrastructure/common/windows/netgen.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
call "%ONEAPI_ROOT%setvars.bat" --force
22
pushd %SOURCE_PATH%
33
set SOURCE="https://github.com/NGSolve/netgen.git"
4-
set BRANCH="v6.2.2406"
4+
set BRANCH="v6.2.2501"
55

66
git clone --depth 1 --branch "%BRANCH%" "%SOURCE%" "%BRANCH%"
77
pushd %BRANCH%

‎infrastructure/common/windows/sitk.bat‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,15 @@ cmake . -LA -B cmbuild ^
1010
-DBUILD_EXAMPLES:BOOL=OFF ^
1111
-DBUILD_TESTING:BOOL=OFF ^
1212
-DBUILD_SHARED_LIBS:BOOL=OFF ^
13-
-DCMAKE_BUILD_TYPE=Release
13+
-DCMAKE_BUILD_TYPE=Release ^
14+
-DUSE_CCACHE=OFF ^
15+
-DWRAP_CSHARP=OFF ^
16+
-DWRAP_JAVA=OFF ^
17+
-DWRAP_LUA=OFF ^
18+
-DWRAP_PYTHON=OFF ^
19+
-DWRAP_R=OFF ^
20+
-DWRAP_RUBY=OFF ^
21+
-DWRAP_TCL=OFF
1422
pushd cmbuild
1523
msbuild /P:Configuration=Release /m:%NUMBER_OF_PROCESSORS% INSTALL.vcxproj
1624
popd

‎infrastructure/common/windows/vcpkg.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
{
2+
"builtin-baseline": "f415cba6374936225962ef0fcd262ba09fdb84ce",
23
"dependencies": [
34
"eigen3",
4-
"glew",
55
"libssh",
6-
"mpi",
76
"opengl",
87
"openssl",
98
"pthread",

0 commit comments

Comments
 (0)