Add integration property support

.bluemix/pipeline_tekton.yml

@@ -82,3 +82,11 @@ properties:
   - name: dev-resource-group
     value: ${PROD_RESOURCE_GROUP}
     type: text
+  - name: repository
+    value: ${APP_REPO}
+    type: integration
+    path: parameters.repo_url
+  - name: insights
+    value: ${INSIGHTS}
+    type: integration
+    path: service_id

.bluemix/pr_pipeline_tekton.yml

@@ -43,3 +43,11 @@ properties:
   - name: pipeline-debug
     value: "0"
     type: text
+  - name: repository
+    value: ${APP_REPO}
+    type: integration
+    path: parameters.repo_url
+  - name: insights
+    value: ${INSIGHTS}
+    type: integration
+    path: service_id

.bluemix/south_pipeline_tekton.yml

@@ -82,3 +82,11 @@ properties:
   - name: dev-resource-group
     value: ${PROD_RESOURCE_GROUP}
     type: text
+  - name: repository
+    value: ${APP_REPO}
+    type: integration
+    path: parameters.repo_url
+  - name: insights
+    value: ${INSIGHTS}
+    type: integration
+    path: service_id

.bluemix/south_pr_pipeline_tekton.yml

@@ -43,3 +43,11 @@ properties:
   - name: pipeline-debug
     value: "0"
     type: text
+  - name: repository
+    value: ${APP_REPO}
+    type: integration
+    path: parameters.repo_url
+  - name: insights
+    value: ${INSIGHTS}
+    type: integration
+    path: service_id

.bluemix/toolchain.yml

@@ -76,6 +76,7 @@ services:
       services:
         - repo
         - tekton-catalog-repo
+        - devops-insights
       name: 'pr-pipeline'
       type: >
         $env.pipeline_type === 'tekton' ? 'tekton': 'classic'
@@ -94,6 +95,7 @@ services:
             }
         env:
           PIPELINE_REPO: pipeline-repo
+          INSIGHTS: devops-insights
           APP_REPO: repo
           API_KEY: '{{form.pipeline.parameters.api-key}}'
           APP_NAME: "{{form.pipeline.parameters.app-name}}"
@@ -122,6 +124,7 @@ services:
     parameters:
       services:
         - repo
+        - devops-insights
       name: 'ci-pipeline'
       ui-pipeline: true
       type: >
@@ -140,6 +143,7 @@ services:
             }
         env:
           APP_REPO: repo
+          INSIGHTS: devops-insights
           APP_NAME: "{{form.pipeline.parameters.app-name}}"
           REGISTRY_REGION_ID: "{{form.pipeline.parameters.registry-region}}"
           REGISTRY_NAMESPACE: "{{form.pipeline.parameters.registry-namespace}}"

.pipeline/listener.yaml

@@ -45,6 +45,7 @@ spec:
       description: the name of the cluster to target
     - name: dev-region
     - name: dev-resource-group
+    - name: insights
     - name: dev-cluster-namespace
       description: namespace dev
   resourcetemplates:
@@ -105,6 +106,8 @@ spec:
             value: $(params.dev-cluster-namespace)
           - name: pipeline-debug
             value: $(params.pipeline-debug)
+          - name: insights
+            value: $(params.insights)
         workspaces:
           - name: pipeline-ws
             persistentVolumeClaim:
@@ -240,4 +243,4 @@ spec:
     - binding:
         name: bitbucket-commit
       template:
-        name: trigger-template-secure-kube
+        name: trigger-template-secure-kube

.pipeline/pipeline.yaml

@@ -42,6 +42,7 @@ spec:
       default: "deployment.yml"
     - name: dev-region
     - name: dev-resource-group
+    - name: insights
     - name: cluster-name
       description: the name of the cluster to target
     - name: dev-cluster-namespace
@@ -51,15 +52,6 @@ spec:
   workspaces:
     - name: pipeline-ws
   tasks:
-    - name: extract-repository-url
-      taskRef:
-        name: toolchain-extract-value
-      params:
-        - name: expression
-          # if a params.repository is given, it takes precedence
-          value: '. as $toolchain | ["$(params.repository)"] | if .[0]=="" then $toolchain | .services[] | select(.toolchain_binding.name=="repo") | .dashboard_url else .[0] end'
-        - name: pipeline-debug
-          value: $(params.pipeline-debug)  
     - name: git-clone
       taskRef:
         name: git-clone-repo
@@ -69,7 +61,7 @@ spec:
         - name: ibmcloud-apikey-secret-key
           value: "toolchain-apikey"
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: branch
           value: $(params.branch)
         - name: revision
@@ -79,21 +71,12 @@ spec:
       workspaces:
         - name: output
           workspace: pipeline-ws
-    - name: extract-doi-enablement
-      taskRef:
-        name: toolchain-extract-value
-      params:
-        # count the number of service in the toolchain that are DevopsInsights
-        - name: expression
-          value: 'reduce .services[] as $service (0; if $service.service_id=="draservicebroker" then .+1 else . end)'
-        - name: pipeline-debug
-          value: $(params.pipeline-debug)
     - name: publish-doi-buildrecord
-      runAfter: [extract-doi-enablement]
+      runAfter: [git-clone]
       when:
-        - input: $(tasks.extract-doi-enablement.results.extracted-value)
+        - input: $(params.insights)
           operator: in
-          values: ["1"]
+          values: ["draservicebroker"]
       taskRef:
         name: doi-publish-buildrecord
       params:
@@ -143,9 +126,9 @@ spec:
     - name: publish-doi-code-tests
       runAfter: [unit-tests]
       when:
-        - input: $(tasks.extract-doi-enablement.results.extracted-value)
+        - input: $(params.insights)
           operator: in
-          values: ["1"]
+          values: ["draservicebroker"]
       taskRef:
         name: doi-publish-testrecord
       params:
@@ -232,9 +215,9 @@ spec:
     - name: publish-doi-va-scan-record
       runAfter: [vulnerability-advisor]
       when:
-        - input: $(tasks.extract-doi-enablement.results.extracted-value)
+        - input: $(params.insights)
           operator: in
-          values: ["1"]
+          values: ["draservicebroker"]
       taskRef:
         name: doi-publish-testrecord
       params:

.pr-pipeline/pr-pipeline.yaml

@@ -25,16 +25,7 @@ spec:
   workspaces:
     - name: pipeline-ws
 
-  tasks:
-    - name: extract-repository-url
-      taskRef:
-        name: toolchain-extract-value
-      params:
-        - name: expression
-          # if a params.repository is given, it takes precedence
-          value: '. as $toolchain | ["$(params.repository)"] | if .[0]=="" then $toolchain | .services[] | select(.toolchain_binding.name=="repo") | .dashboard_url else .[0] end'
-        - name: pipeline-debug
-          value: $(params.pipeline-debug)  
+  tasks:  
     - name: git-clone
       taskRef:
         name: git-clone-repo
@@ -44,7 +35,7 @@ spec:
         - name: ibmcloud-apikey-secret-key
           value: "apikey"
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: branch
           value: $(params.branch)
         - name: revision

.pr-pipeline/pr-trigger.yaml

@@ -20,13 +20,16 @@ spec:
     - name: pr-url
       description: PR url
     - name: apikey
+    - name: insights
     - name: commit-timestamp
       description: commit timestamp
     - name: scm-type
       description: source code type used (github, github-ent, gitlab)
     - name: project-id
       description: project id
       default: ""
+    - name: repository
+      description: the repo integration url
   resourcetemplates:
     - apiVersion: v1
       kind: PersistentVolumeClaim
@@ -70,4 +73,8 @@ spec:
           - name: scm-type
             value: $(params.scm-type)
           - name: project-id
-            value: $(params.project-id) 
+            value: $(params.project-id)
+          - name: insights
+            value: $(params.insights)
+          - name: repository
+            value: $(params.repository)

.south_pipeline/listener.yaml

@@ -50,6 +50,7 @@ spec:
     - name: pr-url
       description: PR url
     - name: apikey
+    - name: insights
     - name: commit-timestamp
       description: commit timestamp
     - name: scm-type
@@ -124,7 +125,9 @@ spec:
           - name: scm-type
             value: $(params.scm-type)
           - name: project-id
-            value: $(params.project-id) 
+            value: $(params.project-id)
+          - name: insights
+            value: $(params.insights) 
         workspaces:
           - name: pipeline-ws
             persistentVolumeClaim:

.south_pipeline/pipeline.yaml

@@ -56,16 +56,7 @@ spec:
       default: ""
   workspaces:
     - name: pipeline-ws
-  tasks:
-    - name: extract-repository-url
-      taskRef:
-        name: toolchain-extract-value
-      params:
-        - name: expression
-          # if a params.repository is given, it takes precedence
-          value: '. as $toolchain | ["$(params.repository)"] | if .[0]=="" then $toolchain | .services[] | select(.toolchain_binding.name=="repo") | .dashboard_url else .[0] end'
-        - name: pipeline-debug
-          value: $(params.pipeline-debug)  
+  tasks: 
     - name: git-clone
       taskRef:
         name: git-clone-repo
@@ -75,7 +66,7 @@ spec:
         - name: ibmcloud-apikey-secret-key
           value: "toolchain-apikey"
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: branch
           value: $(params.branch)
         - name: revision
@@ -123,7 +114,7 @@ spec:
           workspace: pipeline-ws
       params:
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: revision
           value: $(params.branch)
         - name: commit-id
@@ -146,7 +137,7 @@ spec:
           workspace: pipeline-ws
       params:
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: revision
           value: $(params.branch)
         - name: pr-url
@@ -169,7 +160,7 @@ spec:
           workspace: pipeline-ws
       params:
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: revision
           value: $(params.branch)
         - name: pr-url
@@ -194,7 +185,7 @@ spec:
           workspace: pipeline-ws          
       params:
         - name: repository
-          value: $(tasks.extract-repository-url.results.extracted-value)
+          value: $(params.repository)
         - name: revision
           value: $(params.branch)
         - name: pr-url