Skip to content

CI: fix docker-cpi deploy #509

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

Merged
aramprice merged 3 commits into from
May 22, 2026
Merged

CI: fix docker-cpi deploy #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
081fe23
CI: fix docker-cpi deploy
aramprice May 22, 2026
aec2350
CI: move images out of task.yml into pipeline
aramprice May 22, 2026
6651f65
CI: lint warden test script
aramprice May 22, 2026
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
14 changes: 14 additions & 0 deletions ci/pipeline.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,11 @@ jobs:
- get: bosh-deployment
trigger: true
- get: warden-ubuntu-noble-stemcell
- get: bosh-warden-cpi-image
- task: test-main-warden-cpi
timeout: 2h
file: bosh-deployment/ci/tasks/test-main-warden-cpi.yml
image: bosh-warden-cpi-image
input_mapping:
stemcell: warden-ubuntu-noble-stemcell
privileged: true
Expand All @@ -153,9 +155,11 @@ jobs:
- get: bosh-deployment
trigger: true
- get: warden-ubuntu-noble-stemcell
- get: bosh-docker-cpi-image
- task: test-main-docker-cpi
timeout: 2h
file: bosh-deployment/ci/tasks/test-main-docker-cpi.yml
image: bosh-docker-cpi-image
input_mapping:
stemcell: warden-ubuntu-noble-stemcell
privileged: true
Expand Down Expand Up @@ -1240,6 +1244,16 @@ resources:
source:
repository: ghcr.io/cloudfoundry/ubuntu-noble-stemcell

- name: bosh-docker-cpi-image
type: registry-image
source:
repository: ghcr.io/cloudfoundry/bosh/docker-cpi

- name: bosh-warden-cpi-image
type: registry-image
source:
repository: ghcr.io/cloudfoundry/bosh/warden-cpi

resource_types:
- name: github-status
type: registry-image
Expand Down
26 changes: 16 additions & 10 deletions ci/tasks/test-main-docker-cpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
#!/bin/bash
#!/usr/bin/env bash
set -euo pipefail

set -eu
if [[ -n "${DEBUG-}" ]]; then
set -x
fi

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
bosh_deployment="${PWD}/bosh-deployment"

rm -rf "/usr/local/bosh-deployment"
cp -r "${PWD}/bosh-deployment" "/usr/local/bosh-deployment"

export USE_LOCAL_RELEASES=false
. start-bosh
. /tmp/local-bosh/director/env

# shellcheck source=/dev/null
source start-bosh
# shellcheck source=/dev/null
source /tmp/local-bosh/director/bosh-env

URL=$(cat stemcell/url)
SHA1=$(cat stemcell/sha1)
Expand All @@ -18,14 +24,14 @@ bosh upload-stemcell --sha1 "$SHA1" "$URL"

bosh -n update-runtime-config "${bosh_deployment}/runtime-configs/dns.yml"

echo "-----> `date`: Deploy"
bosh -n -d zookeeper deploy "${script_dir}/../assets/zookeeper.yml"
echo "-----> $(date): Deploy"
bosh -n -d zookeeper deploy "${bosh_deployment}/ci/assets/zookeeper.yml"

echo "-----> `date`: Exercise deployment"
echo "-----> $(date): Exercise deployment"
bosh -n -d zookeeper run-errand smoke-tests

echo "-----> `date`: Exercise deployment"
echo "-----> $(date): Exercise deployment"
bosh -n -d zookeeper recreate

echo "-----> `date`: Clean up disks, etc."
echo "-----> $(date): Clean up disks, etc."
bosh -n -d zookeeper clean-up --all
5 changes: 0 additions & 5 deletions ci/tasks/test-main-docker-cpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
---
platform: linux

image_resource:
type: registry-image
source:
repository: ghcr.io/cloudfoundry/bosh/docker-cpi

inputs:
- name: bosh-deployment
- name: stemcell
Expand Down
26 changes: 16 additions & 10 deletions ci/tasks/test-main-warden-cpi.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,21 @@
#!/bin/bash
#!/usr/bin/env bash
set -euo pipefail

set -eu
if [[ -n "${DEBUG-}" ]]; then
set -x
fi

script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
bosh_deployment="${PWD}/bosh-deployment"

rm -rf "/usr/local/bosh-deployment"
cp -r "${PWD}/bosh-deployment" "/usr/local/bosh-deployment"

export USE_LOCAL_RELEASES=false
. start-bosh
. /tmp/local-bosh/director/env

# shellcheck source=/dev/null
source start-bosh
# shellcheck source=/dev/null
source /tmp/local-bosh/director/env

URL=$(cat stemcell/url)
SHA1=$(cat stemcell/sha1)
Expand All @@ -18,14 +24,14 @@ bosh upload-stemcell --sha1 "$SHA1" "$URL"

bosh -n update-runtime-config "${bosh_deployment}/runtime-configs/dns.yml"

echo "-----> `date`: Deploy"
bosh -n -d zookeeper deploy "${script_dir}/../assets/zookeeper.yml"
echo "-----> $(date): Deploy"
bosh -n -d zookeeper deploy "${bosh_deployment}/ci/assets/zookeeper.yml"

echo "-----> `date`: Exercise deployment"
echo "-----> $(date): Exercise deployment"
bosh -n -d zookeeper run-errand smoke-tests

echo "-----> `date`: Exercise deployment"
echo "-----> $(date): Exercise deployment"
bosh -n -d zookeeper recreate

echo "-----> `date`: Clean up disks, etc."
echo "-----> $(date): Clean up disks, etc."
bosh -n -d zookeeper clean-up --all
5 changes: 0 additions & 5 deletions ci/tasks/test-main-warden-cpi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
---
platform: linux

image_resource:
type: registry-image
source:
repository: ghcr.io/cloudfoundry/bosh/warden-cpi

inputs:
- name: bosh-deployment
- name: stemcell
Expand Down