summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
l---------deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env (renamed from deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env)0
l---------deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc1
l---------deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc1
-rw-r--r--deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env45
-rw-r--r--test/csit/plans/ccsdk/healthcheck/health_check.sh2
-rw-r--r--test/csit/plans/ccsdk/healthcheck/setup.sh10
-rw-r--r--test/csit/plans/sdnc/healthcheck/setup.sh4
-rw-r--r--test/ete/labs/windriver/Integration-HEAT-Staging-Daily-openrc (renamed from test/ete/labs/windriver/Integration-Stable-openrc)3
-rw-r--r--test/ete/labs/windriver/Integration-OOM-Staging-Daily-openrc (renamed from test/ete/labs/windriver/Integration-Jenkins-openrc)2
-rw-r--r--version-manifest/src/main/resources/docker-manifest-staging.csv16
-rw-r--r--version-manifest/src/main/resources/java-manifest.csv62
12 files changed, 96 insertions, 51 deletions
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc
new file mode 120000
index 000000000..06bcec770
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-HEAT-Staging-Daily-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env
index ebbfe689e..ebbfe689e 100644
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env
+++ b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc
deleted file mode 120000
index 7f4cc2547..000000000
--- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../test/ete/labs/windriver/Integration-Jenkins-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc
new file mode 120000
index 000000000..b5dd3402b
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc
@@ -0,0 +1 @@
+../../../../../test/ete/labs/windriver/Integration-OOM-Staging-Daily-openrc \ No newline at end of file
diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env
new file mode 100644
index 000000000..ebbfe689e
--- /dev/null
+++ b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env
@@ -0,0 +1,45 @@
+parameters:
+
+ ubuntu_1604_image: ubuntu-16-04-cloud-amd64
+
+ apt_proxy: 10.12.5.2:3142
+ docker_proxy: 10.12.5.2:5000
+
+ rancher_vm_flavor: m1.xlarge
+ k8s_vm_flavor: m1.xlarge
+
+ public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4
+
+ oam_network_cidr: 10.0.0.0/16
+
+ integration_override_yaml: >
+ global:
+ repository: 10.12.5.2:5000
+ pullPolicy: IfNotPresent
+ robot:
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+ openStackPassword: "${OS_PASSWORD}"
+ openStackTenantId: "${OS_PROJECT_ID}"
+ openStackUserName: "${OS_USERNAME}"
+ ubuntu14Image: "ubuntu-14-04-cloud-amd64"
+ ubuntu16Image: "ubuntu-16-04-cloud-amd64"
+ openStackPrivateNetId: "__oam_network_id__"
+ openStackPrivateSubnetId: "__oam_subnet_id__"
+ openStackPrivateNetCidr: "10.0.0.0/16"
+ openStackOamNetworkCidrPrefix: "10.0"
+ dcaeCollectorIp: "__k8s_1_vm_ip__"
+ vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
+ so:
+ config:
+ openStackUserName: "${OS_USERNAME}"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
+ appc:
+ replicaCount: 3
+ config:
+ enableClustering: true
+ sdnc:
+ replicaCount: 3
+ config:
+ enableClustering: true
diff --git a/test/csit/plans/ccsdk/healthcheck/health_check.sh b/test/csit/plans/ccsdk/healthcheck/health_check.sh
index 99f717a20..ffc766fe9 100644
--- a/test/csit/plans/ccsdk/healthcheck/health_check.sh
+++ b/test/csit/plans/ccsdk/healthcheck/health_check.sh
@@ -19,7 +19,7 @@ echo $SCRIPTS
unset http_proxy https_proxy
-response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46YWRtaW4=" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck )
+response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-sdnc" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck )
if [ "$response" == "200" ]; then
echo "CCSDK health check passed."
diff --git a/test/csit/plans/ccsdk/healthcheck/setup.sh b/test/csit/plans/ccsdk/healthcheck/setup.sh
index 2b7424c3b..bdb5b5506 100644
--- a/test/csit/plans/ccsdk/healthcheck/setup.sh
+++ b/test/csit/plans/ccsdk/healthcheck/setup.sh
@@ -25,7 +25,7 @@ export NEXUS_DOCKER_REPO="nexus3.onap.org:10001"
export NEXUS_USERNAME=docker
export NEXUS_PASSWD=docker
export DMAAP_TOPIC=AUTO
-export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.3-STAGING-latest
if [ "$MTU" == "" ]; then
export MTU="1450"
@@ -45,13 +45,13 @@ sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml
docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odl-image:$CCSDK_DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odl-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odl-image:0.2-STAGING-latest
+docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odl-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odl-image:0.3-STAGING-latest
docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:0.2-STAGING-latest
+docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-dgbuilder-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-dgbuilder-image:0.3-STAGING-latest
docker pull $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-image:$CCSDK_DOCKER_IMAGE_VERSION
-docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odlsli-image:0.2-STAGING-latest
+docker tag $NEXUS_DOCKER_REPO/onap/ccsdk-odlsli-image:$CCSDK_DOCKER_IMAGE_VERSION onap/ccsdk-odlsli-image:0.3-STAGING-latest
# start CCSDK containers with docker compose and configuration from docker-compose.yml
curl -L https://github.com/docker/compose/releases/download/1.9.0/docker-compose-`uname -s`-`uname -m` > docker-compose
@@ -63,7 +63,7 @@ TIME_OUT=500
INTERVAL=30
TIME=0
while [ "$TIME" -lt "$TIME_OUT" ]; do
- response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46YWRtaW4=" -X POST -H "X-FromAppId: csit-ccsdk" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ); echo $response
+ response=$(curl --write-out '%{http_code}' --silent --output /dev/null -H "Authorization: Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ==" -X POST -H "X-FromAppId: csit-ccsdk" -H "X-TransactionId: csit-ccsdk" -H "Accept: application/json" -H "Content-Type: application/json" http://localhost:8383/restconf/operations/SLI-API:healthcheck ); echo $response
if [ "$response" == "200" ]; then
echo CCSDK started in $TIME seconds
diff --git a/test/csit/plans/sdnc/healthcheck/setup.sh b/test/csit/plans/sdnc/healthcheck/setup.sh
index a8119f616..991ba18bf 100644
--- a/test/csit/plans/sdnc/healthcheck/setup.sh
+++ b/test/csit/plans/sdnc/healthcheck/setup.sh
@@ -24,8 +24,8 @@ export NEXUS_USERNAME=docker
export NEXUS_PASSWD=docker
export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.3-STAGING-latest
-export CCSDK_DOCKER_IMAGE_VERSION=0.2-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.4-STAGING-latest
+export CCSDK_DOCKER_IMAGE_VERSION=0.3-STAGING-latest
export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
diff --git a/test/ete/labs/windriver/Integration-Stable-openrc b/test/ete/labs/windriver/Integration-HEAT-Staging-Daily-openrc
index 0f0c6928e..fa3825cae 100644
--- a/test/ete/labs/windriver/Integration-Stable-openrc
+++ b/test/ete/labs/windriver/Integration-HEAT-Staging-Daily-openrc
@@ -1,7 +1,6 @@
export OS_PROJECT_ID=3583253e932845a09cd4c8ca2f31d095
-
+export OS_PROJECT_NAME=Integration-HEAT-Staging-Daily
export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_NAME=Integration-Stable
export OS_USERNAME=demo
export OS_PASSWORD=onapdemo
export OS_AUTH_URL=http://10.12.25.2:5000/v3
diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc b/test/ete/labs/windriver/Integration-OOM-Staging-Daily-openrc
index 13149790f..062f3d115 100644
--- a/test/ete/labs/windriver/Integration-Jenkins-openrc
+++ b/test/ete/labs/windriver/Integration-OOM-Staging-Daily-openrc
@@ -1,5 +1,5 @@
export OS_PROJECT_ID=09d8566ea45e43aa974cf447ed591d77
-export OS_PROJECT_NAME=Integration-Jenkins
+export OS_PROJECT_NAME=Integration-OOM-Staging-Daily
export OS_USER_DOMAIN_NAME=Default
export OS_USERNAME=demo
export OS_PASSWORD=onapdemo
diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
index 2ada90b3d..751c1ca44 100644
--- a/version-manifest/src/main/resources/docker-manifest-staging.csv
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -12,13 +12,13 @@ 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/admportal-sdnc-image,1.4-STAGING-latest
onap/appc-cdt-image,1.3.0
onap/appc-image,1.4.0-SNAPSHOT-latest
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/ccsdk-dgbuilder-image,0.3-STAGING-latest
+onap/ccsdk-odl-image,0.3-STAGING-latest
+onap/ccsdk-odlsli-image,0.3-STAGING-latest
onap/champ,1.2.3
onap/clamp,2.0.2
onap/cli,2.0.2
@@ -77,10 +77,10 @@ onap/sdc-onboard-cassandra-init,1.3-STAGING-latest
onap/sdc-simulator,1.3-STAGING-latest
onap/sdc-ui-tests,1.3-STAGING-latest
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/sdnc-ansible-server-image,1.4-STAGING-latest
+onap/sdnc-dmaap-listener-image,1.4-STAGING-latest
+onap/sdnc-image,1.4-STAGING-latest
+onap/sdnc-ueb-listener-image,1.4-STAGING-latest
onap/search-data-service,1.2.1
onap/sniroemulator,1.0.0
onap/sparky-be,1.2.1
diff --git a/version-manifest/src/main/resources/java-manifest.csv b/version-manifest/src/main/resources/java-manifest.csv
index 61e1c07ce..5393b80bb 100644
--- a/version-manifest/src/main/resources/java-manifest.csv
+++ b/version-manifest/src/main/resources/java-manifest.csv
@@ -122,34 +122,34 @@ org.onap.appc.client,client-lib,1.3.0
org.onap.appc.client,client-simulator,1.3.0
org.onap.appc.client,code-generator,1.3.0
org.onap.appc.plugins,dg-loader-provider,1.3.0
-org.onap.ccsdk.parent,binding-parent,1.0.4
-org.onap.ccsdk.parent,bundle-parent,1.0.4
-org.onap.ccsdk.parent,feature-repo-parent,1.0.4
-org.onap.ccsdk.parent,karaf4-parent,1.0.4
-org.onap.ccsdk.parent,mdsal-it-parent,1.0.4
-org.onap.ccsdk.parent,odlparent,1.0.4
-org.onap.ccsdk.parent,odlparent-lite,1.0.4
-org.onap.ccsdk.parent,single-feature-parent,1.0.4
-org.onap.ccsdk.sli.adaptors,aai-service-provider,0.2.4
-org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.2.4
-org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.2.4
-org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.2.4
-org.onap.ccsdk.sli.core,dblib-provider,0.2.4
-org.onap.ccsdk.sli.core,filters-provider,0.2.4
-org.onap.ccsdk.sli.core,sli-common,0.2.4
-org.onap.ccsdk.sli.core,sli-provider,0.2.4
-org.onap.ccsdk.sli.core,sli-recording,0.2.4
-org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.2.4
-org.onap.ccsdk.sli.core,sliapi-provider,0.2.4
-org.onap.ccsdk.sli.core,utils-provider,0.2.4
-org.onap.ccsdk.sli.northbound,asdcApi-provider,0.2.4
-org.onap.ccsdk.sli.northbound,dataChange-provider,0.2.4
-org.onap.ccsdk.sli.northbound,dmaap-listener,0.2.4
-org.onap.ccsdk.sli.northbound,lcm-provider,0.2.4
-org.onap.ccsdk.sli.northbound,ueb-listener,0.2.4
-org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.2.4
-org.onap.ccsdk.sli.plugins,properties-node-provider,0.2.4
-org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.2.4
+org.onap.ccsdk.parent,binding-parent,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,bundle-parent,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,feature-repo-parent,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,karaf4-parent,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,mdsal-it-parent,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,odlparent,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,odlparent-lite,1.1.0-SNAPSHOT
+org.onap.ccsdk.parent,single-feature-parent,1.1.0-SNAPSHOT
+org.onap.ccsdk.sli.adaptors,aai-service-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.adaptors,mdsal-resource-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.adaptors,resource-assignment-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.adaptors,sql-resource-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,dblib-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,filters-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,sli-common,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,sli-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,sli-recording,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,sliPluginUtils-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,sliapi-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.core,utils-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.northbound,asdcApi-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.northbound,dataChange-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.northbound,dmaap-listener,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.northbound,lcm-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.northbound,ueb-listener,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.plugins,fabric-discovery-plugin-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.plugins,properties-node-provider,0.3.0-SNAPSHOT
+org.onap.ccsdk.sli.plugins,restapi-call-node-provider,0.3.0-SNAPSHOT
org.onap.ccsdk.storage.pgaas,pgaas,1.0.0
org.onap.ccsdk.utils,utils,1.0.0
org.onap.clamp.clds.clamp,clamp,2.0.2
@@ -217,9 +217,9 @@ org.onap.sdc.sdc-distribution-client,sdc-distribution-client,1.3.0
org.onap.sdc.sdc-titan-cassandra,sdc-titan-cassandra,1.2.0
org.onap.sdc.sdc-tosca,sdc-tosca,1.3.5
org.onap.sdc.sdc-workflow-designer,sdc-workflow-designer,1.0.0
-org.onap.sdnc.northbound,generic-resource-api.provider,1.3.4
-org.onap.sdnc.northbound,vnfapi-provider,1.3.4
-org.onap.sdnc.northbound,vnftools-provider,1.3.4
+org.onap.sdnc.northbound,generic-resource-api.provider,1.4.0-SNAPSHOT
+org.onap.sdnc.northbound,vnfapi-provider,1.4.0-SNAPSHOT
+org.onap.sdnc.northbound,vnftools-provider,1.4.0-SNAPSHOT
org.onap.usecase-ui,usecaseui-common,1.1.0
org.onap.usecase-ui.server,usecase-ui-server,1.1.0
org.onap.vfc.gvnfm.vnflcm.lcm,vfc-gvnfm-vnflcm-lcm,1.1.0