Merge branch 'release/0.8.7'

rahulkj · Oct 17, 2018 · db620b2 · db620b2
2 parents c7f3904 + 568b605
commit db620b2
Show file tree

Hide file tree

Showing 44 changed files with 97 additions and 199 deletions.
diff --git a/pipelines/install-pcf/pipeline-with-nsxt.yml b/pipelines/install-pcf/pipeline-with-nsxt.yml
@@ -204,7 +204,6 @@ jobs:
       SECURITY_CONFIGURATION: ((security_configuration))
       RESOURCE_CONFIGURATION: ((resource_configuration))
 
-
 - name: ops-director-apply-changes
   plan:
   - aggregate:
@@ -263,12 +262,13 @@ jobs:
 
   - task: upload-nsxt-tile
     file: pipelines-repo/tasks/upload-product/task.yml
+    input_mapping:
+      product: pivnet-product
     params:
       DEBUG: ((debug))
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      PIVNET_API_TOKEN: ((pivnet_token))
 
 - name: upload-pas
   plan:
@@ -301,12 +301,13 @@ jobs:
 
   - task: upload-pas
     file: pipelines-repo/tasks/upload-product/task.yml
+    input_mapping:
+      product: pivnet-product
     params:
       DEBUG: ((debug))
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      PIVNET_API_TOKEN: ((pivnet_token))
 
   - task: upload-stemcell
     file: pipelines-repo/tasks/stemcell-uploader/task.yml
@@ -457,9 +458,9 @@ jobs:
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
       GENERATE_CERTS: ((generate_certs))
-      PRODUCT_PROPERTIES: ((product_properties))
-      resource-config: ((resource-config))
-      PRODUCT_NETWORK_AZS: ((product_network_azs))
+      PRODUCT_PROPERTIES: ((product-properties))
+      RESOURCE_CONFIG: ((resource-config))
+      NETWORK_PROPERTIES: ((network-properties))
 
 - name: disable-errands
   plan:

diff --git a/pipelines/install-pcf/pipeline.yml b/pipelines/install-pcf/pipeline.yml
@@ -340,9 +340,9 @@ jobs:
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
       GENERATE_CERTS: ((generate_certs))
-      PRODUCT_PROPERTIES: ((product_properties))
-      resource-config: ((resource-config))
-      PRODUCT_NETWORK_AZS: ((product_network_azs))
+      PRODUCT_PROPERTIES: ((product-properties))
+      RESOURCE_CONFIG: ((resource-config))
+      NETWORK_PROPERTIES: ((network-properties))
 
 - name: disable-errands
   plan:

diff --git a/pipelines/install-product/params-template.yml b/pipelines/install-product/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name:                                                 # Get the product slug from pivnet. It can be found in the URL of the pivnet product, ex: elastic-runtime
-product_identifier:                                           # Product name known to ops manager. Usually its the name of the *.pivotal file. ex: cf
+product_slug:                                                 # Get the product slug from pivnet. It can be found in the URL of the pivnet product, ex: elastic-runtime
+product-name:                                           # Product name known to ops manager. Usually its the name of the *.pivotal file. ex: cf
 product_version: ^0\.0\..*$                                   # Update the version number
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/install-product/pipeline.yml b/pipelines/install-product/pipeline.yml
@@ -46,7 +46,7 @@ resources:
   type: pivnet
   source:
     api_token: ((pivnet_token))
-    product_slug: ((product_name))
+    product_slug: ((product_slug))
     product_version: ((product_version))
 
 jobs:
@@ -76,7 +76,7 @@ jobs:
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      product-name: ((product-name))
+      PRODUCT_NAME: ((product-name))
 
   - task: apply-changes
     file: pipelines-repo/tasks/apply-changes/task.yml
@@ -112,12 +112,13 @@ jobs:
 
   - task: upload-tile
     file: pipelines-repo/tasks/upload-product/task.yml
+    input_mapping:
+      product: pivnet-product
     params:
       DEBUG: ((debug))
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      PIVNET_API_TOKEN: ((pivnet_token))
 
   - task: upload-stemcell
     file: pipelines-repo/tasks/stemcell-uploader/task.yml
@@ -162,13 +163,13 @@ jobs:
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      product-name: ((product-name))
+      PRODUCT_NAME: ((product-name))
 
 - name: stage-product
   plan:
   - aggregate:
     - get: pipelines-repo
-      passed: [upload-product]
+      # passed: [upload-product]
     - get: pivnet-product
       resource: pivnet-product
       params:
@@ -189,7 +190,7 @@ jobs:
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      product-name: ((product-name))
+      PRODUCT_NAME: ((product-name))
       DEPENDENCY_PRODUCT_TILES: ((dependency_product_tiles))
 
 - name: config-product
@@ -221,10 +222,10 @@ jobs:
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      product-name: ((product-name))
+      PRODUCT_NAME: ((product-name))
       PRODUCT_PROPERTIES: ((product-properties))
-      resource-config: ((resource-config))
-      network-properties: ((network-properties))
+      RESOURCE_CONFIG: ((resource-config))
+      NETWORK_PROPERTIES: ((network-properties))
 
 - name: disable-errands
   plan:
@@ -255,7 +256,7 @@ jobs:
       OPS_MGR_HOST: ((ops_mgr_host))
       OPS_MGR_USR: ((ops_mgr_usr))
       OPS_MGR_PWD: ((ops_mgr_pwd))
-      product-name: ((product-name))
+      PRODUCT_NAME: ((product-name))
       ERRANDS: ((errands_to_disable))
 
 - name: apply-changes

diff --git a/pipelines/tiles/appdynamics/params-template.yml b/pipelines/tiles/appdynamics/params-template.yml
@@ -15,7 +15,7 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-appdynamics
+product_slug: p-appdynamics
 product-name: appdynamics
 product_version: ^4\.4\..*$
 

diff --git a/pipelines/tiles/credhub-service-broker/params-template.yml b/pipelines/tiles/credhub-service-broker/params-template.yml
@@ -15,7 +15,7 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: credhub-service-broker
+product_slug: credhub-service-broker
 product_identifier: credhub-service-broker
 product_version: ^1\.0\..*$
 

diff --git a/pipelines/tiles/event-alerts/params-template.yml b/pipelines/tiles/event-alerts/params-template.yml
@@ -15,7 +15,7 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-event-alerts
+product_slug: p-event-alerts
 product_identifier: p-event-alerts
 product_version: ^1\.2\..*$
 

diff --git a/pipelines/tiles/healthwatch/params-template.yml b/pipelines/tiles/healthwatch/params-template.yml
@@ -15,7 +15,7 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-healthwatch
+product_slug: p-healthwatch
 product_identifier: p-healthwatch
 product_version: ^1\.3\..*$
 

diff --git a/pipelines/tiles/mysql-v2/params-template.yml b/pipelines/tiles/mysql-v2/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false                                                  # Set to true if you want to see all the tasks output. This will also show all the secrets and certs, so think twice
 
-product_name: pivotal-mysql
-product_identifier: pivotal-mysql
+product_slug: pivotal-mysql
+product-name: pivotal-mysql
 product_version: ^2\.3\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/mysql/params-template.yml b/pipelines/tiles/mysql/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false  # Set to true if you want to see all the tasks output. This will also show all the secrets and certs, so think twice
 
-product_name: p-mysql
-product_identifier: p-mysql
+product_slug: p-mysql
+product-name: p-mysql
 product_version: ^1\.10\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/newrelic-nozzle/params-template.yml b/pipelines/tiles/newrelic-nozzle/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false # Set to true if you want to see all the tasks output. This will also show all the secrets and certs, so think twice
 
-product_name: nr-firehose-nozzle
-product_identifier: nr-firehose-nozzle
+product_slug: nr-firehose-nozzle
+product-name: nr-firehose-nozzle
 product_version: ^1\.0\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/newrelic-service-broker/params-template.yml b/pipelines/tiles/newrelic-service-broker/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-new-relic
-product_identifier: newrelic-broker
+product_slug: p-new-relic
+product-name: newrelic-broker
 product_version: ^1\.12\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/pcf-metrics/params-template.yml b/pipelines/tiles/pcf-metrics/params-template.yml
@@ -18,8 +18,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: apm
-product_identifier: apm
+product_slug: apm
+product-name: apm
 product_version: ^1\.4\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/pks/params-template.yml b/pipelines/tiles/pks/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: pivotal-container-service
-product_identifier: pivotal-container-service
+product_slug: pivotal-container-service
+product-name: pivotal-container-service
 product_version: ^1\.1\..*$
 
 dependency_product_tiles: 'p-bosh'

diff --git a/pipelines/tiles/rabbitmq/params-template.yml b/pipelines/tiles/rabbitmq/params-template.yml
@@ -18,8 +18,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-rabbitmq
-product_identifier: p-rabbitmq
+product_slug: p-rabbitmq
+product-name: p-rabbitmq
 product_version: ^1\.13\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/redis/params-template.yml b/pipelines/tiles/redis/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-redis
-product_identifier: p-redis
+product_slug: p-redis
+product-name: p-redis
 product_version: ^1\.12\..*$
 
 singleton_jobs_az: ((singleton_jobs_az)) # [R] Place singleton jobs in an AZ

diff --git a/pipelines/tiles/single-signon/params-template.yml b/pipelines/tiles/single-signon/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: pivotal_single_sign-on_service # Product slug from PivNet
-product_identifier: Pivotal_Single_Sign-On_Service # product identifier using OM cli
+product_slug: pivotal_single_sign-on_service # Product slug from PivNet
+product-name: Pivotal_Single_Sign-On_Service # product identifier using OM cli
 product_version: ^1\.6\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/splunk-nozzle/params-template.yml b/pipelines/tiles/splunk-nozzle/params-template.yml
@@ -18,8 +18,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: splunk-nozzle
-product_identifier: splunk-nozzle
+product_slug: splunk-nozzle
+product-name: splunk-nozzle
 product_version: ^1\.0\..*$
 
 dependency_product_tiles: 'cf'

diff --git a/pipelines/tiles/spring-cloud-dataflow/params-template.yml b/pipelines/tiles/spring-cloud-dataflow/params-template.yml
@@ -15,8 +15,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-dataflow
-product_identifier: p-dataflow
+product_slug: p-dataflow
+product-name: p-dataflow
 product_version: ^1\.0\..*$
 
 dependency_product_tiles: 'cf,pivotal-mysql'

diff --git a/pipelines/tiles/spring-cloud-services/params-template.yml b/pipelines/tiles/spring-cloud-services/params-template.yml
@@ -18,8 +18,8 @@ ops_mgr_pwd: ((ops_mgr_pwd))                                  # [R] Ops Manager
 
 debug: false
 
-product_name: p-spring-cloud-services # Product slug from pivnet
-product_identifier: p-spring-cloud-services # Product identifier from OpsManager using om cli
+product_slug: p-spring-cloud-services # Product slug from pivnet
+product-name: p-spring-cloud-services # Product identifier from OpsManager using om cli
 product_version: ^1\.5\..*$
 
 dependency_product_tiles: 'cf,p-rabbitmq,pivotal-mysql'

diff --git a/tasks/config-appdynamics/task.sh b/tasks/config-appdynamics/task.sh