commit 2526a509a9d90293685689c4e23b03f579d5345f
author Yi Tseng <yi@opennetworking.org> Mon Jun 07 02:36:50 2021 -0700
committer Yi Tseng <yi@opennetworking.org> Mon Jun 07 18:49:54 2021 -0700
tree 1e85ed24e8f9c0ae99acf261af78085f835a9893
parent 08dd51151de801f9f2691a0f39e4a6649ed82004

Add ONF Harbor registry credential

Change-Id: I2a3b1c7a09166d8cb5eacf97d66801c9645e2aa6

jjb/shell/docker-login.sh

diff --git a/jjb/shell/docker-login.sh b/jjb/shell/docker-login.sh
index 41344c9..444bf61 100644
--- a/jjb/shell/docker-login.sh
+++ b/jjb/shell/docker-login.sh
@@ -30,3 +30,9 @@
       echo "Docker login: registry.aetherproject.org"
       docker login registry.aetherproject.org --username "${AETHER_REGISTRY_USERNAME}" --password "${AETHER_REGISTRY_PASSWORD}"
 fi
+
+if [ -n "${ONF_REGISTRY_USERNAME}" ]
+then
+      echo "Docker login: registry.opennetworking.org"
+      docker login registry.opennetworking.org --username "${ONF_REGISTRY_USERNAME}" --password "${ONF_REGISTRY_PASSWORD}"
+fi

jjb/templates/fabric-tna-jobs.yaml

diff --git a/jjb/templates/fabric-tna-jobs.yaml b/jjb/templates/fabric-tna-jobs.yaml
index 2b41e96..3ce3c71 100644
--- a/jjb/templates/fabric-tna-jobs.yaml
+++ b/jjb/templates/fabric-tna-jobs.yaml
@@ -56,6 +56,11 @@
               username: AETHER_REGISTRY_USERNAME
               password: AETHER_REGISTRY_PASSWORD
       - credentials-binding:
+          - username-password-separated:
+              credential-id: onf-internal-registry
+              username: ONF_REGISTRY_USERNAME
+              password: ONF_REGISTRY_PASSWORD
+      - credentials-binding:
           - text:
               credential-id: codecov-fabric-tna
               variable: CODECOV_TOKEN
@@ -129,6 +134,11 @@
               username: AETHER_REGISTRY_USERNAME
               password: AETHER_REGISTRY_PASSWORD
       - credentials-binding:
+          - username-password-separated:
+              credential-id: onf-internal-registry
+              username: ONF_REGISTRY_USERNAME
+              password: ONF_REGISTRY_PASSWORD
+      - credentials-binding:
           - text:
               credential-id: codecov-fabric-tna
               variable: CODECOV_TOKEN