Enable dev/prod environments

Author: sdarwin

examples/multi-runner-cppal/main.tf

@@ -44,7 +44,7 @@ module "multi-runner" {
   #    }
   #  }
   aws_region                        = local.aws_region
-  key_name                          = "cppalliance-us-west-2-kp"
+  key_name                          = var.key_name
   vpc_id                            = module.base.vpc.vpc_id
   subnet_ids                        = module.base.vpc.private_subnets
   runners_scale_up_lambda_timeout   = 60

examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic-arm64.yaml

@@ -25,8 +25,7 @@ runner_config:
   runners_maximum_count: 50
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-ubuntu-bionic-arm64-202306161254'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/ubuntu-bionic.yaml

@@ -25,8 +25,7 @@ runner_config:
   runners_maximum_count: 50
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-ubuntu-bionic-amd64-202306161254'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal-arm64.yaml

@@ -25,8 +25,7 @@ runner_config:
   runners_maximum_count: 50
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-ubuntu-focal-arm64-202306161254'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/ubuntu-focal.yaml

@@ -25,8 +25,7 @@ runner_config:
   runners_maximum_count: 200
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-ubuntu-focal-amd64-202306161254'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy-arm64.yaml

@@ -26,8 +26,7 @@ runner_config:
   runners_maximum_count: 50
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-ubuntu-jammy-arm64-202306161254'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/ubuntu-jammy.yaml

@@ -26,8 +26,7 @@ runner_config:
   runners_maximum_count: 200
   scale_down_schedule_expression: cron(* * * * ? *)
   # userdata_template: ./templates/user-data.sh
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-ubuntu-jammy-amd64-202306161254'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/windows-2019.yaml

@@ -22,8 +22,7 @@ runner_config:
   runners_maximum_count: 100
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-windows-2019-amd64-202307212221'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/templates/runner-configs/windows-2022.yaml

@@ -23,8 +23,7 @@ runner_config:
   runners_maximum_count: 100
   scale_down_schedule_expression: cron(* * * * ? *)
   runner_boot_time_in_minutes: 20
-  ami_owners:
-    - "047402373783"
+  ami_owners: [ "047402373783" ]
   ami_filter: { 'name': ['github-runner-windows-2022-amd64-202306202311'] }
   block_device_mappings:
     - device_name: /dev/sda1

examples/multi-runner-cppal/variables.tf

@@ -17,6 +17,11 @@ variable "aws_region" {
   default = "us-west-2"
 }
 
+variable "key_name" {
+  type    = string
+  default = "cppalliance-us-west-2-kp"
+}
+
 variable "aws_default_vpc" {
   type    = string
   default = null

images/ubuntu-bionic-arm64-cppal/dev.pkrvars.hcl

@@ -0,0 +1,4 @@
+
+ssh_keypair_name = "tagr-us-west-2"
+ssh_private_key_file = "/home/sam/work/cppalliance/aws/boost.v2.account/tagr-us-west-2.pem"
+disable_docker_registry = true

images/ubuntu-bionic-arm64-cppal/github_agent.ubuntu.pkr.hcl

@@ -7,6 +7,24 @@ packer {
   }
 }
 
+variable "ssh_keypair_name" {
+  description = "SSH keypair name"
+  type        = string
+  default     = null
+}
+
+variable "ssh_private_key_file" {
+  description = "SSH private key file"
+  type        = string
+  default     = null
+}
+
+variable "disable_docker_registry" {
+  description = "SSH private key file"
+  type        = string
+  default     = "false"
+}
+
 variable "runner_version" {
   description = "The version (no v prefix) of the runner software to install https://github.com/actions/runner/releases. The latest release will be fetched from GitHub if not provided."
   default     = null
@@ -135,11 +153,13 @@ build {
   ]
   provisioner "shell" {
     environment_vars = [
-      "DEBIAN_FRONTEND=noninteractive"
+      "DEBIAN_FRONTEND=noninteractive",
+      "DISABLE_DOCKER_REGISTRY=${var.disable_docker_registry}"
     ]
     inline = concat([
       "sudo cloud-init status --wait",
       "sudo apt-get update",
+      "env",
       "sudo apt-get -y install ca-certificates curl gnupg lsb-release",
       "sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg",
       "echo deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null",

images/ubuntu-bionic-arm64-cppal/manifest.json

@@ -0,0 +1,14 @@
+{
+  "builds": [
+    {
+      "name": "githubrunner",
+      "builder_type": "amazon-ebs",
+      "build_time": 1690935091,
+      "files": null,
+      "artifact_id": "us-west-2:ami-02f1d27de34ac7ae4",
+      "packer_run_uuid": "2611bb8c-0f51-975e-5a9a-64f87224a5d2",
+      "custom_data": null
+    }
+  ],
+  "last_run_uuid": "2611bb8c-0f51-975e-5a9a-64f87224a5d2"
+}

images/ubuntu-bionic-arm64-cppal/variables.auto.pkrvars.hcl

@@ -7,8 +7,12 @@
 region = "us-west-2"
 instance_type = "t4g.xlarge"
 root_volume_size_gb = 30
+ssh_keypair_name = "cppalliance-us-west-2-kp"
+ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
+
 custom_shell_commands = [
 "set -xe",
+"env",
 "sudo mkdir -p /etc/apt/apt.conf.d/",
 "echo 'APT::Acquire::Retries \"10\";' | sudo tee /etc/apt/apt.conf.d/80-retries",
 "echo 'APT::Get::Assume-Yes \"true\";' | sudo tee /etc/apt/apt.conf.d/90assumeyes",
@@ -26,7 +30,7 @@ custom_shell_commands = [
 "sudo systemctl stop unattended-upgrades",
 "sudo systemctl disable unattended-upgrades",
 "sudo apt-get purge -y unattended-upgrades",
-"echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
+"$DISABLE_DOCKER_REGISTRY || echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
 ]
 
 # # Custom LLVM install. Switching to standard clang packages

images/ubuntu-bionic-cppal/dev.pkrvars.hcl

@@ -0,0 +1,4 @@
+
+ssh_keypair_name = "tagr-us-west-2"
+ssh_private_key_file = "/home/sam/work/cppalliance/aws/boost.v2.account/tagr-us-west-2.pem"
+disable_docker_registry = true

images/ubuntu-bionic-cppal/github_agent.ubuntu.pkr.hcl

@@ -7,6 +7,24 @@ packer {
   }
 }
 
+variable "ssh_keypair_name" {
+  description = "SSH keypair name"
+  type        = string
+  default     = null
+}
+
+variable "ssh_private_key_file" {
+  description = "SSH private key file"
+  type        = string
+  default     = null
+}
+
+variable "disable_docker_registry" {
+  description = "SSH private key file"
+  type        = string
+  default     = "false"
+}
+
 variable "runner_version" {
   description = "The version (no v prefix) of the runner software to install https://github.com/actions/runner/releases. The latest release will be fetched from GitHub if not provided."
   default     = null
@@ -135,7 +153,8 @@ build {
   ]
   provisioner "shell" {
     environment_vars = [
-      "DEBIAN_FRONTEND=noninteractive"
+      "DEBIAN_FRONTEND=noninteractive",
+      "DISABLE_DOCKER_REGISTRY=${var.disable_docker_registry}"
     ]
     inline = concat([
       "sudo cloud-init status --wait",

images/ubuntu-bionic-cppal/variables.auto.pkrvars.hcl

@@ -7,6 +7,9 @@
 region = "us-west-2"
 instance_type = "t2.xlarge"
 root_volume_size_gb = 30
+ssh_keypair_name = "cppalliance-us-west-2-kp"
+ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
+
 custom_shell_commands = [
 "set -xe",
 "sudo mkdir -p /etc/apt/apt.conf.d/",
@@ -26,7 +29,7 @@ custom_shell_commands = [
 "sudo systemctl stop unattended-upgrades",
 "sudo systemctl disable unattended-upgrades",
 "sudo apt-get purge -y unattended-upgrades",
-"echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
+"$DISABLE_DOCKER_REGISTRY || echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
 ]
 
 # # Custom LLVM install. Switching to standard clang packages.

images/ubuntu-focal-arm64-cppal/dev.pkrvars.hcl

@@ -0,0 +1,4 @@
+
+ssh_keypair_name = "tagr-us-west-2"
+ssh_private_key_file = "/home/sam/work/cppalliance/aws/boost.v2.account/tagr-us-west-2.pem"
+disable_docker_registry = true

images/ubuntu-focal-arm64-cppal/github_agent.ubuntu.pkr.hcl

@@ -7,6 +7,24 @@ packer {
   }
 }
 
+variable "ssh_keypair_name" {
+  description = "SSH keypair name"
+  type        = string
+  default     = null
+}
+
+variable "ssh_private_key_file" {
+  description = "SSH private key file"
+  type        = string
+  default     = null
+}
+
+variable "disable_docker_registry" {
+  description = "SSH private key file"
+  type        = string
+  default     = "false"
+}
+
 variable "runner_version" {
   description = "The version (no v prefix) of the runner software to install https://github.com/actions/runner/releases. The latest release will be fetched from GitHub if not provided."
   default     = null
@@ -135,7 +153,8 @@ build {
   ]
   provisioner "shell" {
     environment_vars = [
-      "DEBIAN_FRONTEND=noninteractive"
+      "DEBIAN_FRONTEND=noninteractive",
+      "DISABLE_DOCKER_REGISTRY=${var.disable_docker_registry}"
     ]
     inline = concat([
       "sudo cloud-init status --wait",

images/ubuntu-focal-arm64-cppal/variables.auto.pkrvars.hcl

@@ -7,6 +7,9 @@
 region = "us-west-2"
 instance_type = "t4g.xlarge"
 root_volume_size_gb = 30
+ssh_keypair_name = "cppalliance-us-west-2-kp"
+ssh_private_key_file = "/root/.ssh/cppalliance-us-west-2-kp.pem"
+
 custom_shell_commands = [
 "set -xe",
 "sudo mkdir -p /etc/apt/apt.conf.d/",
@@ -28,7 +31,7 @@ custom_shell_commands = [
 "sudo systemctl stop unattended-upgrades",
 "sudo systemctl disable unattended-upgrades",
 "sudo apt-get purge -y unattended-upgrades",
-"echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
+"$DISABLE_DOCKER_REGISTRY || echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
 ]
 
 # # custom LLVM install. Switching to standard clang packages.

images/ubuntu-focal-cppal/dev.pkrvars.hcl

@@ -0,0 +1,4 @@
+
+ssh_keypair_name = "tagr-us-west-2"
+ssh_private_key_file = "/home/sam/work/cppalliance/aws/boost.v2.account/tagr-us-west-2.pem"
+disable_docker_registry = true

images/ubuntu-focal-cppal/github_agent.ubuntu.pkr.hcl

@@ -7,6 +7,24 @@ packer {
   }
 }
 
+variable "ssh_keypair_name" {
+  description = "SSH keypair name"
+  type        = string
+  default     = null
+}
+
+variable "ssh_private_key_file" {
+  description = "SSH private key file"
+  type        = string
+  default     = null
+}
+
+variable "disable_docker_registry" {
+  description = "SSH private key file"
+  type        = string
+  default     = "false"
+}
+
 variable "runner_version" {
   description = "The version (no v prefix) of the runner software to install https://github.com/actions/runner/releases. The latest release will be fetched from GitHub if not provided."
   default     = null
@@ -135,7 +153,8 @@ build {
   ]
   provisioner "shell" {
     environment_vars = [
-      "DEBIAN_FRONTEND=noninteractive"
+      "DEBIAN_FRONTEND=noninteractive",
+      "DISABLE_DOCKER_REGISTRY=${var.disable_docker_registry}"
     ]
     inline = concat([
       "sudo cloud-init status --wait",

images/ubuntu-focal-cppal/variables.auto.pkrvars.hcl

@@ -28,7 +28,7 @@ custom_shell_commands = [
 "sudo systemctl stop unattended-upgrades",
 "sudo systemctl disable unattended-upgrades",
 "sudo apt-get purge -y unattended-upgrades",
-"echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
+"$DISABLE_DOCKER_REGISTRY || echo '{\n  \"insecure-registries\":[\"docker-registry-lb-1.cpp.al\"],\n  \"registry-mirrors\": [\"http://docker-registry-lb-1.cpp.al\"]\n }' | sudo tee /etc/docker/daemon.json"
 ]
 
 # # custom LLVM install. Switching to standard clang packages.

images/ubuntu-jammy-arm64-cppal/dev.pkrvars.hcl

@@ -0,0 +1,4 @@
+
+ssh_keypair_name = "tagr-us-west-2"
+ssh_private_key_file = "/home/sam/work/cppalliance/aws/boost.v2.account/tagr-us-west-2.pem"
+disable_docker_registry = true

images/ubuntu-jammy-arm64-cppal/github_agent.ubuntu.pkr.hcl

@@ -7,6 +7,24 @@ packer {
   }
 }
 
+variable "ssh_keypair_name" {
+  description = "SSH keypair name"
+  type        = string
+  default     = null
+}
+
+variable "ssh_private_key_file" {
+  description = "SSH private key file"
+  type        = string
+  default     = null
+}
+
+variable "disable_docker_registry" {
+  description = "SSH private key file"
+  type        = string
+  default     = "false"
+}
+
 variable "runner_version" {
   description = "The version (no v prefix) of the runner software to install https://github.com/actions/runner/releases. The latest release will be fetched from GitHub if not provided."
   default     = null
@@ -135,7 +153,8 @@ build {
   ]
   provisioner "shell" {
     environment_vars = [
-      "DEBIAN_FRONTEND=noninteractive"
+      "DEBIAN_FRONTEND=noninteractive",
+      "DISABLE_DOCKER_REGISTRY=${var.disable_docker_registry}"
     ]
     inline = concat([
       "sudo cloud-init status --wait",