From 79d4fd60c36b6c51ab70da3ce7b3856e07539bc7 Mon Sep 17 00:00:00 2001 From: jsabariganes Date: Fri, 14 Mar 2025 12:56:11 +0530 Subject: [PATCH] [TNZ-34595] - regexp fix and gcp to vsphere changes --- .../download-healthwatch-pas-exporter.yml | 2 +- .../download-healthwatch-pks-exporter.yml | 2 +- .../download-healthwatch.yml | 2 +- download-product-pivnet/download-opsman.yml | 2 +- download-product-pivnet/download-pks.yml | 2 +- download-product-pivnet/download-tas.yml | 2 +- .../interpolate-example-test.yml | 2 +- pipelines/download-products.yml | 20 +++++++++---------- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/download-product-pivnet/download-healthwatch-pas-exporter.yml b/download-product-pivnet/download-healthwatch-pas-exporter.yml index f2b5c8e..79e3a30 100644 --- a/download-product-pivnet/download-healthwatch-pas-exporter.yml +++ b/download-product-pivnet/download-healthwatch-pas-exporter.yml @@ -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)) diff --git a/download-product-pivnet/download-healthwatch-pks-exporter.yml b/download-product-pivnet/download-healthwatch-pks-exporter.yml index b86f2c0..7286dd7 100644 --- a/download-product-pivnet/download-healthwatch-pks-exporter.yml +++ b/download-product-pivnet/download-healthwatch-pks-exporter.yml @@ -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)) diff --git a/download-product-pivnet/download-healthwatch.yml b/download-product-pivnet/download-healthwatch.yml index 5d21e30..2d6157b 100644 --- a/download-product-pivnet/download-healthwatch.yml +++ b/download-product-pivnet/download-healthwatch.yml @@ -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)) diff --git a/download-product-pivnet/download-opsman.yml b/download-product-pivnet/download-opsman.yml index 7a458e2..046e5ab 100644 --- a/download-product-pivnet/download-opsman.yml +++ b/download-product-pivnet/download-opsman.yml @@ -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)) diff --git a/download-product-pivnet/download-pks.yml b/download-product-pivnet/download-pks.yml index 41604a5..b35931e 100644 --- a/download-product-pivnet/download-pks.yml +++ b/download-product-pivnet/download-pks.yml @@ -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)) diff --git a/download-product-pivnet/download-tas.yml b/download-product-pivnet/download-tas.yml index 07bfc8a..a1d88e5 100644 --- a/download-product-pivnet/download-tas.yml +++ b/download-product-pivnet/download-tas.yml @@ -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)) diff --git a/download-product-pivnet/interpolate-example-test.yml b/download-product-pivnet/interpolate-example-test.yml index 348f615..cb1b295 100644 --- a/download-product-pivnet/interpolate-example-test.yml +++ b/download-product-pivnet/interpolate-example-test.yml @@ -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)) diff --git a/pipelines/download-products.yml b/pipelines/download-products.yml index b8a9bad..379ff59 100644 --- a/pipelines/download-products.yml +++ b/pipelines/download-products.yml @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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 @@ -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