Rebuild windows images

sdarwin · sdarwin · commit 38252f60142e · 2023-08-16T18:10:03.000Z
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml
@@ -26,7 +26,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202306161254'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202308031506'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml
@@ -26,7 +26,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202306161254'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202308031506'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml
@@ -26,7 +26,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-focal-arm64-202306161254'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-focal-arm64-202308031506'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml
@@ -26,7 +26,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-focal-amd64-202306161254'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-focal-amd64-202308031506'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml
@@ -27,7 +27,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202306161254'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202308031506'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml b/examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml
@@ -27,7 +27,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202306161254'] }
+  ami_filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202308031506'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml
@@ -23,7 +23,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2019-amd64-202307212221'] }
+  ami_filter: { 'name': ['github-runner-windows-2019-amd64-202308161544'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml b/examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml
@@ -24,7 +24,7 @@ runner_config:
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
   ami_owners: [ "047402373783" ]
-  ami_filter: { 'name': ['github-runner-windows-2022-amd64-202306202311'] }
+  ami_filter: { 'name': ['github-runner-windows-2022-amd64-202308161544'] }
   block_device_mappings:
     - device_name: /dev/sda1
       delete_on_termination: true
diff --git a/images/ubuntu-bionic-arm64-cppal/manifest.json b/images/ubuntu-bionic-arm64-cppal/manifest.json
@@ -8,7 +8,16 @@
       "artifact_id": "us-west-2:ami-02f1d27de34ac7ae4",
       "packer_run_uuid": "2611bb8c-0f51-975e-5a9a-64f87224a5d2",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1691075921,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0ad135e7fd0f1313f",
+      "packer_run_uuid": "bf81201e-56bd-0f14-c8ed-f04d768e74b9",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "2611bb8c-0f51-975e-5a9a-64f87224a5d2"
+  "last_run_uuid": "bf81201e-56bd-0f14-c8ed-f04d768e74b9"
 }
diff --git a/images/ubuntu-bionic-cppal/manifest.json b/images/ubuntu-bionic-cppal/manifest.json
@@ -0,0 +1,14 @@
+{
+  "builds": [
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1691076099,
+      "files": null,
+      "artifact_id": "us-west-2:ami-09882530fd7b06926",
+      "packer_run_uuid": "c38681f5-7f9a-1388-8772-a63bb87b5d08",
+      "custom_data": null
+    }
+  ],
+  "last_run_uuid": "c38681f5-7f9a-1388-8772-a63bb87b5d08"
+}
diff --git a/images/ubuntu-focal-arm64-cppal/manifest.json b/images/ubuntu-focal-arm64-cppal/manifest.json
@@ -0,0 +1,14 @@
+{
+  "builds": [
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1691076048,
+      "files": null,
+      "artifact_id": "us-west-2:ami-085b225767c4ac0c7",
+      "packer_run_uuid": "896675fc-9003-3b8e-1893-2c1df23682fd",
+      "custom_data": null
+    }
+  ],
+  "last_run_uuid": "896675fc-9003-3b8e-1893-2c1df23682fd"
+}
diff --git a/images/ubuntu-focal-cppal/manifest.json b/images/ubuntu-focal-cppal/manifest.json
@@ -0,0 +1,14 @@
+{
+  "builds": [
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1691076038,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0376b5b60450d00e2",
+      "packer_run_uuid": "34166a29-ccf1-4a4c-8675-3ac036b5e9e9",
+      "custom_data": null
+    }
+  ],
+  "last_run_uuid": "34166a29-ccf1-4a4c-8675-3ac036b5e9e9"
+}
diff --git a/images/ubuntu-jammy-arm64-cppal/manifest.json b/images/ubuntu-jammy-arm64-cppal/manifest.json
@@ -0,0 +1,14 @@
+{
+  "builds": [
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1691075805,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0f8b73d040984706b",
+      "packer_run_uuid": "ad7a1fc3-de05-8755-7c02-1dc23359ce06",
+      "custom_data": null
+    }
+  ],
+  "last_run_uuid": "ad7a1fc3-de05-8755-7c02-1dc23359ce06"
+}
diff --git a/images/ubuntu-jammy-cppal/manifest.json b/images/ubuntu-jammy-cppal/manifest.json
@@ -8,7 +8,16 @@
       "artifact_id": "us-west-2:ami-009a279a109a34e09",
       "packer_run_uuid": "50c8102f-7229-9f34-51c0-301997dfd430",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1691075926,
+      "files": null,
+      "artifact_id": "us-west-2:ami-033177fd61cf8e25d",
+      "packer_run_uuid": "bfa632c9-1896-4006-5a2c-42871d15c695",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "50c8102f-7229-9f34-51c0-301997dfd430"
+  "last_run_uuid": "bfa632c9-1896-4006-5a2c-42871d15c695"
 }
diff --git a/images/windows-2019-cppal/manifest.json b/images/windows-2019-cppal/manifest.json
@@ -8,7 +8,34 @@
       "artifact_id": "us-west-2:ami-0d3905ec987855806",
       "packer_run_uuid": "cb737a47-8eae-8bc8-a815-7b5b28dad74e",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1692136584,
+      "files": null,
+      "artifact_id": "us-west-2:ami-07cb842ccc3adaecf",
+      "packer_run_uuid": "05f00002-788c-b243-3b10-fba119c72460",
+      "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1692143153,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0bce8b41e89def1db",
+      "packer_run_uuid": "8df4a827-4c76-b221-21a1-ba4c522ac527",
+      "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1692205146,
+      "files": null,
+      "artifact_id": "us-west-2:ami-0841a945303463903",
+      "packer_run_uuid": "b680b1cb-82d5-c624-9bab-4a0a35a563e9",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "cb737a47-8eae-8bc8-a815-7b5b28dad74e"
+  "last_run_uuid": "b680b1cb-82d5-c624-9bab-4a0a35a563e9"
 }
diff --git a/images/windows-2019-cppal/variables.auto.pkrvars.hcl b/images/windows-2019-cppal/variables.auto.pkrvars.hcl
@@ -11,6 +11,7 @@ ssh_keypair_name = "cppalliance-us-west-2-kp"
 ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
 
 custom_shell_commands = [
+"Set-PSDebug -Trace 1",
 "cd C:\\",
 "# already installed: powershell -Command iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1'))",
 "choco feature enable -n allowGlobalConfirmation",
@@ -72,6 +73,6 @@ custom_shell_commands = [
 "copy \"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\10.0.18362.0\\x64\\rcdll.dll\" \"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x86\\rcdll.dll\"",
 "net user /add Administrator2 Testwin1234!",
 "net localgroup administrators Administrator2 /add",
-"echo almost done",
-"pwd"
+"Set-LocalUser -Name 'Administrator2' -PasswordNeverExpires 1",
+"echo __done__"
 ]
diff --git a/images/windows-2022-cppal/manifest.json b/images/windows-2022-cppal/manifest.json
@@ -8,7 +8,25 @@
       "artifact_id": "us-west-2:ami-00916f8613dbf8b5b",
       "packer_run_uuid": "b0043129-f0ee-b545-9bd7-90d79b6ad1a2",
       "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1692198462,
+      "files": null,
+      "artifact_id": "us-west-2:ami-00a9cd5e0d602aeac",
+      "packer_run_uuid": "7cf34c3b-2118-deb2-adb0-032cfe1b5d3c",
+      "custom_data": null
+    },
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1692203467,
+      "files": null,
+      "artifact_id": "us-west-2:ami-029863b793a310918",
+      "packer_run_uuid": "76e2992b-3db9-be5f-1cb5-640aa3466534",
+      "custom_data": null
     }
   ],
-  "last_run_uuid": "b0043129-f0ee-b545-9bd7-90d79b6ad1a2"
+  "last_run_uuid": "76e2992b-3db9-be5f-1cb5-640aa3466534"
 }
diff --git a/images/windows-2022-cppal/variables.auto.pkrvars.hcl b/images/windows-2022-cppal/variables.auto.pkrvars.hcl
@@ -11,6 +11,7 @@ ssh_keypair_name = "cppalliance-us-west-2-kp"
 ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
 
 custom_shell_commands = [
+"Set-PSDebug -Trace 1",
 "cd C:\\",
 "choco feature enable -n allowGlobalConfirmation",
 "# if --version is mentioned, the version has been checked, and the package installed",
@@ -74,7 +75,9 @@ custom_shell_commands = [
 "# choco install -y wsl",
 "choco install -y python --version 3.11.3",
 "New-Item -ItemType SymbolicLink -Path \"C:\\Git\" -Target \"C:\\Program Files\\Git\"",
-"# Adding visualstudio2022",
+"echo Adding visualstudio2022",
+"# visualstudio2022-workload-vctools failed last time. Add a sleep command.",
+"Start-Sleep -Seconds 10",
 "choco install visualstudio2022-workload-vctools --package-parameters \"--add Microsoft.VisualStudio.Component.VC.14.34.17.4.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.14.29.16.11.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.v141.x86.x64\" \"--add Microsoft.VisualStudio.Component.VC.140\" -y ",
 "$${oldpath} = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\\System\\CurrentControlSet\\Control\\Session Manager\\Environment' -Name PATH).path",
 "$${newpath} = \"C:\\Git\\usr\\bin;$${oldpath}\"",
@@ -85,6 +88,6 @@ custom_shell_commands = [
 
 "net user /add Administrator2 Testwin1234!",
 "net localgroup administrators Administrator2 /add",
-"echo almost done",
-"pwd"
+"Set-LocalUser -Name 'Administrator2' -PasswordNeverExpires 1",
+"echo __done__"
 ]
diff --git a/scripts/modify_ami_owners.sh b/scripts/modify_ami_owners.sh
@@ -4,7 +4,7 @@ set -xe
 
 # Prod
 ami_account=047402373783
-# 
+#
 # Test account, boost v2:
 ami_account=254949769574
 
diff --git a/scripts/packerimages.sh b/scripts/packerimages.sh
@@ -18,12 +18,6 @@ build_environment=prod
 # windows-2022-cppal
 
 imagestobuild="
-ubuntu-bionic-arm64-cppal
-ubuntu-bionic-cppal
-ubuntu-focal-arm64-cppal
-ubuntu-focal-cppal
-ubuntu-jammy-arm64-cppal
-ubuntu-jammy-cppal
 windows-2019-cppal
 windows-2022-cppal
 "
diff --git a/scripts/prod_amis.sh b/scripts/prod_amis.sh
@@ -7,14 +7,14 @@ set -xe
 
 declare -A all_amis
 
-all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202306161254
-all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202306161254
-all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202306161254
-all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202306161254
-all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202306161254
-all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202306161254
-all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202307212221
-all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202306202311
+all_amis[ubuntu-bionic-arm64.yaml]=github-runner-ubuntu-bionic-arm64-202308031506
+all_amis[ubuntu-bionic.yaml]=github-runner-ubuntu-bionic-amd64-202308031506
+all_amis[ubuntu-focal-arm64.yaml]=github-runner-ubuntu-focal-arm64-202308031506
+all_amis[ubuntu-focal.yaml]=github-runner-ubuntu-focal-amd64-202308031506
+all_amis[ubuntu-jammy-arm64.yaml]=github-runner-ubuntu-jammy-arm64-202308031506
+all_amis[ubuntu-jammy.yaml]=github-runner-ubuntu-jammy-amd64-202308031506
+all_amis[windows-2019.yaml]=github-runner-windows-2019-amd64-202308161544
+all_amis[windows-2022.yaml]=github-runner-windows-2022-amd64-202308161544
 
 # Update the templates with the above values
 
diff --git a/scripts/removeamis_part1.sh b/scripts/removeamis_part1.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Discover amis to delete
+
+set -e
+
+region=us-west-2
+amis=""
+
+results=$(aws ec2 describe-images --owners self --query 'Images[*].[Name,ImageId]' --output text --region $region)
+
+echo "all results:"
+echo "$results"
+echo " "
+
+IFS='
+'
+
+for result in $results; do
+    # echo "ami is $result"
+    ami_name=$(echo "$result" | cut -f1)
+    # echo "ami_name is $ami_name"
+    ami_id=$(echo "$result" | cut -f2)
+    # echo "ami_id is $ami_id"
+    if grep $ami_name ../examples/multi-runner-cppal/templates/runner-configs/*.yaml ; then
+        # ami is in use
+        true
+    else
+        amis="${amis}\n${ami_id}"
+    fi
+done
+
+echo " "
+echo "to remove:"
+echo -e "$amis"
+echo " "
diff --git a/scripts/removeamis_part2.sh b/scripts/removeamis_part2.sh
@@ -6,21 +6,10 @@ set -xe
 
 # aws ec2 describe-images --owners self --query 'Images[*].[Name,ImageId]' --output text --region us-west-2 > output.out
 
+test="
+"
+
 amis="
-ami-04aabf193c156dd72
-ami-08a1f288959c2d8cc
-ami-0c802449bdf8d981e
-ami-0a2e8524783d512eb
-ami-029f82a5bf6a7d634
-ami-0c549427a64402d3a
-ami-08b6c8a835ed9332b
-ami-0ac23aae25fdc4df9
-ami-0a04141dcc0980740
-ami-00a47faeeb02d03f0
-ami-0e6220d742fc51b57
-ami-09035050dec8b0d4d
-ami-0fb62047befcdd856
-ami-0d3cb1d97dab8043f
 "
 
 region=us-west-2
@@ -32,4 +21,3 @@ for ami in ${amis}; do
     aws ec2 deregister-image --image-id ${ami}
     for SNAPSHOT in $snapshots ; do aws ec2 delete-snapshot --snapshot-id $SNAPSHOT; done
 done
-
