diff options
| l--------- | deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc | 1 | ||||
| -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-openrc | 1 | ||||
| l--------- | deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc | 1 | ||||
| -rw-r--r-- | deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env | 45 | ||||
| -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 |
7 files changed, 49 insertions, 4 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/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 |