Skip to content

Commit f8c4de3

Browse files
committed
CI: update bump-deps to _actually_ bump acceptance_test deps
1 parent 407cbd5 commit f8c4de3

File tree

5 files changed

+51
-42
lines changed

5 files changed

+51
-42
lines changed

ci/pipelines/stemcells-windows.yml

Lines changed: 12 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -609,44 +609,32 @@ jobs:
609609
resource: main-version
610610
- get: weekly
611611
trigger: true
612-
- task: bump-golang-deps
612+
- task: bump-golang-deps-stembuild
613613
file: golang-release/ci/tasks/shared/bump-deps.yml
614614
params:
615615
SOURCE_PATH: stembuild
616616
input_mapping:
617617
input_repo: stemcell-builder
618618
output_mapping:
619619
output_repo: stemcell-builder
620+
- task: bump-golang-deps-acceptance_test
621+
file: golang-release/ci/tasks/shared/bump-deps.yml
622+
params:
623+
SOURCE_PATH: acceptance_test
624+
input_mapping:
625+
input_repo: stemcell-builder
626+
output_mapping:
627+
output_repo: stemcell-builder
620628
- in_parallel:
621629
- task: unit-test-on-linux
622630
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-linux/task.yml
623631
image: bosh-windows-stemcell-builder-ci-image
624632
- task: unit-test-on-windows
625633
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-windows/task.yml
626634
tags: [windows-nimbus]
627-
- task: build-test
628-
config:
629-
image_resource:
630-
type: registry-image
631-
source:
632-
repository: bosh/integration
633-
username: ((docker.username))
634-
password: ((docker.password))
635-
inputs:
636-
- name: stemcell-builder
637-
platform: linux
638-
run:
639-
path: bash
640-
args:
641-
- "-c"
642-
- |
643-
set -eu -o pipefail
644-
set -x
645-
cd stemcell-builder/acceptance_test
646-
go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest run ./...
647-
go test -c
648-
go run github.com/onsi/ginkgo/v2/ginkgo run --dry-run -v
649-
635+
- task: acceptance-test-dry-run
636+
file: bosh-windows-stemcell-builder-ci/ci/tasks/clean-up-pre-release-blobstore/task.yml
637+
image: bosh-windows-stemcell-builder-ci-image
650638
- put: stemcell-builder
651639
params:
652640
rebase: true
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
#!/bin/bash
2+
3+
echo "If you see the following error don't worry everything is working, the images got deleted, but some did not need to be deleted (they are less than 30 days old):"
4+
echo "'X of Y blobs not deleted due to Failed Precondition'"
5+
6+
echo "Deleting blobs from images"
7+
az storage blob delete-batch \
8+
--auth-mode key \
9+
--account-key $AZURE_STORAGE_ACCESS_KEY \
10+
--account-name $AZURE_STORAGE_ACCOUNT \
11+
--source=images --pattern="*.vhd" \
12+
--if-unmodified-since=$(date -d "30 days ago" '+%Y-%m-%dT%H:%MZ')
13+
14+
echo "Deleting blobs from system"
15+
az storage blob delete-batch \
16+
--auth-mode key \
17+
--account-key $AZURE_STORAGE_ACCESS_KEY \
18+
--account-name $AZURE_STORAGE_ACCOUNT \
19+
--source=system --pattern="*.vhd" \
20+
--if-unmodified-since=$(date -d "30 days ago" '+%Y-%m-%dT%H:%MZ')
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
---
2+
platform: linux
3+
4+
inputs:
5+
- name: bosh-windows-stemcell-builder-ci
6+
7+
run:
8+
path: bosh-windows-stemcell-builder-ci/ci/tasks/clean-up-pre-release-blobstore/run
Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
22

3-
echo "If you see the following error don't worry everything is working, the images got deleted, but some did not need to be deleted (they are less than 30 days old):"
4-
echo "'X of Y blobs not deleted due to Failed Precondition'"
3+
set -eu -o pipefail
4+
set -x
55

6-
echo "Deleting blobs from images"
7-
az storage blob delete-batch \
8-
--auth-mode key \
9-
--account-key $AZURE_STORAGE_ACCESS_KEY \
10-
--account-name $AZURE_STORAGE_ACCOUNT \
11-
--source=images --pattern="*.vhd" \
12-
--if-unmodified-since=$(date -d "30 days ago" '+%Y-%m-%dT%H:%MZ')
6+
cd stemcell-builder/acceptance_test
137

14-
echo "Deleting blobs from system"
15-
az storage blob delete-batch \
16-
--auth-mode key \
17-
--account-key $AZURE_STORAGE_ACCESS_KEY \
18-
--account-name $AZURE_STORAGE_ACCOUNT \
19-
--source=system --pattern="*.vhd" \
20-
--if-unmodified-since=$(date -d "30 days ago" '+%Y-%m-%dT%H:%MZ')
8+
go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest run ./...
9+
10+
go test -c
11+
12+
go run github.com/onsi/ginkgo/v2/ginkgo run --dry-run -v

ci/tasks/clean-up-pre-release-blobstore/task.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ platform: linux
33

44
inputs:
55
- name: bosh-windows-stemcell-builder-ci
6+
- name: stemcell-builder
67

78
run:
8-
path: bosh-windows-stemcell-builder-ci/ci/tasks/clean-up-pre-release-blobstore/run
9+
path: bosh-windows-stemcell-builder-ci/ci/tasks/clean-up-pre-release-blobstore/run

0 commit comments

Comments
 (0)