Skip to content

Commit 55da2ae

Browse files
committed
CI: fix mixed up task files
1 parent f8c4de3 commit 55da2ae

File tree

4 files changed

+27
-28
lines changed

4 files changed

+27
-28
lines changed
Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1-
#!/bin/bash
1+
#!/usr/bin/env bash
2+
set -eu -o pipefail
3+
set -x
24

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+
cd stemcell-builder/acceptance_test
56

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')
7+
go run github.com/golangci/golangci-lint/v2/cmd/golangci-lint@latest run ./...
138

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')
9+
go test -c
10+
11+
go run github.com/onsi/ginkgo/v2/ginkgo run --dry-run -v

ci/tasks/acceptance-test-dry-run/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/acceptance-test-dry-run/run
Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,20 @@
1-
#!/usr/bin/env bash
1+
#!/bin/bash
22

3-
set -eu -o pipefail
4-
set -x
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'"
55

6-
cd stemcell-builder/acceptance_test
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')"
713

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
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')"

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

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

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

87
run:
98
path: bosh-windows-stemcell-builder-ci/ci/tasks/clean-up-pre-release-blobstore/run

0 commit comments

Comments
 (0)