Skip to content

Commit 3807f8d

Browse files
arampricearamprice
committed
CI: harmonize job / asset naming
- clean up integration setup task
1 parent fc1763e commit 3807f8d

File tree

3 files changed

+43
-45
lines changed

3 files changed

+43
-45
lines changed

‎ci/pipelines/stemcells-windows.yml‎

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -837,12 +837,14 @@ jobs:
837837
params:
838838
VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
839839
OS_LINE: *windows_os_line
840-
BASE_VM_IPATH: /dc0/vm/bosh-windows-ci-vms-and-templates/stembuild_base_vm_2019_
840+
BASE_VM_IPATH: /dc0/vm/windows-stemcell-ci/stembuild-base-vm-2019
841841
CLONE_DATASTORE: ((nimbus_windows-demo_ds))
842842
CLONE_RESOURCE_POOL: /dc0/host/concourse_cluster/Resources
843-
CLONE_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
844-
JOB_OS_NAME: "windows"
845-
VM_CUSTOMIZATION_NAME: Bosh-Windows-2019-Base
843+
CLONE_FOLDER: /dc0/vm/windows-stemcell-ci
844+
CLONE_PREFIX: windows-stembuild-integration
845+
VM_CUSTOMIZATION_NAME: Windows-Stemcell-Base-2019
846+
VM_ORG_NAME: Broadcom
847+
VM_USERNAME: Tanzu Platform
846848
- task: generate-deps-file
847849
file: bosh-windows-stemcell-builder-ci/ci/tasks/generate-deps-file/task.yml
848850
image: bosh-windows-stemcell-builder-ci-image
@@ -860,7 +862,7 @@ jobs:
860862
params:
861863
GOVC_URL: ((nimbus_windows-demo_auth_url))
862864
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
863-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
865+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
864866
VM_NAME: ((.:integration-vm-name))
865867
- load_var: integration-vm-ip
866868
file: vm-ip/ip
@@ -871,7 +873,7 @@ jobs:
871873
file: bosh-windows-stemcell-builder-ci/ci/tasks/test-integration-stembuild-windows/task.yml
872874
timeout: 3h
873875
params:
874-
CONTRACT_TEST_VM_NAME: stembuild_base_vm_2019_
876+
CONTRACT_TEST_VM_NAME: stembuild-base-vm-2019
875877
CONTRACT_TEST_VM_PASSWORD: ((stembuild_vm_user.password))
876878
CONTRACT_TEST_VM_USERNAME: ((stembuild_vm_user.username))
877879

@@ -884,10 +886,10 @@ jobs:
884886
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
885887
VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
886888

887-
VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
889+
VM_FOLDER: /dc0/vm/windows-stemcell-ci
888890
VM_USERNAME: ((stembuild_vm_user.username))
889891
VM_PASSWORD: ((stembuild_vm_user.password))
890-
PACKAGE_TEST_VM_NAME: stembuild-package-integration-tests-base-vm
892+
PACKAGE_TEST_VM_NAME: stembuild-integration-base-vm-2019
891893
OS_LINE: *windows_os_line
892894
TARGET_VM_IP: ((.:integration-vm-ip))
893895
- task: build
@@ -905,7 +907,7 @@ jobs:
905907
file: bosh-windows-stemcell-builder-ci/ci/tasks/delete-integration-test-vm/task.yml
906908
image: bosh-windows-stemcell-builder-ci-image
907909
params:
908-
CLONE_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
910+
CLONE_FOLDER: /dc0/vm/windows-stemcell-ci
909911
VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
910912

911913
- name: stembuild-linux
@@ -964,12 +966,14 @@ jobs:
964966
params:
965967
VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
966968
OS_LINE: *windows_os_line
967-
BASE_VM_IPATH: /dc0/vm/bosh-windows-ci-vms-and-templates/stembuild_base_vm_2019_
969+
BASE_VM_IPATH: /dc0/vm/windows-stemcell-ci/stembuild-base-vm-2019
968970
CLONE_DATASTORE: ((nimbus_windows-demo_ds))
969971
CLONE_RESOURCE_POOL: /dc0/host/concourse_cluster/Resources
970-
CLONE_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
971-
JOB_OS_NAME: "linux"
972-
VM_CUSTOMIZATION_NAME: Bosh-Windows-2019-Base
972+
CLONE_FOLDER: /dc0/vm/windows-stemcell-ci
973+
CLONE_PREFIX: linux-stembuild-integration
974+
VM_CUSTOMIZATION_NAME: Windows-Stemcell-Base-2019
975+
VM_ORG_NAME: Broadcom
976+
VM_USERNAME: Tanzu Platform
973977
- task: generate-deps-file
974978
file: bosh-windows-stemcell-builder-ci/ci/tasks/generate-deps-file/task.yml
975979
image: bosh-windows-stemcell-builder-ci-image
@@ -987,7 +991,7 @@ jobs:
987991
params:
988992
GOVC_URL: ((nimbus_windows-demo_auth_url))
989993
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
990-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
994+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
991995
VM_NAME: ((.:integration-vm-name))
992996
- load_var: integration-vm-ip
993997
file: vm-ip/ip
@@ -999,7 +1003,7 @@ jobs:
9991003
tags: [windows-nimbus]
10001004
timeout: 3h
10011005
params:
1002-
CONTRACT_TEST_VM_NAME: stembuild_base_vm_2019_
1006+
CONTRACT_TEST_VM_NAME: stembuild-base-vm-2019
10031007
CONTRACT_TEST_VM_PASSWORD: ((stembuild_vm_user.password))
10041008
CONTRACT_TEST_VM_USERNAME: ((stembuild_vm_user.username))
10051009

@@ -1012,10 +1016,10 @@ jobs:
10121016
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
10131017
VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
10141018

1015-
VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1019+
VM_FOLDER: /dc0/vm/windows-stemcell-ci
10161020
VM_USERNAME: ((stembuild_vm_user.username))
10171021
VM_PASSWORD: ((stembuild_vm_user.password))
1018-
PACKAGE_TEST_VM_NAME: stembuild-package-integration-tests-base-vm
1022+
PACKAGE_TEST_VM_NAME: stembuild-integration-base-vm-2019
10191023
OS_LINE: *windows_os_line
10201024
TARGET_VM_IP: ((.:integration-vm-ip))
10211025
- task: build
@@ -1033,7 +1037,7 @@ jobs:
10331037
image: bosh-windows-stemcell-builder-ci-image
10341038
file: bosh-windows-stemcell-builder-ci/ci/tasks/delete-integration-test-vm/task.yml
10351039
params:
1036-
CLONE_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1040+
CLONE_FOLDER: /dc0/vm/windows-stemcell-ci
10371041
VCENTER_ADMIN_CREDENTIAL_URL: ((nimbus_windows-demo_auth_url))
10381042

10391043
- name: create-stembuild-linux-stemcell
@@ -1062,7 +1066,7 @@ jobs:
10621066
params:
10631067
GOVC_URL: ((nimbus_windows-demo_auth_url))
10641068
DATACENTER: dc0
1065-
VM_TO_REVERT: /dc0/vm/bosh-windows-ci-vms-and-templates/windows-server-2019-base-vm-linux
1069+
VM_TO_REVERT: /dc0/vm/windows-stemcell-ci/linux-stembuild-base-vm-2019
10661070
SNAPSHOT_NAME: "stembuild-ready-power-on"
10671071
- task: install-windows-updates
10681072
file: bosh-windows-stemcell-builder-ci/ci/tasks/install-windows-updates/task.yml
@@ -1071,7 +1075,7 @@ jobs:
10711075
params:
10721076
GOVC_URL: ((nimbus_windows-demo_auth_url))
10731077
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
1074-
STEMBUILD_CONSTRUCT_TARGET_VM: /dc0/vm/bosh-windows-ci-vms-and-templates/windows-server-2019-base-vm-linux
1078+
STEMBUILD_CONSTRUCT_TARGET_VM: /dc0/vm/windows-stemcell-ci/linux-stembuild-base-vm-2019
10751079
VM_USERNAME: ((stembuild_vm_user.username))
10761080
VM_PASSWORD: ((stembuild_vm_user.password))
10771081
- task: update-snapshot
@@ -1081,7 +1085,7 @@ jobs:
10811085
params:
10821086
GOVC_URL: ((nimbus_windows-demo_auth_url))
10831087
DATACENTER: dc0
1084-
VM_TO_SNAPSHOT: /dc0/vm/bosh-windows-ci-vms-and-templates/windows-server-2019-base-vm-linux
1088+
VM_TO_SNAPSHOT: /dc0/vm/windows-stemcell-ci/linux-stembuild-base-vm-2019
10851089
SNAPSHOT_NAME: "stembuild-ready-power-on"
10861090
- task: run-stembuild-construct
10871091
file: bosh-windows-stemcell-builder-ci/ci/tasks/run-construct-stembuild-linux/task.yml
@@ -1092,8 +1096,8 @@ jobs:
10921096
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
10931097
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
10941098
VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
1095-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1096-
STEMBUILD_BASE_VM_NAME: windows-server-2019-base-vm-linux
1099+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
1100+
STEMBUILD_BASE_VM_NAME: linux-stembuild-base-vm-2019
10971101
STEMBUILD_BASE_VM_USERNAME: ((stembuild_vm_user.username))
10981102
STEMBUILD_BASE_VM_PASSWORD: ((stembuild_vm_user.password))
10991103
- task: run-stembuild-package
@@ -1104,8 +1108,8 @@ jobs:
11041108
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
11051109
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
11061110
VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
1107-
STEMBUILD_BASE_VM_NAME: windows-server-2019-base-vm-linux
1108-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1111+
STEMBUILD_BASE_VM_NAME: linux-stembuild-base-vm-2019
1112+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
11091113
- &print-updates
11101114
task: print-updates
11111115
image: bosh-windows-stemcell-builder-ci-image
@@ -1227,7 +1231,7 @@ jobs:
12271231
params:
12281232
GOVC_URL: ((nimbus_windows-demo_auth_url))
12291233
DATACENTER: dc0
1230-
VM_TO_REVERT: /dc0/vm/bosh-windows-ci-vms-and-templates/windows-server-2019-base-vm-windows
1234+
VM_TO_REVERT: /dc0/vm/windows-stemcell-ci/windows-stembuild-base-vm-2019
12311235
SNAPSHOT_NAME: "stembuild-ready-power-on"
12321236
- task: install-windows-updates
12331237
file: bosh-windows-stemcell-builder-ci/ci/tasks/install-windows-updates/task.yml
@@ -1236,7 +1240,7 @@ jobs:
12361240
params:
12371241
GOVC_URL: ((nimbus_windows-demo_auth_url))
12381242
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
1239-
STEMBUILD_CONSTRUCT_TARGET_VM: /dc0/vm/bosh-windows-ci-vms-and-templates/windows-server-2019-base-vm-windows
1243+
STEMBUILD_CONSTRUCT_TARGET_VM: /dc0/vm/windows-stemcell-ci/windows-stembuild-base-vm-2019
12401244
VM_USERNAME: ((stembuild_vm_user.username))
12411245
VM_PASSWORD: ((stembuild_vm_user.password))
12421246
- task: update-snapshot
@@ -1246,7 +1250,7 @@ jobs:
12461250
params:
12471251
GOVC_URL: ((nimbus_windows-demo_auth_url))
12481252
DATACENTER: dc0
1249-
VM_TO_SNAPSHOT: /dc0/vm/bosh-windows-ci-vms-and-templates/windows-server-2019-base-vm-windows
1253+
VM_TO_SNAPSHOT: /dc0/vm/windows-stemcell-ci/windows-stembuild-base-vm-2019
12501254
SNAPSHOT_NAME: "stembuild-ready-power-on"
12511255
- task: fetch-vm-ip
12521256
file: bosh-windows-stemcell-builder-ci/ci/tasks/fetch-vm-ip/task.yml
@@ -1255,8 +1259,8 @@ jobs:
12551259
params:
12561260
GOVC_URL: ((nimbus_windows-demo_auth_url))
12571261
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
1258-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1259-
VM_NAME: windows-server-2019-base-vm-windows
1262+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
1263+
VM_NAME: windows-stembuild-base-vm-2019
12601264
- load_var: ip
12611265
file: vm-ip/ip
12621266
format: trim
@@ -1268,8 +1272,8 @@ jobs:
12681272
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
12691273
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
12701274
VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
1271-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1272-
STEMBUILD_BASE_VM_NAME: windows-server-2019-base-vm-windows
1275+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
1276+
STEMBUILD_BASE_VM_NAME: windows-stembuild-base-vm-2019
12731277
STEMBUILD_BASE_VM_IP: ((.:ip))
12741278
STEMBUILD_BASE_VM_USERNAME: ((stembuild_vm_user.username))
12751279
STEMBUILD_BASE_VM_PASSWORD: ((stembuild_vm_user.password))
@@ -1280,8 +1284,8 @@ jobs:
12801284
VCENTER_BASE_URL: ((nimbus_windows-demo_base_url))
12811285
VCENTER_USERNAME: ((nimbus_windows-demo_user.username))
12821286
VCENTER_PASSWORD: ((nimbus_windows-demo_user.password))
1283-
STEMBUILD_BASE_VM_NAME: windows-server-2019-base-vm-windows
1284-
VCENTER_VM_FOLDER: /dc0/vm/bosh-windows-ci-vms-and-templates
1287+
STEMBUILD_BASE_VM_NAME: windows-stembuild-base-vm-2019
1288+
VCENTER_VM_FOLDER: /dc0/vm/windows-stemcell-ci
12851289
- *print-updates
12861290
- put: stembuild-windows-stemcell
12871291
attempts: 3 # <- to address nimbus network issues

‎ci/tasks/setup-integration-test-vm/run.sh‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ export GOVC_URL="${VCENTER_ADMIN_CREDENTIAL_URL}"
66
ROOT_DIR=$(pwd)
77
export OUTPUT_DIR=${ROOT_DIR}/output
88

9-
CLONE_NAME_PREFIX="construct-${JOB_OS_NAME}-integration-ci-${OS_LINE}"
10-
CLONE_NAME_SUFFIX=$(mktemp -u XXXXXX)
11-
CLONE_NAME="${CLONE_NAME_PREFIX}-${CLONE_NAME_SUFFIX}"
12-
13-
export CLONE_NAME_PREFIX
14-
export CLONE_NAME_SUFFIX
15-
export CLONE_NAME
9+
CLONE_NAME="${CLONE_PREFIX}-$(date -u +"%Y-%m-%d_%H-%M")"
1610

1711
echo "${CLONE_NAME}" > integration-vm-name/name
1812
echo "Creating VM ${CLONE_NAME}"

‎ci/tasks/setup-integration-test-vm/task.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ params:
1717
BASE_VM_IPATH:
1818
CLONE_DATASTORE:
1919
CLONE_RESOURCE_POOL:
20-
VM_CUSTOMIZATION_NAME: Bosh-Windows-2019-Base
21-
VM_ORG_NAME: Broadcom
22-
VM_USERNAME: Tanzu Platform
2320
CLONE_FOLDER:
24-
JOB_OS_NAME: # linux or windows
21+
CLONE_PREFIX:
22+
VM_CUSTOMIZATION_NAME:
23+
VM_ORG_NAME:
24+
VM_USERNAME:

0 commit comments

Comments
 (0)