Skip to content

Commit cdc0907

Browse files
committed
CI: add missing image ref; normalize worker tags
1 parent fe28d77 commit cdc0907

File tree

2 files changed

+43
-42
lines changed

2 files changed

+43
-42
lines changed

ci/pipelines/stemcells-windows.yml

Lines changed: 43 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ anchors:
88
- &windows_stemcell_ci_tag windows-2019
99
- &windows_os_version windows2019
1010
- &windows_os_line "2019"
11-
- &internal_worker_tag broadcom
1211
- &worker_tag
12+
- &worker_tag_internal broadcom
13+
- &worker_tag_windows windows-nimbus
1314

1415
groups:
1516
- name: all
@@ -527,6 +528,7 @@ jobs:
527528
- in_parallel:
528529
- get: bosh-windows-stemcell-builder-ci
529530
tags: [*worker_tag]
531+
- get: bosh-windows-stemcell-builder-ci-image
530532
- get: bosh-windows-stemcell-builder-dockerfiles
531533
trigger: true
532534
tags: [*worker_tag]
@@ -536,8 +538,10 @@ jobs:
536538
- in_parallel:
537539
- task: build-azstemcell
538540
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-azstemcell/task.yml
541+
image: bosh-windows-stemcell-builder-ci-image
539542
- task: build-docker-args
540543
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-docker-args/task.yml
544+
image: bosh-windows-stemcell-builder-ci-image
541545
params:
542546
GITHUB_ACCESS_TOKEN: ((github_public_repo_token))
543547
- put: bosh-windows-stemcell-builder-ci-docker-image
@@ -582,7 +586,7 @@ jobs:
582586
trigger: true
583587
- task: bump-golang-deps-stembuild
584588
file: golang-release/ci/tasks/shared/bump-deps.yml
585-
tags: [*internal_worker_tag]
589+
tags: [*worker_tag_internal]
586590
params:
587591
SOURCE_PATH: stembuild
588592
GOPROXY: ((repository_mirrors.goproxy))
@@ -593,7 +597,7 @@ jobs:
593597
output_repo: stemcell-builder
594598
- task: bump-golang-deps-acceptance_test
595599
file: golang-release/ci/tasks/shared/bump-deps.yml
596-
tags: [*internal_worker_tag]
600+
tags: [*worker_tag_internal]
597601
params:
598602
SOURCE_PATH: acceptance_test
599603
GOPROXY: ((repository_mirrors.goproxy))
@@ -608,7 +612,7 @@ jobs:
608612
image: bosh-windows-stemcell-builder-ci-image
609613
- task: unit-test-on-windows
610614
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-windows/task.yml
611-
tags: [windows-nimbus]
615+
tags: [*worker_tag_windows]
612616
- task: acceptance-test-dry-run
613617
file: bosh-windows-stemcell-builder-ci/ci/tasks/acceptance-test-dry-run/task.yml
614618
image: bosh-windows-stemcell-builder-ci-image
@@ -631,12 +635,12 @@ jobs:
631635
tags: [*worker_tag]
632636
- task: test-units-psmodules
633637
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-bosh-psmodules/task.yml
634-
tags: [windows-nimbus]
638+
tags: [*worker_tag_windows]
635639
params:
636640
MODULES_DIR: modules
637641
- task: test-units-stembuild-stemcell-automation-psmodules
638642
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-bosh-psmodules/task.yml
639-
tags: [windows-nimbus]
643+
tags: [*worker_tag_windows]
640644
params:
641645
MODULES_DIR: stembuild/stemcell-automation
642646

@@ -659,6 +663,7 @@ jobs:
659663
- get: windows-winsw
660664
- task: test-stemcell-builder
661665
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-stemcell-builder/task.yml
666+
image: bosh-windows-stemcell-builder-ci-image
662667

663668
- name: build
664669
serial: true
@@ -827,9 +832,9 @@ jobs:
827832
image: bosh-windows-stemcell-builder-ci-image
828833
- task: unit-test
829834
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-units-stembuild-windows/task.yml
830-
tags: [windows-nimbus]
835+
tags: [*worker_tag_windows]
831836
- task: setup-integration-test-vm
832-
tags: [windows-nimbus]
837+
tags: [*worker_tag_windows]
833838
file: bosh-windows-stemcell-builder-ci/ci/tasks/setup-integration-test-vm/task.yml
834839
image: bosh-windows-stemcell-builder-ci-image
835840
params:
@@ -856,7 +861,7 @@ jobs:
856861
- task: fetch-integration-vm-ip
857862
file: bosh-windows-stemcell-builder-ci/ci/tasks/fetch-vm-ip/task.yml
858863
image: bosh-windows-stemcell-builder-ci-image
859-
tags: [ windows-nimbus ]
864+
tags: [*worker_tag_windows]
860865
params:
861866
GOVC_URL: ((nimbus_windows-demo_auth_url))
862867
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
@@ -867,7 +872,7 @@ jobs:
867872
format: trim
868873
reveal: true
869874
- task: integration
870-
tags: [windows-nimbus]
875+
tags: [*worker_tag_windows]
871876
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-integration-stembuild-windows/task.yml
872877
timeout: 3h
873878
params:
@@ -891,7 +896,7 @@ jobs:
891896
OS_LINE: *windows_os_line
892897
TARGET_VM_IP: ((.:integration-vm-ip))
893898
- task: build
894-
tags: [windows-nimbus]
899+
tags: [*worker_tag_windows]
895900
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-stembuild-windows/task.yml
896901
params:
897902
STEMCELL_AUTOMATION_ZIP: zip-file/StemcellAutomation-*.zip
@@ -901,7 +906,7 @@ jobs:
901906
ensure:
902907
do:
903908
- task: delete-integration-test-vm
904-
tags: [windows-nimbus]
909+
tags: [*worker_tag_windows]
905910
file: bosh-windows-stemcell-builder-ci/ci/tasks/delete-integration-test-vm/task.yml
906911
image: bosh-windows-stemcell-builder-ci-image
907912
params:
@@ -960,7 +965,7 @@ jobs:
960965
- task: setup-integration-test-vm
961966
file: bosh-windows-stemcell-builder-ci/ci/tasks/setup-integration-test-vm/task.yml
962967
image: bosh-windows-stemcell-builder-ci-image
963-
tags: [windows-nimbus]
968+
tags: [*worker_tag_windows]
964969
params:
965970
VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
966971
OS_LINE: *windows_os_line
@@ -985,7 +990,7 @@ jobs:
985990
- task: fetch-integration-vm-ip
986991
file: bosh-windows-stemcell-builder-ci/ci/tasks/fetch-vm-ip/task.yml
987992
image: bosh-windows-stemcell-builder-ci-image
988-
tags: [ windows-nimbus ]
993+
tags: [*worker_tag_windows]
989994
params:
990995
GOVC_URL: ((nimbus_windows-demo_auth_url))
991996
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
@@ -998,7 +1003,7 @@ jobs:
9981003
- task: integration
9991004
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-integration-stembuild-linux/task.yml
10001005
image: bosh-windows-stemcell-builder-ci-image
1001-
tags: [windows-nimbus]
1006+
tags: [*worker_tag_windows]
10021007
timeout: 3h
10031008
params:
10041009
CONTRACT_TEST_VM_NAME: stembuild-base-vm-2019
@@ -1031,9 +1036,9 @@ jobs:
10311036
ensure:
10321037
do:
10331038
- task: delete-integration-test-vm
1034-
tags: [windows-nimbus]
1035-
image: bosh-windows-stemcell-builder-ci-image
10361039
file: bosh-windows-stemcell-builder-ci/ci/tasks/delete-integration-test-vm/task.yml
1040+
image: bosh-windows-stemcell-builder-ci-image
1041+
tags: [*worker_tag_windows]
10371042
params:
10381043
CLONE_FOLDER: /dc0/vm/windows-stemcell-ci
10391044
VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
@@ -1060,7 +1065,7 @@ jobs:
10601065
- task: revert-snapshot
10611066
file: bosh-windows-stemcell-builder-ci/ci/tasks/revert-snapshot/task.yml
10621067
image: bosh-windows-stemcell-builder-ci-image
1063-
tags: [windows-nimbus]
1068+
tags: [*worker_tag_windows]
10641069
params:
10651070
GOVC_URL: ((nimbus_windows-demo_auth_url))
10661071
DATACENTER: dc0
@@ -1069,7 +1074,7 @@ jobs:
10691074
- task: install-windows-updates
10701075
file: bosh-windows-stemcell-builder-ci/ci/tasks/install-windows-updates/task.yml
10711076
image: bosh-windows-stemcell-builder-ci-image
1072-
tags: [windows-nimbus]
1077+
tags: [*worker_tag_windows]
10731078
params:
10741079
GOVC_URL: ((nimbus_windows-demo_auth_url))
10751080
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
@@ -1079,7 +1084,7 @@ jobs:
10791084
- task: update-snapshot
10801085
file: bosh-windows-stemcell-builder-ci/ci/tasks/update-snapshot/task.yml
10811086
image: bosh-windows-stemcell-builder-ci-image
1082-
tags: [windows-nimbus]
1087+
tags: [*worker_tag_windows]
10831088
params:
10841089
GOVC_URL: ((nimbus_windows-demo_auth_url))
10851090
DATACENTER: dc0
@@ -1088,7 +1093,7 @@ jobs:
10881093
- task: run-stembuild-construct
10891094
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-construct-stembuild-linux/task.yml
10901095
image: bosh-windows-stemcell-builder-ci-image
1091-
tags: [windows-nimbus]
1096+
tags: [*worker_tag_windows]
10921097
params:
10931098
GOVC_URL: ((nimbus_windows-demo_auth_url))
10941099
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
@@ -1101,7 +1106,7 @@ jobs:
11011106
- task: run-stembuild-package
11021107
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-package-stembuild-linux/task.yml
11031108
image: bosh-windows-stemcell-builder-ci-image
1104-
tags: [windows-nimbus]
1109+
tags: [*worker_tag_windows]
11051110
params:
11061111
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
11071112
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
@@ -1148,7 +1153,7 @@ jobs:
11481153
- task: run-bwats-stembuild-linux
11491154
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-bwats/task.yml
11501155
image: bosh-windows-stemcell-builder-ci-image
1151-
tags: [windows-nimbus]
1156+
tags: [*worker_tag_windows]
11521157
input_mapping: { stemcell: stembuild-linux-stemcell }
11531158
params:
11541159
BOSH_CA_CERT: ((nimbus_windows-demo_bosh_ca_cert.ca))
@@ -1187,7 +1192,7 @@ jobs:
11871192
- task: run-wuts
11881193
file: windows-utilities-release/ci/tasks/run-wuts/task.yml
11891194
image: bosh-integration-registry-image
1190-
tags: [windows-nimbus]
1195+
tags: [*worker_tag_windows]
11911196
input_mapping: { stemcell: stembuild-linux-stemcell }
11921197
params:
11931198
AZ: z1
@@ -1225,7 +1230,7 @@ jobs:
12251230
- task: revert-snapshot
12261231
file: bosh-windows-stemcell-builder-ci/ci/tasks/revert-snapshot/task.yml
12271232
image: bosh-windows-stemcell-builder-ci-image
1228-
tags: [windows-nimbus]
1233+
tags: [*worker_tag_windows]
12291234
params:
12301235
GOVC_URL: ((nimbus_windows-demo_auth_url))
12311236
DATACENTER: dc0
@@ -1234,7 +1239,7 @@ jobs:
12341239
- task: install-windows-updates
12351240
file: bosh-windows-stemcell-builder-ci/ci/tasks/install-windows-updates/task.yml
12361241
image: bosh-windows-stemcell-builder-ci-image
1237-
tags: [windows-nimbus]
1242+
tags: [*worker_tag_windows]
12381243
params:
12391244
GOVC_URL: ((nimbus_windows-demo_auth_url))
12401245
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
@@ -1244,7 +1249,7 @@ jobs:
12441249
- task: update-snapshot
12451250
file: bosh-windows-stemcell-builder-ci/ci/tasks/update-snapshot/task.yml
12461251
image: bosh-windows-stemcell-builder-ci-image
1247-
tags: [windows-nimbus]
1252+
tags: [*worker_tag_windows]
12481253
params:
12491254
GOVC_URL: ((nimbus_windows-demo_auth_url))
12501255
DATACENTER: dc0
@@ -1253,7 +1258,7 @@ jobs:
12531258
- task: fetch-vm-ip
12541259
file: bosh-windows-stemcell-builder-ci/ci/tasks/fetch-vm-ip/task.yml
12551260
image: bosh-windows-stemcell-builder-ci-image
1256-
tags: [ windows-nimbus ]
1261+
tags: [*worker_tag_windows]
12571262
params:
12581263
GOVC_URL: ((nimbus_windows-demo_auth_url))
12591264
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
@@ -1265,7 +1270,7 @@ jobs:
12651270
reveal: true
12661271
- task: run-stembuild-construct
12671272
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-construct-stembuild-windows/task.yml
1268-
tags: [windows-nimbus]
1273+
tags: [*worker_tag_windows]
12691274
params:
12701275
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
12711276
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
@@ -1277,7 +1282,7 @@ jobs:
12771282
STEMBUILD_BASE_VM_PASSWORD: ((stembuild_vm_user.password))
12781283
- task: run-stembuild-package
12791284
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-package-stembuild-windows/task.yml
1280-
tags: [windows-nimbus]
1285+
tags: [*worker_tag_windows]
12811286
params:
12821287
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
12831288
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
@@ -1315,7 +1320,7 @@ jobs:
13151320
- task: run-bwats-stembuild-windows
13161321
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-bwats/task.yml
13171322
image: bosh-windows-stemcell-builder-ci-image
1318-
tags: [windows-nimbus]
1323+
tags: [*worker_tag_windows]
13191324
input_mapping: { stemcell: stembuild-windows-stemcell }
13201325
params:
13211326
BOSH_CA_CERT: ((nimbus_windows-demo_bosh_ca_cert.ca))
@@ -1354,7 +1359,7 @@ jobs:
13541359
- task: run-wuts
13551360
file: windows-utilities-release/ci/tasks/run-wuts/task.yml
13561361
image: bosh-integration-registry-image
1357-
tags: [windows-nimbus]
1362+
tags: [*worker_tag_windows]
13581363
input_mapping: { stemcell: stembuild-windows-stemcell }
13591364
params:
13601365
AZ: z1
@@ -1598,9 +1603,9 @@ jobs:
15981603
file: bosh-windows-stemcell-builder-ci/ci/tasks/build-psmodules-zip/task.yml
15991604
image: bosh-windows-stemcell-builder-ci-image
16001605
- task: create-aws-govcloud-stemcell
1601-
timeout: 1h30m
16021606
file: bosh-windows-stemcell-builder-ci/ci/tasks/create-aws-stemcell/task.yml
16031607
image: bosh-windows-stemcell-builder-ci-image
1608+
timeout: 1h30m
16041609
params:
16051610
PACKER_AWS_ACCESS_KEY: ((packer_user_gov_aws_access_key.username))
16061611
AWS_REGION: us-gov-west-1
@@ -2032,7 +2037,7 @@ jobs:
20322037
passed: [create-gcp]
20332038
- do:
20342039
- task: run-bwats-gcp-stemcell
2035-
tags: [*internal_worker_tag]
2040+
tags: [*worker_tag_internal]
20362041
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-bwats/task.yml
20372042
image: bosh-windows-stemcell-builder-ci-image
20382043
input_mapping: { stemcell: bosh-windows-stemcell }
@@ -2075,7 +2080,7 @@ jobs:
20752080
- get: bosh-integration-registry-image
20762081
- do:
20772082
- task: run-wuts
2078-
tags: [*internal_worker_tag]
2083+
tags: [*worker_tag_internal]
20792084
file: windows-utilities-release/ci/tasks/run-wuts/task.yml
20802085
image: bosh-integration-registry-image
20812086
input_mapping: { stemcell: bosh-windows-stemcell }
@@ -2460,14 +2465,14 @@ jobs:
24602465
- get: boshio-input
24612466
resource: boshio
24622467
- task: azure-set-stemcell-filename-version
2463-
input_mapping: { bosh-windows-stemcell: azure-tested }
2464-
output_mapping: { final-stemcell: azure-stemcell-final }
24652468
file: bosh-windows-stemcell-builder-ci/ci/tasks/set-stemcell-version/task.yml
24662469
image: bosh-windows-stemcell-builder-ci-image
2470+
input_mapping: { bosh-windows-stemcell: azure-tested }
2471+
output_mapping: { final-stemcell: azure-stemcell-final }
24672472
- task: commit-meta4-file
2468-
input_mapping: { stemcell: azure-stemcell-final }
24692473
file: bosh-windows-stemcell-builder-ci/ci/tasks/commit-meta4-file/task.yml
24702474
image: bosh-windows-stemcell-builder-ci-image
2475+
input_mapping: { stemcell: azure-stemcell-final }
24712476
params:
24722477
IAAS: azure
24732478
OS_NAME: windows

ci/tasks/test-stemcell-builder/task.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
---
22
platform: linux
3-
image_resource:
4-
type: registry-image
5-
source:
6-
repository: bosh/windows-stemcell-ci
73

84
inputs:
95
- name: bosh-windows-stemcell-builder-ci

0 commit comments

Comments
 (0)