Re-enable Ubuntu 22 builds

Fix two issues with Ubuntu builds.  First, the 2 minute timeout
before APT settles down appears slightly too short (sometimes),
so go for 5 minutes.  Second, always force the non-interactive
frontend to apt/apt-get, so that Ubuntu 22.04 stops prompting for
which services to restart (which hangs the build process)

Signed-off-by: Brian Barrett <[email protected]>

Author: bwbarrett

jenkins/customize-ami.sh

@@ -59,11 +59,6 @@ while getopts "h?tb" opt; do
     esac
 done
 
-echo "==> Sleeping 2 minutes"
-# Some systems run package updates during boot.  Avoid yum/apt/zypper
-# lock conflicts by waiting a couple minutes.
-sleep 120
-
 pandoc_installed=0
 
 case $PLATFORM_ID in

jenkins/jenkins-amis.hcl

@@ -160,6 +160,68 @@
     "associate_public_ip_address" : true,
     "ena_support" : true,
     "iam_instance_profile" : "{{user `iam_role`}}"
+  },{
+    "type": "amazon-ebs",
+    "name" : "Ubuntu22.04-x86",
+    "ami_name": "Jenkins Ubuntu 22.04 x86_64 {{user `build_date`}}",
+    "region": "us-west-2",
+    "source_ami_filter": {
+        "filters": {
+            "architecture": "x86_64",
+            "virtualization-type": "hvm",
+            "root-device-type": "ebs",
+            "name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-amd64-server-*"
+        },
+        "owners": ["099720109477"],
+        "most_recent": true
+    },
+    "ami_block_device_mappings": [ {
+        "device_name": "/dev/sda1",
+        "volume_size": 16,
+        "delete_on_termination": true
+        } ],
+    "launch_block_device_mappings": [ {
+        "device_name": "/dev/sda1",
+        "volume_size": 16,
+        "delete_on_termination": true
+    } ],
+    "instance_type": "t3.micro",
+    "ssh_username": "ubuntu",
+    "ssh_pty" : true,
+    "associate_public_ip_address" : true,
+    "ena_support" : true,
+    "iam_instance_profile" : "{{user `iam_role`}}"
+  },{
+    "type": "amazon-ebs",
+    "name" : "Ubuntu22.04-arm64",
+    "ami_name": "Jenkins Ubuntu 22.04 arm64 {{user `build_date`}}",
+    "region": "us-west-2",
+    "source_ami_filter": {
+        "filters": {
+            "architecture": "arm64",
+            "virtualization-type": "hvm",
+            "root-device-type": "ebs",
+            "name": "ubuntu/images/hvm-ssd/ubuntu-jammy-22.04-arm64-server-*"
+        },
+        "owners": ["099720109477"],
+        "most_recent": true
+    },
+    "ami_block_device_mappings": [ {
+        "device_name": "/dev/sda1",
+        "volume_size": 16,
+        "delete_on_termination": true
+        } ],
+    "launch_block_device_mappings": [ {
+        "device_name": "/dev/sda1",
+        "volume_size": 16,
+        "delete_on_termination": true
+    } ],
+    "instance_type": "t4g.micro",
+    "ssh_username": "ubuntu",
+    "ssh_pty" : true,
+    "associate_public_ip_address" : true,
+    "ena_support" : true,
+    "iam_instance_profile" : "{{user `iam_role`}}"
   },{
     "type": "amazon-ebs",
     "name" : "RHEL7-x86",
@@ -319,6 +381,7 @@
   }],
   "provisioners": [{
     "type": "shell",
+    "pause_before": "5m",
     "script" : "customize-ami.sh"
   }]
 }