update to ONAP

Change-Id: I52ddbe21bc6ba9922bcd70ff41c754c7d20098b5
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

diff --git a/.gitreview b/.gitreview
index 245a0e4..8da30c8 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]
-host=gerrit.openecomp.org
+host=gerrit.onap.org
 port=29418
 project=policy/docker.git

diff --git a/docker-compose.yml b/docker-compose.yml
index 8dd2325..699bf0d 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,17 +1,17 @@
 version: '2'
 services:
    mariadb:
-      image: openecomp/policy/policy-db
+      image: onap/policy/policy-db
       container_name: mariadb
       hostname: mariadb
       ports:
        - "3306:3306"
    nexus:
-      image: openecomp/policy/policy-nexus
+      image: onap/policy/policy-nexus
       container_name: nexus
       hostname: nexus
    pap:
-      image: openecomp/policy/policy-pe
+      image: onap/policy/policy-pe
       container_name: pap
       depends_on: 
        - mariadb
@@ -23,7 +23,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    pdp:
-      image: openecomp/policy/policy-pe
+      image: onap/policy/policy-pe
       container_name: pdp
       depends_on: 
        - pap
@@ -34,7 +34,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    pypdp:
-      image: openecomp/policy/policy-pe
+      image: onap/policy/policy-pe
       container_name: pypdp
       depends_on: 
        - pap
@@ -45,7 +45,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    brmsgw:
-      image: openecomp/policy/policy-pe
+      image: onap/policy/policy-pe
       container_name: brmsgw
       depends_on: 
        - pap
@@ -54,7 +54,7 @@ services:
       volumes:
        - ./config/pe:/tmp/policy-install/config
    drools:
-      image: openecomp/policy/policy-drools
+      image: onap/policy/policy-drools
       container_name: drools
       depends_on: 
        - mariadb

diff --git a/docker_build.sh b/docker_build.sh
index 226bf94..cd86c62 100755 (executable)
--- a/docker_build.sh
+++ b/docker_build.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
-DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
@@ -43,15 +43,15 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
     #
     # This is the local latest tagged image. The Dockerfile's need this to build images
     #
-    TAGS="--tag openecomp/policy/${image}:latest"
+    TAGS="--tag onap/policy/${image}:latest"
     #
     # This has the nexus repo prepended and only major/minor version with latest
     #
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_MAJMIN_VERSION}-latest"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${image}:${MVN_MAJMIN_VERSION}-latest"
     #
     # This has the nexus repo prepended and major/minor/patch version with timestamp
     #
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-STAGING-${TIMESTAMP}"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${image}:${MVN_VERSION}-STAGING-${TIMESTAMP}"
 
     echo $TAGS
 
@@ -60,7 +60,7 @@ done
 
 for image in policy-nexus policy-db policy-drools policy-pe; do
     echo "Pushing $image"
-    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:latest
-    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_MAJMIN_VERSION}-latest
-    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-STAGING-${TIMESTAMP}
+    docker push ${DOCKER_REPOSITORY}/onap/policy/$image:latest
+    docker push ${DOCKER_REPOSITORY}/onap/policy/$image:${MVN_MAJMIN_VERSION}-latest
+    docker push ${DOCKER_REPOSITORY}/onap/policy/$image:${MVN_VERSION}-STAGING-${TIMESTAMP}
 done

diff --git a/docker_merge.sh b/docker_merge.sh
index 076f84b..2960f5c 100755 (executable)
--- a/docker_merge.sh
+++ b/docker_merge.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 #
 echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
-DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
@@ -43,15 +43,15 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
     #
     # This is the local latest tagged image. The Dockerfile's need this to build images
     #
-    TAGS="--tag openecomp/policy/${image}:latest"
+    TAGS="--tag onap/policy/${image}:latest"
     #
     # This has the nexus repo prepended and only major/minor version with latest
     #
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_MAJMIN_VERSION}-latest"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${image}:${MVN_MAJMIN_VERSION}-latest"
     #
     # This has the nexus repo prepended and major/minor/patch version with timestamp
     #
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
 
     echo $TAGS
 
@@ -63,6 +63,6 @@ done
 #
 for image in policy-nexus policy-db policy-drools policy-pe; do
     echo "Pushing $image"
-    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_MAJMIN_VERSION}-latest
-    docker push ${DOCKER_REPOSITORY}/openecomp/policy/$image:${MVN_VERSION}-${TIMESTAMP}
+    docker push ${DOCKER_REPOSITORY}/onap/policy/$image:${MVN_MAJMIN_VERSION}-latest
+    docker push ${DOCKER_REPOSITORY}/onap/policy/$image:${MVN_VERSION}-${TIMESTAMP}
 done

diff --git a/docker_verify.sh b/docker_verify.sh
index 3c9be83..3037e24 100755 (executable)
--- a/docker_verify.sh
+++ b/docker_verify.sh
@@ -4,7 +4,7 @@ echo '============== STARTING SCRIPT TO BUILD DOCKER IMAGES ================='
 #
 # JUST VERIFY ONLY - NO PUSHING
 #
-DOCKER_REPOSITORY=nexus3.openecomp.org:10003
+DOCKER_REPOSITORY=nexus3.onap.org:10003
 MVN_VERSION=$(cat target/version)
 MVN_MAJMIN_VERSION=$(cut -f 1,2 -d . target/version)
 TIMESTAMP=$(date -u +%Y%m%dT%H%M%S)
@@ -46,15 +46,15 @@ for image in policy-os policy-nexus policy-db policy-base policy-drools policy-p
     #
     # This is the local latest tagged image. The Dockerfile's need this to build images
     #
-    TAGS="--tag openecomp/policy/${image}:latest"
+    TAGS="--tag onap/policy/${image}:latest"
     #
     # This has the nexus repo prepended and only major/minor version with latest
     #
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_MAJMIN_VERSION}-latest"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${image}:${MVN_MAJMIN_VERSION}-latest"
     #
     # This has the nexus repo prepended and major/minor/patch version with timestamp
     #
-    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/openecomp/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
+    TAGS="${TAGS} --tag ${DOCKER_REPOSITORY}/onap/policy/${image}:${MVN_VERSION}-${TIMESTAMP}"
 
     echo $TAGS
 

diff --git a/pom.xml b/pom.xml
index 4d9cda7..2596842 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -32,7 +32,7 @@
        <description>OpenECOMP Policy Docker Build</description>
 
        <properties>
-               <nexusproxy>https://nexus.openecomp.org</nexusproxy>
+               <nexusproxy>https://nexus.onap.org</nexusproxy>
        </properties>
 
        <repositories>