Skip to content

Commit cc7871a

Browse files
selzocaramprice
andcommitted
BWATS: Separate acceptance test resource from builder
This will allow us to fiddle with BWATS without running the pipeline from the beginning. Co-authored-by: Aram Price <[email protected]>
1 parent 3884cda commit cc7871a

File tree

4 files changed

+26
-3
lines changed

4 files changed

+26
-3
lines changed

ci/pipelines/stemcells-windows.yml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ resources:
126126
branch: *bosh_windows_stemcell_builder_branch
127127
ignore_paths:
128128
- ci/
129+
- acceptance_test/
129130
username: bosh-admin-bot
130131
password: ((github_public_repo_token))
131132
- name: bosh-windows-stemcell-builder-ci
@@ -138,6 +139,16 @@ resources:
138139
- ci/
139140
username: bosh-admin-bot
140141
password: ((github_public_repo_token))
142+
- name: bosh-windows-stemcell-acceptance-tests
143+
type: git
144+
tags: [*worker_tag]
145+
source:
146+
uri: https://github.com/cloudfoundry/bosh-windows-stemcell-builder.git
147+
branch: *bosh_windows_stemcell_builder_branch
148+
paths:
149+
- acceptance_test/
150+
username: bosh-admin-bot
151+
password: ((github_public_repo_token))
141152
- name: bosh-windows-stemcell-builder-dockerfiles
142153
type: git
143154
tags: [*worker_tag]
@@ -1113,6 +1124,8 @@ jobs:
11131124
steps:
11141125
- get: bosh-windows-stemcell-builder-ci
11151126
tags: [*worker_tag]
1127+
- get: bosh-windows-stemcell-acceptance-tests
1128+
tags: [*worker_tag]
11161129
- get: bosh-windows-stemcell-builder-ci-image
11171130
tags: [*worker_tag]
11181131
- get: stemcell-builder
@@ -1278,6 +1291,8 @@ jobs:
12781291
steps:
12791292
- get: bosh-windows-stemcell-builder-ci
12801293
tags: [*worker_tag]
1294+
- get: bosh-windows-stemcell-acceptance-tests
1295+
tags: [*worker_tag]
12811296
- get: bosh-windows-stemcell-builder-ci-image
12821297
tags: [*worker_tag]
12831298
- get: stemcell-builder
@@ -1445,6 +1460,8 @@ jobs:
14451460
steps:
14461461
- get: bosh-windows-stemcell-builder-ci
14471462
tags: [*worker_tag]
1463+
- get: bosh-windows-stemcell-acceptance-tests
1464+
tags: [*worker_tag]
14481465
- get: bosh-windows-stemcell-builder-ci-image
14491466
tags: [*worker_tag]
14501467
- get: bosh-windows-stemcell
@@ -1615,6 +1632,8 @@ jobs:
16151632
steps:
16161633
- get: bosh-windows-stemcell-builder-ci
16171634
tags: [*worker_tag]
1635+
- get: bosh-windows-stemcell-acceptance-tests
1636+
tags: [*worker_tag]
16181637
- get: bosh-windows-stemcell-builder-ci-image
16191638
tags: [*worker_tag]
16201639
- get: bosh-windows-stemcell
@@ -1791,6 +1810,8 @@ jobs:
17911810
steps:
17921811
- get: bosh-windows-stemcell-builder-ci
17931812
tags: [*worker_tag]
1813+
- get: bosh-windows-stemcell-acceptance-tests
1814+
tags: [*worker_tag]
17941815
- get: bosh-windows-stemcell-builder-ci-image
17951816
tags: [*worker_tag]
17961817
- get: stemcell-builder
@@ -1984,6 +2005,8 @@ jobs:
19842005
passed: [create-gcp]
19852006
- get: bosh-windows-stemcell-builder-ci
19862007
tags: [*worker_tag]
2008+
- get: bosh-windows-stemcell-acceptance-tests
2009+
tags: [*worker_tag]
19872010
- get: bosh-windows-stemcell-builder-ci-image
19882011
tags: [*worker_tag]
19892012
- get: stemcell-builder

ci/pipelines/vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ AZURE_RESOURCE_GROUP_NAME: ((KOALA_RESOURCE_GROUP_NAME))
2121
AZURE_SUBSCRIPTION_ID: ((KOALA_SUBSCRIPTION_ID))
2222
AZURE_HEAVY_AZ: z1
2323
AZURE_HEAVY_NETWORK: default
24-
AZURE_HEAVY_VM_TYPE: default
24+
AZURE_HEAVY_VM_TYPE: large
2525

2626
# GCP
2727
GCP_BASE_IMAGE_REGEX: windows-server-2019-dc-core-v.*

ci/tasks/run-bwats/run

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ set -x
1313
resolved_stemcell_path=$(readlink -f ${STEMCELL_PATH})
1414
json_safe_bosh_ca_cert="${BOSH_CA_CERT//$'\n'/\\n}"
1515

16-
pushd stemcell-builder/acceptance_test
16+
pushd bosh-windows-stemcell-acceptance-tests/acceptance_test
1717
export CONFIG_JSON=config.json
1818

1919
cat > "${CONFIG_JSON}" <<-END_OF_CONFIG

ci/tasks/run-bwats/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: stemcell-builder
6+
- name: bosh-windows-stemcell-acceptance-tests
77
- name: stemcell
88

99
run:

0 commit comments

Comments
 (0)