Skip to content

Commit 9a618eb

Browse files
author
Joseph Palermo
committed
Update pipeline acceptance test to use jammy
- Also swtich from docerk cpi (running garden) to warden cpi image
1 parent e25cfe1 commit 9a618eb

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

ci/pipeline.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ jobs:
6363
file: bosh-cli/ci/tasks/test-integration.yml
6464
privileged: true
6565

66-
- name: test-acceptance-xenial
66+
- name: test-acceptance
6767
public: true
6868
plan:
6969
- in_parallel:
@@ -72,10 +72,13 @@ jobs:
7272
trigger: true
7373
- get: bosh-warden-cpi-release
7474
trigger: true
75-
- get: bosh-warden-stemcell-xenial
75+
- get: stemcell
76+
resource: bosh-warden-stemcell-jammy
77+
- get: warden-cpi-image
7678
- in_parallel:
7779
- task: test-acceptance
7880
file: bosh-cli/ci/tasks/test-acceptance.yml
81+
image: warden-cpi-image
7982
privileged: true
8083

8184
- name: integration-postgres
@@ -120,7 +123,7 @@ jobs:
120123
- get: bosh-cli
121124
trigger: true
122125
passed:
123-
- test-acceptance-xenial
126+
- test-acceptance
124127
- integration-postgres
125128

126129
- name: release-new-patch
@@ -409,10 +412,10 @@ resources:
409412
branch: develop
410413
private_key: ((github_deploy_key_config-server.private_key))
411414

412-
- name: bosh-warden-stemcell-xenial
415+
- name: bosh-warden-stemcell-jammy
413416
type: bosh-io-stemcell
414417
source:
415-
name: bosh-warden-boshlite-ubuntu-xenial-go_agent
418+
name: bosh-warden-boshlite-ubuntu-jammy-go_agent
416419

417420
- name: bosh-warden-cpi-release
418421
type: bosh-io-release
@@ -444,6 +447,13 @@ resources:
444447
username: ((bosh-dockerhub.username))
445448
password: ((bosh-dockerhub.password))
446449

450+
- name: warden-cpi-image
451+
type: registry-image
452+
source:
453+
repository: bosh/warden-cpi
454+
username: ((bosh-dockerhub.username))
455+
password: ((bosh-dockerhub.password))
456+
447457
- name: integration-postgres-15-image
448458
type: registry-image
449459
source:

ci/tasks/test-acceptance.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ export BOSH_INIT_STEMCELL_PATH
1515

1616
cd bosh-cli
1717

18-
start-garden 1>/dev/null
18+
/var/vcap/jobs/garden/bin/pre-start
19+
/var/vcap/jobs/garden/bin/garden_ctl start &
20+
/var/vcap/jobs/garden/bin/post-start
1921

2022
bin/test-acceptance-with-garden

ci/tasks/test-acceptance.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
platform: linux
33

44
image_resource:
5-
type: docker-image
5+
type: registry-image
66
source:
7-
repository: bosh/docker-cpi
8-
tag: 'main'
7+
repository: bosh/warden-cpi
98

109
inputs:
1110
- name: bosh-cli
1211
- name: bosh-warden-cpi-release
1312
path: cpi-release
14-
- name: bosh-warden-stemcell-xenial
15-
path: stemcell
13+
- name: stemcell
1614

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

0 commit comments

Comments
 (0)