commit 0ac638148a9b49054bac9a1c0f4b82d471a8643d
author pierventre <pier@opennetworking.org> Mon Jul 27 11:59:49 2020 +0200
committer pierventre <pier@opennetworking.org> Mon Jul 27 12:00:31 2020 +0200
tree 9f35d5e0348009b94d19b049318dffd4a876bfb2
parent fcf70ecd0ecf4d39864624ed4191109d2500d489

Update dockerRegistry for TOST jobs

Change-Id: I941a54d604968d2004a30875de8b75a954046c1a

jjb/pipeline/docker-publish.groovy

diff --git a/jjb/pipeline/docker-publish.groovy b/jjb/pipeline/docker-publish.groovy
index d0c0e13..0ee38f1 100644
--- a/jjb/pipeline/docker-publish.groovy
+++ b/jjb/pipeline/docker-publish.groovy
@@ -53,7 +53,7 @@
                 cd "$projectName"
 
                 # set registry/repository variables
-                export DOCKER_REGISTRY="$dockerRegistry"
+                export DOCKER_REGISTRY="$dockerRegistry/"
                 export DOCKER_REPOSITORY="$dockerRepo/"
 
                 # Build w/branch
@@ -84,7 +84,7 @@
     stage('push'){
       steps {
         script {
-          withDockerRegistry([credentialsId: 'docker-artifact-push-credentials']) {
+          withDockerRegistry(credentialsId: 'aether-internal-registry', url: "https://${params.dockerRegistry}") {
             sh( script:"""
               #!/usr/bin/env bash
               set -eu -o pipefail
@@ -93,7 +93,7 @@
               cd "$projectName"
 
               # set registry/repository variables
-              export DOCKER_REGISTRY="$dockerRegistry"
+              export DOCKER_REGISTRY="$dockerRegistry/"
               export DOCKER_REPOSITORY="$dockerRepo/"
 
               # Push w/branch

jjb/repos/tost-onos.yaml

diff --git a/jjb/repos/tost-onos.yaml b/jjb/repos/tost-onos.yaml
index 453d1ee..bb37927 100644
--- a/jjb/repos/tost-onos.yaml
+++ b/jjb/repos/tost-onos.yaml
@@ -30,7 +30,8 @@
     name: 'publish-tost-onos-jobs'
     jobs:
       - 'private-docker-publish':
-          docker-repo: 'onosproject'
+          docker-repo: 'tost'
+          docker-registry: 'registry.aetherproject.org'
           maintainers: 'charles@opennetworking.org, pier@opennetworking.org'
           build-timeout: 30
           extraEnvironmentVars: |