From ed8ea73667d9e5820124d006bfe0b6858fa0cfff Mon Sep 17 00:00:00 2001
From: matthew-mcneilly <matthew.mcneilly@est.tech>
Date: Wed, 29 Jul 2020 14:23:46 +0100
Subject: [PATCH] Change to wrapper used for Artifactory key

Follow on change for
https://gerrit.nordix.org/#/c/infra/cicd/+/5154/

Signed-off-by: matthew-mcneilly <matthew.mcneilly@est.tech>
Change-Id: I8301e7d012c6834ea6c7a1eb932ca7cc56014813
---
 jjb/onap/uds/scripts/push-artifacts.sh            |  2 +-
 jjb/onap/uds/scripts/push-images.sh               |  2 +-
 jjb/onap/uds/scripts/push-repos.sh                |  2 +-
 jjb/onap/uds/uds-daily-build-package-promote.yaml | 14 +++++++++-----
 jjb/onap/uds/uds-macros.yaml                      | 10 ++++++++++
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/jjb/onap/uds/scripts/push-artifacts.sh b/jjb/onap/uds/scripts/push-artifacts.sh
index b3754987b..df1b74662 100644
--- a/jjb/onap/uds/scripts/push-artifacts.sh
+++ b/jjb/onap/uds/scripts/push-artifacts.sh
@@ -32,7 +32,7 @@ do
   SHA256_CHECKSUM=$(sha256sum $ARTIFACT | cut -d ' ' -f 1)
   MD5_CHECKSUM=$(md5sum $ARTIFACT | cut -d ' ' -f 1)
 
-  curl -H "X-JFrog-Art-Api:$ARTIFACTORY_API_KEY" \
+  curl -H "X-JFrog-Art-Api:$NORDIX_ARM_TOKEN" \
   -H "X-Checksum-Sha1:$SHA_CHECKSUM" \
   -H "X-Checksum-Sha256:$SHA256_CHECKSUM" \
   -H "X-Checksum-MD5:$MD5_CHECKSUM" \
diff --git a/jjb/onap/uds/scripts/push-images.sh b/jjb/onap/uds/scripts/push-images.sh
index 62d7cebe8..ce74a7dd2 100644
--- a/jjb/onap/uds/scripts/push-images.sh
+++ b/jjb/onap/uds/scripts/push-images.sh
@@ -32,7 +32,7 @@ do
   SHA256_CHECKSUM=$(sha256sum $ARTIFACT | cut -d ' ' -f 1)
   MD5_CHECKSUM=$(md5sum $ARTIFACT | cut -d ' ' -f 1)
 
-  curl -H "X-JFrog-Art-Api:$ARTIFACTORY_API_KEY" \
+  curl -H "X-JFrog-Art-Api:$NORDIX_ARM_TOKEN" \
   -H "X-Checksum-Sha1:$SHA_CHECKSUM" \
   -H "X-Checksum-Sha256:$SHA256_CHECKSUM" \
   -H "X-Checksum-MD5:$MD5_CHECKSUM" \
diff --git a/jjb/onap/uds/scripts/push-repos.sh b/jjb/onap/uds/scripts/push-repos.sh
index 9ec40c6cd..95cabf9f2 100644
--- a/jjb/onap/uds/scripts/push-repos.sh
+++ b/jjb/onap/uds/scripts/push-repos.sh
@@ -32,7 +32,7 @@ do
   SHA256_CHECKSUM=$(sha256sum $ARTIFACT | cut -d ' ' -f 1)
   MD5_CHECKSUM=$(md5sum $ARTIFACT | cut -d ' ' -f 1)
 
-  curl -H "X-JFrog-Art-Api:$ARTIFACTORY_API_KEY" \
+  curl -H "X-JFrog-Art-Api:$NORDIX_ARM_TOKEN" \
   -H "X-Checksum-Sha1:$SHA_CHECKSUM" \
   -H "X-Checksum-Sha256:$SHA256_CHECKSUM" \
   -H "X-Checksum-MD5:$MD5_CHECKSUM" \
diff --git a/jjb/onap/uds/uds-daily-build-package-promote.yaml b/jjb/onap/uds/uds-daily-build-package-promote.yaml
index 75efb3b3c..95f07687a 100644
--- a/jjb/onap/uds/uds-daily-build-package-promote.yaml
+++ b/jjb/onap/uds/uds-daily-build-package-promote.yaml
@@ -157,11 +157,7 @@
     wrappers:
       - openstack:
           single-use: True
-      - credentials-binding:
-        - username-password-separated:
-            credential-id: infra-nordix-artifactory-api-key
-            username: ARTIFACTORY_USER
-            password: ARTIFACTORY_API_KEY
+
 
 - job-template:
     name: '{project-name}-build'
@@ -212,6 +208,9 @@
 
     builders:
       - 'promote-file-artifacts-to-artifactory'
+    wrappers:
+      - 'artifactory-credentials'
+
 
 - job-template:
     name: '{project-name}-promote-images'
@@ -221,6 +220,9 @@
 
     builders:
       - 'promote-docker-images-to-artifactory'
+    wrappers:
+      - 'artifactory-credentials'
+
 
 - job-template:
     name: '{project-name}-promote-repositories'
@@ -230,3 +232,5 @@
 
     builders:
       - 'promote-source-repositories-to-artifactory'
+    wrappers:
+      - 'artifactory-credentials'
diff --git a/jjb/onap/uds/uds-macros.yaml b/jjb/onap/uds/uds-macros.yaml
index d1a866d5a..802643b7a 100644
--- a/jjb/onap/uds/uds-macros.yaml
+++ b/jjb/onap/uds/uds-macros.yaml
@@ -208,3 +208,13 @@
     builders:
       - shell:
           !include-raw: ./scripts/push-repos.sh
+
+# Wrapper for Artifactory API Key
+- wrapper:
+    name: 'artifactory-credentials'
+    wrappers:
+      - credentials-binding:
+        - username-password-separated:
+            credential-id: 'nordix-cicd-arm-credentials'
+            username: NORDIX_ARM_USERNAME
+            password: NORDIX_ARM_TOKEN
-- 
2.25.1