Skip to content

Commit fba2911

Browse files
authored
ci: build warden-cpi noble image (#2643)
* ci: warden-cpi image uses noble - noble is now the default for docker-cpi as well. - build `-jammy` for both CPI images as a stop-gap * ci: update warden opsfile to start with systemd - agent requires systemd to start when running on noble, which is the new default * ci: remove image resource from tasks, rely on pipeline * ci: normalize base image consumption - extract yaml anchors to make future updates easier Signed-off-by: Aram Price <[email protected]>
1 parent f5a0409 commit fba2911

31 files changed

+114
-222
lines changed

ci/bats/iaas/gcp/prepare-bats-config.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: bosh/integration
8-
tag: main
9-
104
inputs:
115
- name: bosh-ci
126
- name: director-state

ci/bats/tasks/deploy-director.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: boshcpi/cpi-certification
8-
94
inputs:
105
- name: environment
116
- name: bosh-ci

ci/bats/tasks/destroy-director.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: docker-image
6-
source:
7-
repository: bosh/integration
8-
94
inputs:
105
- name: director-state
116
- name: bosh-ci

ci/dockerfiles/docker-cpi/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# this image builds bosh/docker-cpi
22
# it is used across ci to start a bosh in a docker container
3-
ARG BASE_IMAGE=bosh/integration:main
3+
ARG BASE_IMAGE
44
FROM $BASE_IMAGE
55

66
RUN docker_gpg="/etc/apt/trusted.gpg.d/docker.gpg" \

ci/dockerfiles/integration/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ghcr.io/cloudfoundry/bosh/integration:main
2-
ARG BASE_IMAGE=ubuntu:jammy
2+
ARG BASE_IMAGE
33
FROM $BASE_IMAGE
44

55
ARG BOSH_CLI_URL

ci/dockerfiles/integration/build-docker-args.yml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
11
---
22
platform: linux
33

4-
image_resource:
5-
type: registry-image
6-
source:
7-
repository: bosh/integration
8-
94
inputs:
105
- name: bosh-deployment
116
- name: bosh

ci/dockerfiles/main-mysql/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG BRANCH
2-
FROM bosh/integration:${BRANCH}
1+
ARG BASE_IMAGE
2+
FROM $BASE_IMAGE
33

44
# Install Dependencies
55
RUN echo 'mysql-server mysql-server/root_password password password' | debconf-set-selections

ci/dockerfiles/main-postgres/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG BRANCH
2-
FROM bosh/integration:${BRANCH}
1+
ARG BASE_IMAGE
2+
FROM $BASE_IMAGE
33

44
ARG DB_VERSION
55

ci/dockerfiles/warden-cpi/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM bosh/integration:main
1+
ARG BASE_IMAGE
2+
FROM $BASE_IMAGE
23

34
RUN apt-get update -y \
45
&& apt-get -y install --no-install-recommends \

ci/dockerfiles/warden-cpi/inner-bosh-ops.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
password: ((blobstore_agent_password))
8787
mbus: nats://((internal_ip)):4222
8888
host_ip: ((internal_ip))
89+
start_containers_with_systemd: true
8990
warden:
9091
connect_address: 127.0.0.1:7777
9192
connect_network: tcp

0 commit comments

Comments
 (0)