Skip to content

Commit 10bcbf7

Browse files
committed
Use inlined stembuild content instead of repo
The https://github.com/cloudfoundry/stembuild repo has been consolidated into bosh-windows-stemcell-builder, this change updates CI to use the local content instead of the separate repo. - do not convert line endings under stembuild/vendor/
1 parent 9cd93a6 commit 10bcbf7

File tree

20 files changed

+61
-73
lines changed

20 files changed

+61
-73
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
*.go text eol=lf
2+
stembuild/vendor/** -text

ci/pipelines/windows-2019-ng.yml

Lines changed: 16 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,6 @@ resources:
160160
- ci/docker/Dockerfile
161161
username: bosh-admin-bot
162162
password: ((github_public_repo_token))
163-
- name: stembuild
164-
type: git
165-
source:
166-
uri: https://github.com/cloudfoundry/stembuild.git
167-
branch: windows-2019
168-
username: bosh-admin-bot
169-
password: ((github_public_repo_token))
170163
- name: bosh-stemcells-ci
171164
type: git
172165
source:
@@ -270,11 +263,11 @@ resources:
270263
repository: Win32-OpenSSH
271264
access_token: ((github_public_repo_token))
272265
tag_filter: v([^v].*)
273-
- name: post-stembuild-release
266+
- name: stemcell-builder-github-release
274267
type: github-release
275268
source:
276269
owner: cloudfoundry
277-
repository: stembuild
270+
repository: bosh-windows-stemcell-builder
278271
access_token: ((github_public_repo_token))
279272

280273
- name: bosh-agent-release
@@ -690,34 +683,34 @@ jobs:
690683
plan:
691684
- in_parallel:
692685
- get: bosh-windows-stemcell-builder-ci-image
693-
- get: bosh-windows-acceptance-tests
694686
- get: bosh-windows-stemcell-builder-ci
687+
- get: stemcell-builder
688+
- get: bosh-windows-acceptance-tests
695689
- get: golang-release
696690
- get: ovftool
697-
- get: stembuild
698691
- get: version
699692
resource: main-version
700693
- get: weekly
701694
trigger: true
702-
- task: bump-stembuild-deps
695+
- task: bump-golang-deps
703696
file: golang-release/ci/tasks/shared/bump-deps.yml
704697
params:
705698
SOURCE_PATH: stembuild
706699
input_mapping:
707-
input_repo: stembuild
700+
input_repo: stemcell-builder
708701
output_mapping:
709-
output_repo: stembuild
702+
output_repo: stemcell-builder
710703
- in_parallel:
711704
- task: unit-test-on-linux
712705
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-linux/task.yml
713706
image: bosh-windows-stemcell-builder-ci-image
714707
- task: unit-test-on-windows
715708
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-windows/task.yml
716709
tags: [windows-nimbus]
717-
- put: stembuild
710+
- put: stemcell-builder
718711
params:
719712
rebase: true
720-
repository: stembuild
713+
repository: stemcell-builder
721714
- task: bump-bosh-windows-acceptance-tests-deps
722715
file: golang-release/ci/tasks/shared/bump-deps.yml
723716
input_mapping:
@@ -786,7 +779,6 @@ jobs:
786779
passed:
787780
- test-stemcell-builder
788781
- test-bosh-psmodules
789-
- get: stembuild
790782
- get: lgpo-binary
791783
- get: version
792784
resource: main-version
@@ -895,8 +887,6 @@ jobs:
895887
- get: lgpo-binary
896888
- get: bosh-agent-release
897889
passed: [build]
898-
- get: stembuild
899-
passed: [build]
900890
- get: ovftool
901891
- put: nimbus-ips
902892
inputs: detect
@@ -1007,8 +997,6 @@ jobs:
1007997
- get: lgpo-binary
1008998
- get: bosh-agent-release
1009999
passed: [build]
1010-
- get: stembuild
1011-
passed: [build]
10121000
- get: ovftool
10131001
- put: nimbus-ips
10141002
inputs: detect
@@ -2193,16 +2181,14 @@ jobs:
21932181
- wuts-gcp
21942182
- wuts-aws-govcloud # implies => aws-build-number
21952183
- wuts-azure
2184+
- stembuild-linux
2185+
- stembuild-windows
21962186
- get: stembuild-untested-linux
21972187
passed: [ wuts-stembuild-linux-stemcell ]
21982188
- get: stembuild-linux-stemcell
21992189
passed: [ wuts-stembuild-linux-stemcell ]
22002190
- get: stembuild-untested-windows
22012191
passed: [ wuts-stembuild-windows-stemcell ]
2202-
- get: stembuild
2203-
passed:
2204-
- stembuild-linux
2205-
- stembuild-windows
22062192
- get: main-version
22072193
passed:
22082194
- wuts-gcp
@@ -2609,7 +2595,7 @@ jobs:
26092595
passed: [promote-azure]
26102596
- get: gcp-stemcell-final
26112597
passed: [promote-gcp]
2612-
- get: stembuild
2598+
- get: stemcell-builder
26132599
passed: [promote]
26142600
- get: stembuild-untested-windows
26152601
passed: [promote-stembuild]
@@ -2618,14 +2604,14 @@ jobs:
26182604
- task: set-stembuild-version
26192605
file: bosh-windows-stemcell-builder-ci/ci/tasks/set-stembuild-version/task.yml
26202606
image: bosh-windows-stemcell-builder-ci-image
2621-
- task: get-stembuild-commit-sha
2622-
file: bosh-windows-stemcell-builder-ci/ci/tasks/get-stembuild-commit-sha/task.yml
2607+
- task: get-repo-commit-sha
2608+
file: bosh-windows-stemcell-builder-ci/ci/tasks/get-repo-commit-sha/task.yml
26232609
image: bosh-windows-stemcell-builder-ci-image
2624-
- put: post-stembuild-release
2610+
- put: stemcell-builder-github-release
26252611
params:
26262612
name: final-stembuilds/tag
26272613
tag: final-stembuilds/tag
2628-
commitish: stembuild-commit/sha
2614+
commitish: stemcell-builder-commit/sha
26292615
globs:
26302616
- final-stembuilds/stembuild*
26312617

ci/tasks/build-stembuild-linux/run.sh

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ set -x
55
ROOT_DIR=$(pwd)
66

77
VERSION=$(cat version/version)
8-
STEMBUILD_DIR="${ROOT_DIR}/stembuild/stembuild"
98
OUTPUT_DIR="${ROOT_DIR}/output"
109

11-
cp "${ROOT_DIR}"/${STEMCELL_AUTOMATION_ZIP} "${STEMBUILD_DIR}/assets/StemcellAutomation.zip"
10+
cp "${ROOT_DIR}"/${STEMCELL_AUTOMATION_ZIP} \
11+
"${ROOT_DIR}/stemcell-builder/stembuild/assets/StemcellAutomation.zip"
1212

13-
pushd "${STEMBUILD_DIR}"
13+
pushd "${ROOT_DIR}/stemcell-builder/stembuild"
1414
echo '***Building Stembuild***'
15-
make \
16-
STEMCELL_VERSION="${VERSION}" \
17-
build
15+
make STEMCELL_VERSION="${VERSION}" build
1816
popd
1917

2018
echo '***Copying stembuild to output directory***'
21-
cp "${STEMBUILD_DIR}/out/stembuild" "${OUTPUT_DIR}/stembuild-linux-x86_64-${VERSION}"
19+
cp "${ROOT_DIR}/stemcell-builder/stembuild/out/stembuild" \
20+
"${OUTPUT_DIR}/stembuild-linux-x86_64-${VERSION}"

ci/tasks/build-stembuild-linux/task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
platform: linux
33

44
inputs:
5-
- name: stembuild
65
- name: bosh-windows-stemcell-builder-ci
6+
- name: stemcell-builder
77
- name: version
88
- name: stemcell-automation-release
99
optional: true

ci/tasks/build-stembuild-windows/task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
platform: windows
33

44
inputs:
5-
- name: stembuild
65
- name: bosh-windows-stemcell-builder-ci
6+
- name: stemcell-builder
77
- name: version
88
- name: stemcell-automation-release
99
optional: true

ci/tasks/generate-deps-file/task.yml

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

44
inputs:
55
- name: bosh-windows-stemcell-builder-ci
6-
- name: stembuild
6+
- name: stemcell-builder
77
- name: open-ssh
88
- name: lgpo-binary
99
- name: version
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
platform: linux
3+
4+
inputs:
5+
- name: stemcell-builder
6+
7+
outputs:
8+
- name: stemcell-builder-commit
9+
10+
run:
11+
path: bash
12+
args:
13+
- "-c"
14+
- |
15+
set -eu -o pipefail
16+
set -x
17+
ROOT="$(pwd)"
18+
cd stemcell-builder
19+
git rev-parse HEAD > ${ROOT}/stemcell-builder-commit/sha"

ci/tasks/get-stembuild-commit-sha/task.yml

Lines changed: 0 additions & 14 deletions
This file was deleted.

ci/tasks/test-contract-stembuild-linux/run.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ export PATH=${GOPATH}/bin:$PATH
1313
# install vcsim for vCenter manager and client contract integration tests
1414
go -C govmomi/vcsim install
1515

16-
pushd "${ROOT_DIR}/stembuild/stembuild"
16+
pushd "${ROOT_DIR}/stemcell-builder/stembuild"
1717
echo ***Test Stembuild Code***
1818

1919
make contract

ci/tasks/test-contract-stembuild-linux/task.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
platform: linux
33

44
inputs:
5-
- name: stembuild
65
- name: bosh-windows-stemcell-builder-ci
6+
- name: stemcell-builder
77
- name: govmomi
88

99
run:

0 commit comments

Comments
 (0)