aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--test/ete/labs/gwu/onap-openstack-template.env2
-rw-r--r--test/ete/labs/huawei/onap-openstack-template.env2
-rw-r--r--test/ete/labs/tlab/onap-openstack-template.env2
-rw-r--r--test/ete/labs/windriver/onap-openstack-template.env6
-rw-r--r--version-manifest/pom.xml26
-rw-r--r--version-manifest/src/main/resources/docker-manifest-staging.csv112
6 files changed, 6 insertions, 144 deletions
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index ea061e6a0..ec5648ccf 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -38,7 +38,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.1-SNAPSHOT
+ artifacts_version: 1.3.0-SNAPSHOT
openstack_tenant_id: ${OS_PROJECT_ID}
diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index 6575759c8..033644a54 100644
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -38,7 +38,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.1-SNAPSHOT
+ artifacts_version: 1.3.0-SNAPSHOT
openstack_tenant_id: ${OS_PROJECT_ID}
diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index 690311863..6f5b9607d 100644
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -38,7 +38,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.1-SNAPSHOT
+ artifacts_version: 1.3.0-SNAPSHOT
openstack_tenant_id: ${OS_PROJECT_ID}
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 6cd3b7d0a..1e333cc7f 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -38,7 +38,7 @@ parameters:
dmaap_topic: AUTO
- artifacts_version: 1.2.1-SNAPSHOT
+ artifacts_version: 1.3.0-SNAPSHOT
openstack_tenant_id: ${OS_PROJECT_ID}
@@ -63,9 +63,9 @@ parameters:
# #
######################
- dns_list: ["10.12.25.5", "8.8.8.8"]
+ dns_list: ["8.8.4.4", "8.8.8.8"]
external_dns: 8.8.8.8
- dns_forwarder: 10.12.25.5
+ dns_forwarder: 8.8.4.4
oam_network_cidr: 10.0.0.0/16
### Private IP addresses ###
diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml
index 4a6291184..2b9722819 100644
--- a/version-manifest/pom.xml
+++ b/version-manifest/pom.xml
@@ -109,19 +109,6 @@
</configuration>
</execution>
<execution>
- <id>check-docker-manifest-staging-sorted</id>
- <phase>validate</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <arguments>
- <argument>${project.basedir}/src/main/scripts/check-sorted.sh</argument>
- <argument>${project.basedir}/src/main/resources/docker-manifest-staging.csv</argument>
- </arguments>
- </configuration>
- </execution>
- <execution>
<id>check-java-manifest-sorted</id>
<phase>validate</phase>
<goals>
@@ -147,19 +134,6 @@
</arguments>
</configuration>
</execution>
- <execution>
- <id>check-staging-docker-images-exist</id>
- <phase>validate</phase>
- <goals>
- <goal>exec</goal>
- </goals>
- <configuration>
- <arguments>
- <argument>${project.basedir}/src/main/scripts/check-docker-manifest-staging.sh</argument>
- <argument>${project.basedir}/src/main/resources/docker-manifest-staging.csv</argument>
- </arguments>
- </configuration>
- </execution>
</executions>
</plugin>
</plugins>
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
deleted file mode 100644
index da87af4c3..000000000
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ /dev/null
@@ -1,112 +0,0 @@
-image,tag
-onap/aaf/aaf_cm,2.1.1
-onap/aaf/aaf_fs,2.1.1
-onap/aaf/aaf_gui,2.1.1
-onap/aaf/aaf_hello,2.1.1
-onap/aaf/aaf_locate,2.1.1
-onap/aaf/aaf_oauth,2.1.1
-onap/aaf/aaf_service,2.1.1
-onap/aaf/sms,2.0.0
-onap/aaf/smsquorumclient,2.0.0
-onap/aai-resources,1.2.2
-onap/aai-traversal,1.2.2
-onap/aai/esr-gui,1.1.0
-onap/aai/esr-server,1.1.0
-onap/admportal-sdnc-image,1.3.4
-onap/appc-cdt-image,1.3.0
-onap/appc-image,1.3.0
-onap/babel,1.2.0
-onap/ccsdk-dgbuilder-image,0.2.4
-onap/ccsdk-odl-image,0.2.4
-onap/ccsdk-odlsli-image,0.2.4
-onap/champ,1.2.3
-onap/clamp,2.0.2
-onap/cli,2.0.2
-onap/data-router,1.2.2
-onap/dmaap/buscontroller,1.0.12
-onap/dmaap/dmaap-mr,1.1.4
-onap/externalapi/nbi,2.0.0
-onap/gizmo,1.2.1
-onap/holmes/engine-management,1.1.0
-onap/holmes/rule-management,1.1.0
-onap/model-loader,1.2.1
-onap/msb/msb_apigateway,1.1.0
-onap/msb/msb_discovery,1.1.0
-onap/multicloud/framework,1.1.2
-onap/multicloud/openstack-newton,1.1.2
-onap/multicloud/openstack-ocata,1.1.2
-onap/multicloud/openstack-windriver,1.1.2
-onap/multicloud/vio,1.1.2
-onap/multicloud/vio-vesagent,1.0.0
-onap/music/cassandra_music,3.0.0
-onap/music/music,2.5.3
-onap/oom/kube2msb,1.1.0
-onap/optf-has,1.1.1
-onap/optf-osdf,1.1.1
-onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0
-onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0
-onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
-onap/org.onap.dcaegen2.deployments.cm-container,1.3.0
-onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.0
-onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.1.11
-onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
-onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
-onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0
-onap/org.onap.dcaegen2.platform.configbinding,2.1.5
-onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5
-onap/org.onap.dcaegen2.platform.inventory-api,3.0.1
-onap/org.onap.dcaegen2.platform.policy-handler,2.4.5
-onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4
-onap/policy-drools,1.2.3
-onap/policy-pe,1.2.3
-onap/portal-app,2.2.0
-onap/portal-db,2.2.0
-onap/portal-sdk,2.2.0
-onap/portal-wms,2.2.0
-onap/sdc-api-tests,1.2.0
-onap/sdc-backend,1.2.0
-onap/sdc-backend-init,1.2.0
-onap/sdc-cassandra,1.2.0
-onap/sdc-cassandra-init,1.2.0
-onap/sdc-elasticsearch,1.2.0
-onap/sdc-frontend,1.2.0
-onap/sdc-init-elasticsearch,1.2.0
-onap/sdc-kibana,1.2.0
-onap/sdc-onboard-backend,1.2.0
-onap/sdc-onboard-cassandra-init,1.2.0
-onap/sdc-simulator,1.2.0
-onap/sdc-ui-tests,1.2.0
-onap/sdc/sdc-workflow-designer,1.1.0
-onap/sdnc-ansible-server-image,1.3.4
-onap/sdnc-dmaap-listener-image,1.3.4
-onap/sdnc-image,1.3.4
-onap/sdnc-ueb-listener-image,1.3.4
-onap/search-data-service,1.2.1
-onap/sniroemulator,1.0.0
-onap/sparky-be,1.2.1
-onap/testsuite,1.2.1
-onap/usecase-ui,1.1.1
-onap/usecase-ui/usecase-ui-server,1.1.1
-onap/vfc/catalog,1.1.0
-onap/vfc/emsdriver,1.1.0
-onap/vfc/gvnfmdriver,1.1.0
-onap/vfc/jujudriver,1.1.0
-onap/vfc/multivimproxy,1.0.0
-onap/vfc/nfvo/svnfm/huawei,1.1.0
-onap/vfc/nfvo/svnfm/nokia,1.1.0
-onap/vfc/nfvo/svnfm/nokiav2,1.1.0
-onap/vfc/nslcm,1.1.0
-onap/vfc/resmanagement,1.1.0
-onap/vfc/vnflcm,1.1.0
-onap/vfc/vnfmgr,1.1.0
-onap/vfc/vnfres,1.1.0
-onap/vfc/wfengine-activiti,1.1.0
-onap/vfc/wfengine-mgrservice,1.1.0
-onap/vfc/ztesdncdriver,1.1.0
-onap/vfc/ztevnfmdriver,1.1.0
-onap/vid,2.0.0
-onap/vnfsdk/ice,1.1.0
-onap/vnfsdk/refrepo,1.1.1
-onap/vnfsdk/refrepo/postgres,1.1.1
-onap/vnfsdk/vnftest,1.1.0
-openecomp/mso,1.2.2