Merge branch 'ubuntu-jammy' into merge-jammy

Author: aramprice

.github/pull_request_template.md

@@ -0,0 +1,9 @@
+NOTE: this repository uses a "Merge Forward" strategy
+
+Changes should be made in the earliest applicable branch, and
+merged forward through subsequent branches.
+1. Create a PR into the oldest branch (`ubuntu-<short_name>`)
+2. After this PR has been merged create a `merge-to-<next_short_name>` branch
+3. Merge `ubuntu-<short_name>` into `merge-to-<next_short_name>`
+4. Create a PR to merge `merge-to-<next_short_name>` into `ubuntu-<next_short_name>`
+5. Repeat as needed for subsequent branches

README.md

@@ -296,19 +296,21 @@ Concourse publishes its artifacts to GCS.
 #### Create Buckets
 
 ```shell
-gsutil mb -l europe-west4  gs://bosh-aws-light-stemcells
-gsutil mb -l europe-west4  gs://bosh-aws-light-stemcells-candidate
+export gcp_region="europe-west4"
 
-gsutil mb -l europe-west4  gs://bosh-gce-light-stemcell-ci-terraform-state
+gsutil mb -l "${gcp_region}"  gs://bosh-aws-light-stemcells
+gsutil mb -l "${gcp_region}"  gs://bosh-aws-light-stemcells-candidate
 
-gsutil mb -l europe-west4  gs://bosh-gce-light-stemcells
-gsutil mb -l europe-west4  gs://bosh-gce-light-stemcells-candidate
-gsutil mb -l europe-west4  gs://bosh-gce-raw-stemcells-new
+gsutil mb -l "${gcp_region}"  gs://bosh-gce-light-stemcell-ci-terraform-state
 
-gsutil mb -l europe-west4  gs://bosh-core-stemcells
-gsutil mb -l europe-west4  gs://bosh-core-stemcells-candidate
-gsutil mb -l europe-west4  gs://bosh-os-images
-gsutil mb -l europe-west4  gs://bosh-stemcell-triggers
+gsutil mb -l "${gcp_region}"  gs://bosh-gce-light-stemcells
+gsutil mb -l "${gcp_region}"  gs://bosh-gce-light-stemcells-candidate
+gsutil mb -l "${gcp_region}"  gs://bosh-gce-raw-stemcells-new
+
+gsutil mb -l "${gcp_region}"  gs://bosh-core-stemcells
+gsutil mb -l "${gcp_region}"  gs://bosh-core-stemcells-candidate
+gsutil mb -l "${gcp_region}"  gs://bosh-os-images
+gsutil mb -l "${gcp_region}"  gs://bosh-stemcell-triggers
 ```
 
 #### Make Buckets Publicly Readable
@@ -343,18 +345,28 @@ gcloud compute firewall-rules update default-allow-internal --source-ranges 10.0
 
 #### Create Integration Networks
 
-Create the bosh-integration networks for tests and BATs tests. Each stemcell
-line should get its own subnet corresponding to its `subnet_int`.
+Create a `stemcell-builder-integration-${subnet_int}` subnetworks need by BATs tests.
+Each stemcell line should get its own subnet corresponding to its `subnet_int` equal to
+the two digit release year. For example release year 2010 would have `subnet_int="10"`.
 
-Example:
+Example per [ci/pipelines/vars.yml](ci/pipelines/vars.yml):
 
-- subnet_id=44
-    - subnet_range=10.100.44.0/24
-    - subnet_name=bosh-integration-44
+```yaml
+---
+stemcell_details:
+  # ... snip
+  subnet_int: "10" #! use last two digits of release year: ex 2010 -> 10
+  # ... snip
+```
+
+Would mean creating the following subnet in GCP:
 
 ```shell
 # branch: ubuntu-${short_name}
-gcloud compute networks subnets create --network default --range 10.100.0.0/24 bosh-integration-0
+export subnet_int="10"
+
+gcloud compute networks subnets create --network default \
+  --range "10.100.${subnet_int}.0/24" "stemcell-builder-integration-${subnet_int}"
 ```
 
 ### AWS

bosh-stemcell/spec/assets/dpkg-list-ubuntu-azure-additions.txt

@@ -4,13 +4,15 @@ linux-cloud-tools-6.8
 linux-cloud-tools-6.8-generic
 linux-cloud-tools-common
 linux-cloud-tools-generic
+netplan-generator
 netplan.io
 python-is-python3
 python3-attr
 python3-certifi
 python3-chardet
 python3-configobj
 python3-debconf
+python3-netplan
 python3-idna
 python3-jinja2
 python3-json-pointer

ci/pipelines/builder.yml

@@ -446,6 +446,7 @@ jobs:
 
 #@ def build_stemcell(IAAS, HYPERVISOR, FIPS=""):
   name: build-(@= IAAS @)-(@= HYPERVISOR @)(@= FIPS @)
+  serial: true
   plan:
   - in_parallel:
     - get: version
@@ -468,7 +469,6 @@ jobs:
       passed:
       - build-os-image
   - task: create-stemcell
-    attempts: 3
     file: bosh-stemcells-ci/ci/tasks/build.yml
     image: os-image-stemcell-builder-registry-image
     params: