Skip to content

Commit 2aa5fbf

Browse files
author
Rajath Agasthya
committed
Use tasks to build zip files when creating stemcells
1 parent c5b5c6c commit 2aa5fbf

File tree

7 files changed

+33
-10
lines changed

7 files changed

+33
-10
lines changed

‎ci/pipelines/stemcells-windows.yml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1386,6 +1386,12 @@ jobs:
13861386
params:
13871387
pre: build
13881388
tags: [*worker_tag]
1389+
- task: build-agent-zip
1390+
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/task.yml
1391+
image: bosh-windows-stemcell-builder-ci-image
1392+
- task: build-psmodules-zip
1393+
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/task.yml
1394+
image: bosh-windows-stemcell-builder-ci-image
13891395
- task: create-aws-stemcell
13901396
timeout: 2h
13911397
file: bosh-windows-stemcell-builder-ci/ci/tasks/create-aws-stemcell/task.yml
@@ -1726,6 +1732,12 @@ jobs:
17261732
params:
17271733
pre: build
17281734
tags: [*worker_tag]
1735+
- task: build-agent-zip
1736+
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/task.yml
1737+
image: bosh-windows-stemcell-builder-ci-image
1738+
- task: build-psmodules-zip
1739+
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/task.yml
1740+
image: bosh-windows-stemcell-builder-ci-image
17291741
- task: create-azure-stemcell
17301742
file: bosh-windows-stemcell-builder-ci/ci/tasks/create-azure-stemcell/task.yml
17311743
image: bosh-windows-stemcell-builder-ci-image
@@ -1922,6 +1934,12 @@ jobs:
19221934
params:
19231935
pre: build
19241936
tags: [*worker_tag]
1937+
- task: build-agent-zip
1938+
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/task.yml
1939+
image: bosh-windows-stemcell-builder-ci-image
1940+
- task: build-psmodules-zip
1941+
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/task.yml
1942+
image: bosh-windows-stemcell-builder-ci-image
19251943
- task: create-gcp-stemcell
19261944
file: bosh-windows-stemcell-builder-ci/ci/tasks/create-gcp-stemcell/task.yml
19271945
image: bosh-windows-stemcell-builder-ci-image

‎ci/tasks/create-aws-stemcell/run‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ pushd lgpo-binary
2929
unzip LGPO.zip
3030
popd
3131

32-
"${CONCOURSE_ROOT}/bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/run.sh"
33-
"${CONCOURSE_ROOT}/bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/run.sh"
34-
3532
pushd stemcell-builder
33+
mkdir -p build
34+
cp "${CONCOURSE_ROOT}/psmodules-zip-output/bosh-psmodules.zip" "${CONCOURSE_ROOT}/bosh-agent/agent.zip" build
35+
3636
bundle install --without test
3737

3838
rake build:aws

‎ci/tasks/create-aws-stemcell/task.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ inputs:
1313
- name: blobstore-s3-cli
1414
- name: blobstore-gcs-cli
1515
- name: windows-winsw
16+
- name: bosh-agent
17+
- name: psmodules-zip-output
1618

1719
outputs:
1820
- name: bosh-windows-stemcell

‎ci/tasks/create-azure-stemcell/run‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ popd
88

99
CONCOURSE_ROOT="$(pwd)"
1010

11-
"${CONCOURSE_ROOT}/bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/run.sh"
12-
"${CONCOURSE_ROOT}/bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/run.sh"
13-
1411
pushd stemcell-builder
12+
mkdir -p build
13+
cp "${CONCOURSE_ROOT}/psmodules-zip-output/bosh-psmodules.zip" "${CONCOURSE_ROOT}/bosh-agent/agent.zip" build
14+
1515
bundle install --without test
1616

1717
rake build:azure

‎ci/tasks/create-azure-stemcell/task.yml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ inputs:
1212
- name: blobstore-s3-cli
1313
- name: blobstore-gcs-cli
1414
- name: windows-winsw
15-
15+
- name: bosh-agent
16+
- name: psmodules-zip-output
1617

1718
outputs:
1819
- name: bosh-windows-stemcell

‎ci/tasks/create-gcp-stemcell/run‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ popd
88

99
CONCOURSE_ROOT="$(pwd)"
1010

11-
"${CONCOURSE_ROOT}/bosh-windows-stemcell-builder-ci/ci/tasks/build-agent-zip/run.sh"
12-
"${CONCOURSE_ROOT}/bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/run.sh"
13-
1411
pushd stemcell-builder
12+
mkdir -p build
13+
cp "${CONCOURSE_ROOT}/psmodules-zip-output/bosh-psmodules.zip" "${CONCOURSE_ROOT}/bosh-agent/agent.zip" build
14+
1515
bundle install --without test
1616

1717
rake build:gcp

‎ci/tasks/create-gcp-stemcell/task.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ inputs:
1313
- name: blobstore-s3-cli
1414
- name: blobstore-gcs-cli
1515
- name: windows-winsw
16+
- name: bosh-agent
17+
- name: psmodules-zip-output
1618

1719
outputs:
1820
- name: bosh-windows-stemcell

0 commit comments

Comments
 (0)