[SDFAB-244] Add ONF registry credentials for tost verify jobs
Change-Id: I71f0e8e3bfeef62b44d60362b8b5b553fac2010c
diff --git a/jjb/shell/make-test.sh b/jjb/shell/make-test.sh
index 83ff901..b92de49 100644
--- a/jjb/shell/make-test.sh
+++ b/jjb/shell/make-test.sh
@@ -17,14 +17,6 @@
# make-test.sh - run one or more make targets
set -eu -o pipefail
-# performs docker login if the job defines $DOCKERHUB_USERNAME and
-# $DOCKERHUB_PASSWORD variables
-DOCKERHUB_USERNAME=${DOCKERHUB_USERNAME:-}
-DOCKERHUB_PASSWORD=${DOCKERHUB_PASSWORD:-}
-if [[ ! -z "$DOCKERHUB_USERNAME" && ! -z "$DOCKERHUB_PASSWORD" ]]; then
- echo $DOCKERHUB_PASSWORD | docker login --username ${DOCKERHUB_USERNAME} --password-stdin
-fi
-
# when not running under Jenkins, use current dir as workspace, a blank project
# name
WORKSPACE=${WORKSPACE:-.}
diff --git a/jjb/templates/private-make-test.yaml b/jjb/templates/private-make-test.yaml
index a0a26c9..4cc9972 100644
--- a/jjb/templates/private-make-test.yaml
+++ b/jjb/templates/private-make-test.yaml
@@ -30,6 +30,11 @@
credential-id: docker-artifact-push-credentials
username: DOCKERHUB_USERNAME
password: DOCKERHUB_PASSWORD
+ - credentials-binding:
+ - username-password-separated:
+ credential-id: onf-internal-registry
+ username: ONF_REGISTRY_USERNAME
+ password: ONF_REGISTRY_PASSWORD
- lf-infra-wrappers-common:
build-timeout: "{build-timeout}"
- ssh-agent-credentials:
@@ -57,6 +62,7 @@
DEST_GOPATH={dest-gopath}
MAKE_TEST_TARGETS={make-test-targets}
MAKE_TEST_KEEP_GOING={make-test-keep-going}
+ - shell: !include-raw-escape: ../shell/docker-login.sh
- shell: !include-raw-escape: ../shell/make-test.sh
publishers: