Skip to content

[TNZ-34595] - regexp fix and gcp to vsphere changes #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

[TNZ-34595] - regexp fix and gcp to vsphere changes #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion download-product-pivnet/download-healthwatch-pas-exporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pivnet-product-slug: p-healthwatch

file-glob: "healthwatch-pas-exporter*.pivotal"
product-version-regex: ^2\.2\..*$
stemcell-iaas: google
stemcell-iaas: vsphere

s3-access-key-id: ((s3_access_key_id))
s3-secret-access-key: ((s3_secret_access_key))
Expand Down
2 changes: 1 addition & 1 deletion download-product-pivnet/download-healthwatch-pks-exporter.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pivnet-product-slug: p-healthwatch

file-glob: "healthwatch-pks-exporter*.pivotal"
product-version-regex: ^2\.2\..*$
stemcell-iaas: google
stemcell-iaas: vsphere

s3-access-key-id: ((s3_access_key_id))
s3-secret-access-key: ((s3_secret_access_key))
Expand Down
2 changes: 1 addition & 1 deletion download-product-pivnet/download-healthwatch.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pivnet-product-slug: p-healthwatch

file-glob: "healthwatch-2*.pivotal"
product-version-regex: ^2\.2\..*$
stemcell-iaas: google
stemcell-iaas: vsphere

s3-access-key-id: ((s3_access_key_id))
s3-secret-access-key: ((s3_secret_access_key))
Expand Down
2 changes: 1 addition & 1 deletion download-product-pivnet/download-opsman.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
pivnet-api-token: ((pivnet_token))
pivnet-product-slug: ops-manager

file-glob: "ops-manager-gcp*.yml"
file-glob: "ops-manager*.yml"
product-version-regex: ^3\.0\.\d+(?:\+LTS-T)?$ #^3\.\d+\.\d+(?:\+LTS-T)?$|^3\.\d+\.\d+-rc.*$|^3\.\d+\.\d+-alpha.*$

s3-access-key-id: ((s3_access_key_id))
Expand Down
2 changes: 1 addition & 1 deletion download-product-pivnet/download-pks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pivnet-product-slug: pivotal-container-service

file-glob: "pivotal-container-service*.pivotal"
product-version-regex: ^1\.16\..*$
stemcell-iaas: google
stemcell-iaas: vsphere

s3-access-key-id: ((s3_access_key_id))
s3-secret-access-key: ((s3_secret_access_key))
Expand Down
2 changes: 1 addition & 1 deletion download-product-pivnet/download-tas.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ pivnet-product-slug: elastic-runtime

file-glob: "srt*.pivotal"
product-version-regex: ^4\.0\..*$
stemcell-iaas: google
stemcell-iaas: vsphere

s3-access-key-id: ((s3_access_key_id))
s3-secret-access-key: ((s3_secret_access_key))
Expand Down
2 changes: 1 addition & 1 deletion download-product-pivnet/interpolate-example-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ pivnet-product-slug: elastic-runtime

file-glob: "srt*.pivotal"
product-version-regex: ^2\.7\..*$
stemcell-iaas: google
stemcell-iaas: vsphere

s3-access-key-id: ((s3_access_key_id))
s3-secret-access-key: ((s3_secret_access_key))
Expand Down
20 changes: 10 additions & 10 deletions pipelines/download-products.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[ops-manager,(.*)\]ops-manager-gcp.*.yml
regexp: \[ops-manager,(.*?)\]ops-manager.*?\.yml

- name: pks-product
type: s3-with-arn
Expand All @@ -39,7 +39,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[pivotal-container-service,(.*)\]pivotal-container-service-.*.pivotal
regexp: \[pivotal-container-service,(.*?)\]pivotal-container-service-.*?\.pivotal

- name: pks-stemcell
type: s3-with-arn
Expand All @@ -49,7 +49,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: pks-stemcell/\[stemcells-ubuntu-jammy,(.*)\]light-bosh-stemcell-.*-google.*\.tgz
regexp: pks-stemcell/\[stemcells-ubuntu-jammy,(.*?)\]bosh-stemcell-.*?\-vsphere.*?\.tgz

- name: tas-product
type: s3-with-arn
Expand All @@ -59,7 +59,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[elastic-runtime,(.*)\]srt-.*.pivotal
regexp: \[elastic-runtime,(.*?)\]srt-.*?\.pivotal

- name: tas-stemcell
type: s3-with-arn
Expand All @@ -69,7 +69,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: tas-stemcell/\[stemcells-ubuntu-jammy,(.*)\]light-bosh-stemcell-.*-google.*\.tgz
regexp: tas-stemcell/\[stemcells-ubuntu-jammy,(.*?)\]bosh-stemcell-.*?\-vsphere.*?\.tgz

- name: healthwatch-product
type: s3-with-arn
Expand All @@ -79,7 +79,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[p-healthwatch,(.*)\]healthwatch-\d.*.pivotal
regexp: \[p-healthwatch,(.*?)\]healthwatch-\d.*?\.pivotal

- name: healthwatch-pas-exporter
type: s3-with-arn
Expand All @@ -89,7 +89,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[p-healthwatch,(.*)\]healthwatch-pas-exporter.*.pivotal
regexp: \[p-healthwatch,(.*?)\]healthwatch-pas-exporter.*?\.pivotal

- name: healthwatch-pks-exporter
type: s3-with-arn
Expand All @@ -99,7 +99,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[p-healthwatch,(.*)\]healthwatch-pks-exporter.*.pivotal
regexp: \[p-healthwatch,(.*?)\]healthwatch-pks-exporter.*?\.pivotal

- name: healthwatch-stemcell
type: s3-with-arn
Expand All @@ -109,7 +109,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: healthwatch-stemcell/\[stemcells-ubuntu-jammy,(.*)\]light-bosh-stemcell-.*-google.*\.tgz
regexp: healthwatch-stemcell/\[stemcells-ubuntu-jammy,(.*?)\]bosh-stemcell-.*?\-vsphere.*?\.tgz

- name: telemetry-product
type: s3-with-arn
Expand All @@ -119,7 +119,7 @@ resources:
aws_role_arn: ((platform-automation/main/s3_with_role.role_arn))
bucket: ((platform-automation/main.s3_pivnet_products_bucket))
region_name: ((platform-automation/main.s3_region_name))
regexp: \[pivotal-telemetry-collector,(.*)\]telemetry-collector-.*.tgz
regexp: \[pivotal-telemetry-collector,(.*?)\]telemetry-collector-.*?\.tgz
# code_snippet resources-pipeline-products end yaml

# code_snippet resources-pipeline-platform-automation start yaml
Expand Down