Skip to content

Commit

Permalink
Xenial -> Bionic
Browse files Browse the repository at this point in the history
  • Loading branch information
domdom82 committed Sep 28, 2022
1 parent 5982c59 commit f961dd0
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ config/settings.yml
releases/*.tgz
releases/**/*.tgz
ci/scripts/stemcell/*.tgz
ci/scripts/stemcell-xenial/*.tgz
ci/scripts/stemcell-bionic/*.tgz
ci/scripts/bpm/*.tgz
dev_releases
blobs/*
Expand Down
4 changes: 2 additions & 2 deletions acceptance-tests/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
* Docker installed locally
* A matching Jammy stemcell tgz downloaded to `ci/scripts/stemcell`
* Get it from https://bosh.io/stemcells/bosh-warden-boshlite-ubuntu-jammy-go_agent
* A matching Xenial stemcell tgz downloaded to `ci/scripts/stemcell-xenial`
* Get it from https://bosh.io/stemcells/bosh-warden-boshlite-ubuntu-xenial-go_agent
* A matching Bionic stemcell tgz downloaded to `ci/scripts/stemcell-bionic`
* Get it from https://bosh.io/stemcells/bosh-warden-boshlite-ubuntu-bionic-go_agent
* A BPM release tgz downloaded to `ci/scripts/bpm`
* Get it from https://bosh.io/releases/github.com/cloudfoundry/bpm-release?all=1

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ import (
. "github.com/onsi/ginkgo"
)

var _ = Describe("Xenial", func() {
It("Correctly proxies HTTP requests when using the Xenial stemcell", func() {
var _ = Describe("Bionic", func() {
It("Correctly proxies HTTP requests when using the Bionic stemcell", func() {

opsfileXenial := `---
# Configure Xenial stemcell
opsfileBionic := `---
# Configure Bionic stemcell
- type: replace
path: /stemcells/alias=default/os
value: ubuntu-xenial
value: ubuntu-bionic
`

haproxyBackendPort := 12000
haproxyInfo, _ := deployHAProxy(baseManifestVars{
haproxyBackendPort: haproxyBackendPort,
haproxyBackendServers: []string{"127.0.0.1"},
deploymentName: deploymentNameForTestNode(),
}, []string{opsfileXenial}, map[string]interface{}{}, true)
}, []string{opsfileBionic}, map[string]interface{}{}, true)

closeLocalServer, localPort := startDefaultTestServer()
defer closeLocalServer()
Expand Down
12 changes: 6 additions & 6 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ jobs:
- in_parallel:
- { get: git, trigger: true, passed: [unit-tests] }
- { get: stemcell }
- { get: stemcell-xenial }
- { get: stemcell-bionic }
- { get: bpm }
- task: acceptance-tests
privileged: true
Expand All @@ -160,7 +160,7 @@ jobs:
inputs:
- { name: git }
- { name: stemcell }
- { name: stemcell-xenial }
- { name: stemcell-bionic }
- { name: bpm }
run:
path: ./git/ci/scripts/acceptance-tests
Expand All @@ -182,7 +182,7 @@ jobs:
- do:
- { get: git-pull-requests, trigger: true, version: every, passed: [unit-tests-pr] }
- { get: stemcell }
- { get: stemcell-xenial }
- { get: stemcell-bionic }
- { get: bpm }
- put: git-pull-requests
params:
Expand All @@ -203,7 +203,7 @@ jobs:
inputs:
- { name: git-pull-requests }
- { name: stemcell }
- { name: stemcell-xenial }
- { name: stemcell-bionic }
- { name: bpm }
run:
path: ./git-pull-requests/ci/scripts/acceptance-tests
Expand Down Expand Up @@ -458,10 +458,10 @@ resources:
base_branch: master
labels: [run-ci]

- name: stemcell-xenial
- name: stemcell-bionic
type: bosh-io-stemcell
source:
name: bosh-warden-boshlite-ubuntu-xenial-go_agent
name: bosh-warden-boshlite-ubuntu-bionic-go_agent

- name: stemcell
type: bosh-io-stemcell
Expand Down
6 changes: 3 additions & 3 deletions ci/scripts/acceptance-tests
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -eu

stemcell_jammy_path=$PWD/stemcell/*.tgz
stemcell_xenial_path=$PWD/stemcell-xenial/*.tgz
stemcell_bionic_path=$PWD/stemcell-bionic/*.tgz
bpm_release_path=$PWD/bpm/*.tgz

cd ${REPO_ROOT:?required}
Expand Down Expand Up @@ -35,8 +35,8 @@ echo "----- Created ${RELEASE_VERSION}"
echo "----- Uploading Jammy stemcell"
bosh -n upload-stemcell $stemcell_jammy_path

echo "----- Uploading Xenial stemcell"
bosh -n upload-stemcell $stemcell_xenial_path
echo "----- Uploading Bionic stemcell"
bosh -n upload-stemcell $stemcell_bionic_path

echo "----- Uploading BPM"
bosh -n upload-release $bpm_release_path
Expand Down
File renamed without changes.

0 comments on commit f961dd0

Please sign in to comment.