Skip to content

naïvely bump from bionic to jammy, as the former is end-of-life #332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
scarytom wants to merge 1 commit into
base: master
Choose a base branch
from
Open

naïvely bump from bionic to jammy, as the former is end-of-life #332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bosh/internal/boshcli/aws.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,5 +138,5 @@ func (e AWSEnvironment) ConfigureDirectorCloudConfig() (string, error) {
}

func (e AWSEnvironment) ConcourseStemcellURL() (string, error) {
return concourseStemcellURL(resource.AWSReleaseVersions, "https://storage.googleapis.com/bosh-aws-light-stemcells/%s/light-bosh-stemcell-%s-aws-xen-hvm-ubuntu-bionic-go_agent.tgz")
return concourseStemcellURL(resource.AWSReleaseVersions, "https://storage.googleapis.com/bosh-aws-light-stemcells/%s/light-bosh-stemcell-%s-aws-xen-hvm-ubuntu-jammy-go_agent.tgz")
}
2 changes: 1 addition & 1 deletion bosh/internal/boshcli/aws_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ func TestAWSEnvironment_ConfigureConcourseStemcell(t *testing.T) {
}{
{
name: "parse versions and provide a valid stemcell url",
want: "https://storage.googleapis.com/bosh-aws-light-stemcells/5/light-bosh-stemcell-5-aws-xen-hvm-ubuntu-bionic-go_agent.tgz",
want: "https://storage.googleapis.com/bosh-aws-light-stemcells/5/light-bosh-stemcell-5-aws-xen-hvm-ubuntu-jammy-go_agent.tgz",
wantErr: false,
fixture: "stemcell_version",
},
Expand Down
2 changes: 1 addition & 1 deletion bosh/internal/boshcli/boshcli.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ func concourseStemcellURL(releaseVersionsFile, urlFormat string) (string, error)
}
var version string
for _, op := range ops {
if op.Path != "/stemcells/alias=bionic/version" {
if op.Path != "/stemcells/alias=jammy/version" {
continue
}
err := json.Unmarshal(op.Value, &version)
Expand Down
2 changes: 1 addition & 1 deletion bosh/internal/boshcli/gcp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,5 +120,5 @@ func (e GCPEnvironment) ConfigureDirectorCloudConfig() (string, error) {
}

func (e GCPEnvironment) ConcourseStemcellURL() (string, error) {
return concourseStemcellURL(resource.GCPReleaseVersions, "https://storage.googleapis.com/bosh-gce-light-stemcells/%s/light-bosh-stemcell-%s-google-kvm-ubuntu-bionic-go_agent.tgz")
return concourseStemcellURL(resource.GCPReleaseVersions, "https://storage.googleapis.com/bosh-gce-light-stemcells/%s/light-bosh-stemcell-%s-google-kvm-ubuntu-jammy-go_agent.tgz")
}
2 changes: 1 addition & 1 deletion bosh/internal/boshcli/gcp_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ func TestGCPEnvironment_ConfigureConcourseStemcell(t *testing.T) {
}{
{
name: "parse versions and provide a valid stemcell url",
want: "https://storage.googleapis.com/bosh-gce-light-stemcells/5/light-bosh-stemcell-5-google-kvm-ubuntu-bionic-go_agent.tgz",
want: "https://storage.googleapis.com/bosh-gce-light-stemcells/5/light-bosh-stemcell-5-google-kvm-ubuntu-jammy-go_agent.tgz",
wantErr: false,
fixture: "stemcell_version",
},
Expand Down
2 changes: 1 addition & 1 deletion bosh/internal/fixtures/stemcell_version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[
{
"type": "replace",
"path": "/stemcells/alias=bionic/version",
"path": "/stemcells/alias=jammy/version",
"value": "5"
}
]
4 changes: 2 additions & 2 deletions ci/tasks/lib/get-versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function getVersions() {
grafana_release_version=$( jq -r '.[] | select(.value.name? == "grafana") | .value.version' ops/versions-aws.json)
influxdb_release_url=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.url' ops/versions-aws.json)
influxdb_release_version=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.version' ops/versions-aws.json)
stemcell_version=$( jq -r '.[] | select(.path == "/stemcells/alias=bionic/version") | .value' ops/versions-aws.json)
stemcell_version=$( jq -r '.[] | select(.path == "/stemcells/alias=jammy/version") | .value' ops/versions-aws.json)
uaa_release_url=$( jq -r '.[] | select(.value.name? == "uaa") | .value.url' ops/versions-aws.json)
uaa_release_version=$( jq -r '.[] | select(.value.name? == "uaa") | .value.version' ops/versions-aws.json)
director_bosh_cpi_release_url=$( jq -r .cpi.url createenv-dependencies-and-cli-versions-aws.json)
Expand All @@ -33,7 +33,7 @@ function getVersions() {
grafana_release_version_gcp=$( jq -r '.[] | select(.value.name? == "grafana") | .value.version' ops/versions-gcp.json)
influxdb_release_url_gcp=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.url' ops/versions-gcp.json)
influxdb_release_version_gcp=$( jq -r '.[] | select(.value.name? == "influxdb") | .value.version' ops/versions-gcp.json)
stemcell_version_gcp=$( jq -r '.[] | select(.path == "/stemcells/alias=bionic/version") | .value' ops/versions-gcp.json)
stemcell_version_gcp=$( jq -r '.[] | select(.path == "/stemcells/alias=jammy/version") | .value' ops/versions-gcp.json)
uaa_release_url_gcp=$( jq -r '.[] | select(.value.name? == "uaa") | .value.url' ops/versions-gcp.json)
uaa_release_version_gcp=$( jq -r '.[] | select(.value.name? == "uaa") | .value.version' ops/versions-gcp.json)
director_bosh_cpi_release_url_gcp=$( jq -r .cpi.url createenv-dependencies-and-cli-versions-gcp.json)
Expand Down
8 changes: 4 additions & 4 deletions ci/tasks/write-release-vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ Deploys:

**AWS**

- Concourse VM stemcell bosh-aws-xen-hvm-ubuntu-bionic-go_agent $stemcell_version
- Director stemcell bosh-aws-xen-hvm-ubuntu-bionic-go_agent $director_stemcell_version
- Concourse VM stemcell bosh-aws-xen-hvm-ubuntu-jammy-go_agent $stemcell_version
- Director stemcell bosh-aws-xen-hvm-ubuntu-jammy-go_agent $director_stemcell_version
- Concourse [$concourse_release_version]($concourse_release_url)
- BOSH [$director_bosh_release_version]($director_bosh_release_url)
- BOSH AWS CPI [$director_bosh_cpi_release_version]($director_bosh_cpi_release_url)
Expand All @@ -63,8 +63,8 @@ Deploys:

**GCP**

- Concourse VM stemcell bosh-google-kvm-ubuntu-bionic-go_agent $stemcell_version_gcp
- Director stemcell bosh-google-kvm-ubuntu-bionic-go_agent $director_stemcell_version_gcp
- Concourse VM stemcell bosh-google-kvm-ubuntu-jammy-go_agent $stemcell_version_gcp
- Director stemcell bosh-google-kvm-ubuntu-jammy-go_agent $director_stemcell_version_gcp
- Concourse [$concourse_release_version_gcp]($concourse_release_url_gcp)
- BOSH [$director_bosh_release_version_gcp]($director_bosh_release_url_gcp)
- BOSH GCP CPI [$director_bosh_cpi_release_version_gcp]($director_bosh_cpi_release_url_gcp)
Expand Down
2 changes: 1 addition & 1 deletion concourse/fixtures/director-state.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"stemcells": [
{
"id": "b6b63aec-89f6-4ea8-a4fb-cfb70423ff87",
"name": "bosh-aws-xen-hvm-ubuntu-bionic-go_agent",
"name": "bosh-aws-xen-hvm-ubuntu-jammy-go_agent",
"version": "170.9",
"cid": "ami-0cd3ce643104b027d light"
}
Expand Down
4 changes: 2 additions & 2 deletions docs/troubleshooting.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ Control Tower uses [BOSH](https://bosh.io/docs/) to deploy and manage VMs. When
Deployment 'concourse'

Instance Process State AZ IPs VM CID VM Type Active Stemcell
web/95589e21-09af-412d-abef-a2065fa828fe running z1 1.2.3.4 i-00000000000000000 concourse-web-xlarge true bosh-aws-xen-hvm-ubuntu-bionic-go_agent/1.67
web/95589e21-09af-412d-abef-a2065fa828fe running z1 1.2.3.4 i-00000000000000000 concourse-web-xlarge true bosh-aws-xen-hvm-ubuntu-jammy-go_agent/1.67
10.0.0.8
worker/17cedb77-a924-4e09-bb1a-952b7e8b3fc6 failing z1 10.0.1.7 i-00000000000000000 concourse-2xlarge true bosh-aws-xen-hvm-ubuntu-bionic-go_agent/1.67
worker/17cedb77-a924-4e09-bb1a-952b7e8b3fc6 failing z1 10.0.1.7 i-00000000000000000 concourse-2xlarge true bosh-aws-xen-hvm-ubuntu-jammy-go_agent/1.67

2 vms

Expand Down