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
diff --git a/jjb/onap/uds/scripts/push-artifacts.sh b/jjb/onap/uds/scripts/push-artifacts.sh
index b375498..df1b746 100644
--- a/jjb/onap/uds/scripts/push-artifacts.sh
+++ b/jjb/onap/uds/scripts/push-artifacts.sh
@@ -32,7 +32,7 @@
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 62d7ceb..ce74a7d 100644
--- a/jjb/onap/uds/scripts/push-images.sh
+++ b/jjb/onap/uds/scripts/push-images.sh
@@ -32,7 +32,7 @@
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 9ec40c6..95cabf9 100644
--- a/jjb/onap/uds/scripts/push-repos.sh
+++ b/jjb/onap/uds/scripts/push-repos.sh
@@ -32,7 +32,7 @@
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 75efb3b..95f0768 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 d1a866d..802643b 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