Skip to content

Commit

Permalink
Update pipeline acceptance test to use jammy
Browse files Browse the repository at this point in the history
- Also swtich from docerk cpi (running garden) to warden cpi image
  • Loading branch information
jpalermo committed Jan 27, 2025
1 parent e25cfe1 commit 9a618eb
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 11 deletions.
20 changes: 15 additions & 5 deletions ci/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
file: bosh-cli/ci/tasks/test-integration.yml
privileged: true

- name: test-acceptance-xenial
- name: test-acceptance
public: true
plan:
- in_parallel:
Expand All @@ -72,10 +72,13 @@ jobs:
trigger: true
- get: bosh-warden-cpi-release
trigger: true
- get: bosh-warden-stemcell-xenial
- get: stemcell
resource: bosh-warden-stemcell-jammy
- get: warden-cpi-image
- in_parallel:
- task: test-acceptance
file: bosh-cli/ci/tasks/test-acceptance.yml
image: warden-cpi-image
privileged: true

- name: integration-postgres
Expand Down Expand Up @@ -120,7 +123,7 @@ jobs:
- get: bosh-cli
trigger: true
passed:
- test-acceptance-xenial
- test-acceptance
- integration-postgres

- name: release-new-patch
Expand Down Expand Up @@ -409,10 +412,10 @@ resources:
branch: develop
private_key: ((github_deploy_key_config-server.private_key))

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

- name: bosh-warden-cpi-release
type: bosh-io-release
Expand Down Expand Up @@ -444,6 +447,13 @@ resources:
username: ((bosh-dockerhub.username))
password: ((bosh-dockerhub.password))

- name: warden-cpi-image
type: registry-image
source:
repository: bosh/warden-cpi
username: ((bosh-dockerhub.username))
password: ((bosh-dockerhub.password))

- name: integration-postgres-15-image
type: registry-image
source:
Expand Down
4 changes: 3 additions & 1 deletion ci/tasks/test-acceptance.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ export BOSH_INIT_STEMCELL_PATH

cd bosh-cli

start-garden 1>/dev/null
/var/vcap/jobs/garden/bin/pre-start
/var/vcap/jobs/garden/bin/garden_ctl start &
/var/vcap/jobs/garden/bin/post-start

bin/test-acceptance-with-garden
8 changes: 3 additions & 5 deletions ci/tasks/test-acceptance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,15 @@
platform: linux

image_resource:
type: docker-image
type: registry-image
source:
repository: bosh/docker-cpi
tag: 'main'
repository: bosh/warden-cpi

inputs:
- name: bosh-cli
- name: bosh-warden-cpi-release
path: cpi-release
- name: bosh-warden-stemcell-xenial
path: stemcell
- name: stemcell

run:
path: bosh-cli/ci/tasks/test-acceptance.sh

0 comments on commit 9a618eb

Please sign in to comment.