Merge "[SDC-BE] Remove hardcoded MR apiKey" into 21.4
diff --git a/asdctool/pom.xml b/asdctool/pom.xml
index 95a9b32..3f8956d 100644
--- a/asdctool/pom.xml
+++ b/asdctool/pom.xml
@@ -799,7 +799,7 @@
<configuration>
<verbose>${verbose}</verbose>
<apiVersion>${docker.api.version}</apiVersion>
- <registry>nexus3.onap.org:10001</registry>
+ <registry>registry.nordix.org</registry>
<authConfig>
<pull>
<username>docker</username>
@@ -809,19 +809,15 @@
<images>
<!-- Build cassandra-init image -->
<image>
- <name>onap/sdc-cassandra-init</name>
+ <name>uds/sdc-cassandra-init</name>
<alias>sdc-cassandra-init</alias>
<build>
<cleanup>try</cleanup>
<dockerFileDir>${project.basedir}/sdc-cassandra-init</dockerFileDir>
<tags>
<tag>latest</tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
- </tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
- </tag>
+ <tag>${uds.version}-${maven.build.timestamp}</tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
</build>
</image>
@@ -836,7 +832,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-cassandra-init</image>
+ <image>uds/sdc-cassandra-init</image>
</configuration>
</execution>
@@ -855,7 +851,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-cassandra-init</image>
+ <image>uds/sdc-cassandra-init</image>
</configuration>
</execution>
</executions>
diff --git a/catalog-be-plugins/backend-all-plugins/pom.xml b/catalog-be-plugins/backend-all-plugins/pom.xml
index a261c1e..044db75 100644
--- a/catalog-be-plugins/backend-all-plugins/pom.xml
+++ b/catalog-be-plugins/backend-all-plugins/pom.xml
@@ -71,17 +71,15 @@
<images>
<!-- Build backend image -->
<image>
- <name>onap/sdc-backend-all-plugins</name>
+ <name>uds/sdc-backend-all-plugins</name>
<alias>sdc-backend-all-plugins</alias>
<build>
<cleanup>try</cleanup>
<dockerFile>backend-all-plugins/Dockerfile</dockerFile>
<tags>
<tag>latest</tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
- </tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
+ <tag>${uds.version}-${maven.build.timestamp}</tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
<assembly>
<descriptor>backend-all-plugins/backend-all-plugins-files.xml</descriptor>
@@ -117,4 +115,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile
index 24e9146..27d843c 100644
--- a/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile
+++ b/catalog-be-plugins/backend-all-plugins/src/main/docker/backend-all-plugins/Dockerfile
@@ -1,3 +1,3 @@
-FROM onap/sdc-backend:latest
+FROM uds/sdc-backend:latest
-COPY --chown=onap:onap onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/
\ No newline at end of file
+COPY --chown=onap:onap onap-sdc-backend-all-plugins/etsi-nfv-nsd-csar-plugin.jar ${JETTY_BASE}/plugins/
diff --git a/catalog-be/pom.xml b/catalog-be/pom.xml
index 18e8541..d8f2468 100644
--- a/catalog-be/pom.xml
+++ b/catalog-be/pom.xml
@@ -1350,19 +1350,15 @@
<!-- Build backend image -->
<image>
- <name>onap/sdc-backend</name>
+ <name>uds/sdc-backend</name>
<alias>sdc-backend</alias>
<build>
<cleanup>try</cleanup>
<dockerFileDir>backend</dockerFileDir>
<tags>
<tag>latest</tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
- </tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
- </tag>
+ <tag>${uds.version}-${maven.build.timestamp}</tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
<assembly>
<descriptor>backend/backend-files.xml</descriptor>
@@ -1372,7 +1368,7 @@
</image>
<!-- Build backend-init image -->
<image>
- <name>onap/sdc-backend-init</name>
+ <name>uds/sdc-backend-init</name>
<alias>sdc-backend-init</alias>
<build>
<cleanup>try</cleanup>
@@ -1380,12 +1376,8 @@
</dockerFileDir>
<tags>
<tag>latest</tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
- </tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
- </tag>
+ <tag>${uds.version}-${maven.build.timestamp}</tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
</build>
</image>
@@ -1400,7 +1392,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-backend,onap/sdc-backend-init</image>
+ <image>uds/sdc-backend,uds/sdc-backend-init</image>
</configuration>
</execution>
@@ -1419,7 +1411,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-backend,onap/sdc-backend-init</image>
+ <image>uds/sdc-backend,uds/sdc-backend-init</image>
</configuration>
</execution>
</executions>
diff --git a/catalog-fe/pom.xml b/catalog-fe/pom.xml
index 0b98624..95474de 100644
--- a/catalog-fe/pom.xml
+++ b/catalog-fe/pom.xml
@@ -631,7 +631,7 @@
<!-- Build frontend image -->
<image>
- <name>onap/sdc-frontend</name>
+ <name>uds/sdc-frontend</name>
<alias>sdc-frontend</alias>
<build>
<cleanup>try</cleanup>
@@ -639,11 +639,9 @@
<tags>
<tag>latest</tag>
<tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ ${uds.version}-${maven.build.timestamp}
</tag>
- <tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}
- </tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
</build>
</image>
@@ -658,7 +656,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-frontend</image>
+ <image>uds/sdc-frontend</image>
</configuration>
</execution>
@@ -677,7 +675,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-frontend</image>
+ <image>uds/sdc-frontend</image>
</configuration>
</execution>
</executions>
diff --git a/catalog-ui/src/app/ng2/components/layout/top-nav/__snapshots__/top-nav.comonent.spec.ts.snap b/catalog-ui/src/app/ng2/components/layout/top-nav/__snapshots__/top-nav.comonent.spec.ts.snap
index c650a9c..538e82e 100644
--- a/catalog-ui/src/app/ng2/components/layout/top-nav/__snapshots__/top-nav.comonent.spec.ts.snap
+++ b/catalog-ui/src/app/ng2/components/layout/top-nav/__snapshots__/top-nav.comonent.spec.ts.snap
@@ -23,7 +23,7 @@
<div
class="asdc-version"
>
- v.
+ v.6.0.1-SNAPSHOT
</div>
</div>
diff --git a/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.html b/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.html
index 2636dd9..5f6f064 100644
--- a/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.html
+++ b/catalog-ui/src/app/ng2/components/layout/top-nav/top-nav.component.html
@@ -19,7 +19,7 @@
<div class="asdc-app-title-wrapper">
<a class="asdc-app-title">{{ 'PROJECT_TITLE'|translate }}</a>
- <div class="asdc-version"> v.{{version}}</div>
+ <div class="asdc-version"> v.6.0.1-SNAPSHOT</div>
</div>
<ul class="top-menu" *ngIf="!menuModel && topLvlMenu">
diff --git a/catalog-ui/src/assets/languages/en_US.json b/catalog-ui/src/assets/languages/en_US.json
index cf27783..b76a3e4 100644
--- a/catalog-ui/src/assets/languages/en_US.json
+++ b/catalog-ui/src/assets/languages/en_US.json
@@ -1,5 +1,5 @@
{
- "PROJECT_TITLE": "SDC",
+ "PROJECT_TITLE": "UDS",
"=========== VALIDATION ===========": "",
"VALIDATION_ERROR_MAX_LENGTH": "Max length {{max}} characters.",
diff --git a/catalog-ui/src/assets/styles/images/splashScreen/splashscreen_logo_and_text.png b/catalog-ui/src/assets/styles/images/splashScreen/splashscreen_logo_and_text.png
index 27d4b7b..1cd7af7 100644
--- a/catalog-ui/src/assets/styles/images/splashScreen/splashscreen_logo_and_text.png
+++ b/catalog-ui/src/assets/styles/images/splashScreen/splashscreen_logo_and_text.png
Binary files differ
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
index ce0de87..87e62d8 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml
@@ -21,7 +21,7 @@
<docker.registry>nexus3.onap.org:10001</docker.registry>
<docker.password>docker</docker.password>
<docker.username>docker</docker.username>
- <docker.namespace>onap</docker.namespace>
+ <docker.namespace>uds</docker.namespace>
</properties>
<build>
@@ -129,9 +129,9 @@
<tags>
<tag>latest</tag>
<tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ ${uds.version}-${maven.build.timestamp}
</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
</build>
</image>
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
index 3856e10..65811f6 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/artifacts/startup.sh
@@ -16,7 +16,7 @@
echo "$(date) [Info] Going to initialize sdc onboard cassandra: user=$SDC_USER; host=$CS_HOST; port=$CS_PORT"
echo "$(date) [Info] Initializing onboard keyspaces"
-cqlsh -u "$SDC_USER" -p "$SDC_PASSWORD" -f init_keyspaces.cql "$CS_HOST" "$CS_PORT"
+cqlsh -u $SDC_USER -p $SDC_PASSWORD -f init_keyspaces.cql $CS_HOST $CS_PORT
rc=$?
if [ $rc != 0 ]; then
@@ -26,7 +26,7 @@
echo "$(date) [Info] Finished initializing onboard keyspaces"
echo "$(date) [Info] Initializing onboard schemas"
-cqlsh -u "$SDC_USER" -p "$SDC_PASSWORD" -f init_schemas.cql "$CS_HOST" "$CS_PORT"
+cqlsh -u $SDC_USER -p $SDC_PASSWORD -f init_schemas.cql $CS_HOST $CS_PORT
rc=$?
if [ $rc != 0 ]; then
@@ -39,7 +39,7 @@
for entry in "$SDC_HOME/upgrade-scripts"/*
do
echo "$(date) Running upgrade file '$entry'"
- cqlsh -u "$SDC_USER" -p "$SDC_PASSWORD" -f "$entry" "$CS_HOST" "$CS_PORT"
+ cqlsh -u $SDC_USER -p $SDC_PASSWORD -f $entry $CS_HOST $CS_PORT
rc=$?
if [ $rc != 0 ]; then
echo "$(date) [Warn] Upgrade failed for file '$entry'. It is possible that the upgrade was previously applied.";
@@ -47,4 +47,4 @@
echo "$(date) Successfully ran upgrade file '$entry'"
done
-echo "$(date) [Info] Onboarding init was successful"
\ No newline at end of file
+echo "$(date) [Info] Onboarding init was successful"
diff --git a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
index 7ceb470..78f08aa 100644
--- a/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
+++ b/openecomp-be/dist/sdc-onboard-db-init-docker/pom.xml
@@ -17,7 +17,7 @@
<properties>
<docker.image.name>sdc-onboard-cassandra-init</docker.image.name>
- <docker.namespace>onap</docker.namespace>
+ <docker.namespace>uds</docker.namespace>
<docker.password>docker</docker.password>
<docker.username>docker</docker.username>
<docker.registry>nexus3.onap.org:10001</docker.registry>
@@ -107,9 +107,9 @@
<tags>
<tag>latest</tag>
<tag>
- ${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-STAGING-latest
+ ${uds.version}-${maven.build.timestamp}
</tag>
- <tag>${parsedVersion.majorVersion}.${parsedVersion.minorVersion}-${maven.build.timestamp}</tag>
+ <tag>${uds.docker.staging.version}-STAGING-latest</tag>
</tags>
</build>
</image>
@@ -150,4 +150,4 @@
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/pom.xml b/pom.xml
index e5f7c15..6ca5442 100644
--- a/pom.xml
+++ b/pom.xml
@@ -38,6 +38,8 @@
</parent>
<properties>
+ <uds.version>6.0.1-SNAPSHOT</uds.version>
+ <uds.docker.staging.version>6.0</uds.docker.staging.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format>
diff --git a/sdc-os-chef/pom.xml b/sdc-os-chef/pom.xml
index 01cc295..f3d0dad 100644
--- a/sdc-os-chef/pom.xml
+++ b/sdc-os-chef/pom.xml
@@ -72,7 +72,7 @@
<!-- Build cassandra image -->
<image>
- <name>onap/sdc-cassandra</name>
+ <name>uds/sdc-cassandra</name>
<alias>sdc-cassandra</alias>
<build>
<cleanup>try</cleanup>
@@ -98,7 +98,7 @@
</goals>
<configuration>
<removeAll>true</removeAll>
- <image>onap/sdc-cassandra</image>
+ <image>uds/sdc-cassandra</image>
</configuration>
</execution>
@@ -117,7 +117,7 @@
<goal>push</goal>
</goals>
<configuration>
- <image>onap/sdc-cassandra</image>
+ <image>uds/sdc-cassandra</image>
</configuration>
</execution>
</executions>
diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 5e35074..8bf9383 100644
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -226,7 +226,7 @@
<images>
<!-- Build simulator image -->
<image>
- <name>onap/sdc-simulator</name>
+ <name>uds/sdc-simulator</name>
<alias>sdc-simulator</alias>
<build>
<cleanup>try</cleanup>
