trigger-ci-job-configs: use credentials-binding instead of password params

Change-Id: Iaec22aab916958b4788fe9b18b98b46ff57b2a59
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>

5 files changed, 22 insertions, 66 deletions

diff --git a/linaro-art-build-metrics.yaml b/linaro-art-build-metrics.yaml
index b4a89aedf7..71a23b9b65 100644
--- a/linaro-art-build-metrics.yaml
+++ b/linaro-art-build-metrics.yaml
@@ -19,10 +19,6 @@
         - build-discarder:
             days-to-keep: 60
             num-to-keep: 60
-    parameters:
-        - password:
-            name: TOKEN
-            default: ${ART_METRICS_TOKEN}
     disabled: false
     node: docker-utopic-art
     display-name: 'ART: Build Metrics'
@@ -31,6 +27,10 @@
         - timestamps
         - timeout:
             timeout: 200
+        - credentials-binding:
+            - text:
+                credential-id: ART_METRICS_TOKEN
+                variable: ART_METRICS_TOKEN
     builders:
         - shell: |
             #!/bin/bash
diff --git a/odp-coverity.yaml b/odp-coverity.yaml
index 1dbc71f64b..fb53f3790d 100644
--- a/odp-coverity.yaml
+++ b/odp-coverity.yaml
@@ -17,13 +17,6 @@
         - build-discarder:
             num-to-keep: 30
             days-to-keep: 30
-    parameters:
-        - password:
-            name: COVERITY_TOKEN_ODP
-            default: ${COVERITY_TOKEN_ODP}
-        - password:
-            name: COVERITY_TOKEN_ODP_NETMAP
-            default: ${COVERITY_TOKEN_ODP_NETMAP}
     disabled: false
     node: master
     child-workspace: .
@@ -44,10 +37,18 @@
                 - docker-jessie-amd64
     wrappers:
         - timestamps
-        - matrix-tie-parent:
-            node: master
         - timeout:
             timeout: 60
+        - credentials-binding:
+            - text:
+                credential-id: COVERITY_TOKEN_ODP
+                variable: COVERITY_TOKEN_ODP
+        - credentials-binding:
+            - text:
+                credential-id: COVERITY_TOKEN_ODP_NETMAP
+                variable: COVERITY_TOKEN_ODP_NETMAP
+        - matrix-tie-parent:
+            node: master
     builders:
         - shell: |
             #!/bin/bash
diff --git a/post-build-reports.yaml b/post-build-reports.yaml
index 42578aaef3..b323eabf23 100644
--- a/post-build-reports.yaml
+++ b/post-build-reports.yaml
@@ -33,13 +33,6 @@
             days-to-keep: 90
             num-to-keep: 500
             artifact-num-to-keep: 1
-    parameters:
-        - password:
-            name: ART_TOKEN_ART_REPORTS
-            default: ${ART_TOKEN_ART_REPORTS}
-        - password:
-            name: ART_TOKEN_ANDROID_REPORTS
-            default: ${ART_TOKEN_ANDROID_REPORTS}
     disabled: false
     node: master
     display-name: 'Post build reports'
@@ -47,6 +40,14 @@
         sequential: true
     wrappers:
         - timestamps
+        - credentials-binding:
+            - text:
+                credential-id: ART_TOKEN_ART_REPORTS
+                variable: ART_TOKEN_ART_REPORTS
+        - credentials-binding:
+            - text:
+                credential-id: ART_TOKEN_ANDROID_REPORTS
+                variable: ART_TOKEN_ANDROID_REPORTS
     builders:
         - shell: |
             #!/bin/bash
diff --git a/run-jjb.py b/run-jjb.py
index 98e3d9f53f..4ac8761299 100755
--- a/run-jjb.py
+++ b/run-jjb.py
@@ -69,19 +69,9 @@ for conf_filename in filelist:
         buffer = f.read()
         template = string.Template(buffer)
         buffer = template.safe_substitute(
-            ART_METRICS_TOKEN=os.environ.get('ART_METRICS_TOKEN'),
-            ART_TOKEN=os.environ.get('ART_TOKEN'),
-            ART_TOKEN_ART_REPORTS=os.environ.get('ART_TOKEN_ART_REPORTS'),
-            ART_TOKEN_ANDROID_REPORTS=os.environ.get('ART_TOKEN_ANDROID_REPORTS'),
             AUTH_TOKEN=os.environ.get('AUTH_TOKEN'),
-            DB_TOKEN=os.environ.get('DB_TOKEN'),
             PRIVATE_KEY=os.environ.get('PRIVATE_KEY'),
-            COVERITY_TOKEN_ODP=os.environ.get('COVERITY_TOKEN_ODP'),
-            COVERITY_TOKEN_ODP_DPDK=os.environ.get('COVERITY_TOKEN_ODP_DPDK'),
-            COVERITY_TOKEN_ODP_KS2=os.environ.get('COVERITY_TOKEN_ODP_KS2'),
-            COVERITY_TOKEN_ODP_NETMAP=os.environ.get('COVERITY_TOKEN_ODP_NETMAP'),
             LT_QCOM_KEY=os.environ.get('LT_QCOM_KEY'),
-            LT_QUALCOMM_PRIVATE_KEY=os.environ.get('LT_QUALCOMM_PRIVATE_KEY'),
             LAVA_USER=os.environ.get('LAVA_USER'),
             LAVA_TOKEN=os.environ.get('LAVA_TOKEN'))
         with open('template.yaml', 'w') as f:
diff --git a/trigger-ci-job-configs.yaml b/trigger-ci-job-configs.yaml
index ecfe46707e..d03a28a6c5 100644
--- a/trigger-ci-job-configs.yaml
+++ b/trigger-ci-job-configs.yaml
@@ -40,48 +40,12 @@
                 variable: LT_QCOM_KEY
         - credentials-binding:
             - text:
-                credential-id: COVERITY_TOKEN_ODP
-                variable: COVERITY_TOKEN_ODP
-        - credentials-binding:
-            - text:
-                credential-id: COVERITY_TOKEN_ODP_NETMAP
-                variable: COVERITY_TOKEN_ODP_NETMAP
-        - credentials-binding:
-            - text:
-                credential-id: COVERITY_TOKEN_ODP_DPDK
-                variable: COVERITY_TOKEN_ODP_DPDK
-        - credentials-binding:
-            - text:
-                credential-id: COVERITY_TOKEN_ODP_KS2
-                variable: COVERITY_TOKEN_ODP_KS2
-        - credentials-binding:
-            - text:
                 credential-id: AUTH_TOKEN
                 variable: AUTH_TOKEN
         - credentials-binding:
             - text:
                 credential-id: PRIVATE_KEY
                 variable: PRIVATE_KEY
-        - credentials-binding:
-            - text:
-                credential-id: ART_TOKEN
-                variable: ART_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: DB_TOKEN
-                variable: DB_TOKEN
-        - credentials-binding:
-            - text:
-                credential-id: ART_TOKEN_ART_REPORTS
-                variable: ART_TOKEN_ART_REPORTS
-        - credentials-binding:
-            - text:
-                credential-id: ART_TOKEN_ANDROID_REPORTS
-                variable: ART_TOKEN_ANDROID_REPORTS
-        - credentials-binding:
-            - text:
-                credential-id: ART_METRICS_TOKEN
-                variable: ART_METRICS_TOKEN
     builders:
         - shell: |
             #!/bin/bash -e