summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)AuthorFilesLines
2017-07-14Clean up DockerfilesChuck Short2-5/+17
Follow Docker best practices guide located at: https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices Also try to improve readability of the Dockerfile Change-Id: I9ad061789fff4af2d21650783ab4659f54c729fa Signed-off-by: Chuck Short <charles.short@ericsson.com> Former-commit-id: 20a1f5623a96bc4491dd7efdcb1ce03bd6ed1d28
2017-07-01Merge "Add proxy support"Dan Timoney1-2/+10
Former-commit-id: cee38293eb9f404449769c75c9ad107f639d373b
2017-06-27Fix dns server in sdnc_controller_containerNayan Deshmukh1-1/+3
The docker container should use the dns-server vm to resolve queries For details see: https://wiki.onap.org/questions/6592641 Change-Id: I9b1c09b287796eb4d01de632b0a2a9a0b5047ae8 Signed-off-by: Nayan Deshmukh <n.deshmukh@samsung.com> Former-commit-id: 8d9836ac944d0659f0b7a5231503433bac655dcc
2017-06-23Add proxy supportVictor Morales1-2/+10
It's not possible to build the Docker images behind a corporate proxy. This change adds support to HTTP and HTTPS protocols for creation of images. Change-Id: Ic5fffd3ecbaa1406ff9a27203f6aca43aa971704 Signed-off-by: Victor Morales <victor.morales@intel.com> Former-commit-id: 177e59e42d10ff5927d7f92b5bf87a244af67626
2017-06-23Merge "[SDNGC-5859] copy local change to onap"Dan Timoney81-1069/+21711
Former-commit-id: 5f6ab6cbef76e507941e2ae2b886ec2a29dfb5ab
2017-06-22[ROOTPOM FIX] Use version 1.1.0 of root pomDan Timoney1-1/+1
To avoid 'disappearing' root poms, change root pom version to 1.1.0. If later version is used, Jenkins build will look for earlier versions as part of build and if they disappear, build will fail. If root pom stays frozen at 1.1.0, it will be recreated daily as part of daily build. Change-Id: Id93bfb0330749f5eba193f5c5df039b6f31622a4 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 9a448293e85936f113e01f6bca1b30dbc2923fc2
2017-06-06[SDNGC-5859] copy local change to onapPat Cheung81-1069/+21711
copied local vnfapi platform-logics changes to onap Change-Id: Ia6e188c76f011899dd50c1ec2ee8afa0b6cdc72e Signed-off-by: Pat Cheung <kc1472@att.com> Former-commit-id: a0df39edfc3687fb99860f605eb6d97fb666da25
2017-06-05[SDNC-14] Roll oam to version 1.1.2Dan Timoney14-27/+27
Roll oam to use version 1.1.2 of rootpom, to ensure latest version is being used Change-Id: I4cbed1436cc2dfb77690a5aaa28477a1d3e957c3 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: fe503b491dda155f20e3840ec14ea89788961187
2017-05-22Remove leftover Helloworld.javaShashank Kumar Shankar1-7/+0
This patch removes leftover Helloworld.java in admportal/lib. Change-Id: I2c8252b4c283e8a10fe579fb64f4752bf6f957f4 Signed-off-by: Shashank Kumar Shankar <shashank.kumar.shankar@intel.com> Former-commit-id: 407ae27439c5061284d823e8f68f02d00c9da24f
2017-05-19use 1.1.1 rootpomGuo Ruijing1-1/+1
Change-Id: I0de5b79d6e1d43c3aea243d88f65e93d2e7b9f99 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> Former-commit-id: 273effb92988e9fd904d10529448eec65c6872f1
2017-05-18Merge "[BLACKDUCK] Fix blackduck config"David Stilwell1-2/+0
Former-commit-id: b895c1c762c6e6d6a5c53267b089921db0781f6b
2017-05-18Merge "fix maven local build issue"Dan Timoney6-1/+9
Former-commit-id: 16cb8a0af0c8bb1efd1e26f0b9aeb7e1fec36dc0
2017-05-18[BLACKDUCK] Fix blackduck configDan Timoney1-2/+0
Fix blackduck configuration so that BOM file can be generated via mvn install -P blackduck Change-Id: I198bea81469d27a3920b0c93e429e015a1359206 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: f6099aad0323f67fd3658c546059e37b0ba57064
2017-05-17[DOCKER] Fix mysql installationDan Timoney1-1/+2
Mysql jar file installed in wrong directory Change-Id: Ibe824d87c93773f923046ec6eb33e9b64e7fa6f7 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 689aa901acf029346ca85189074837b8aa5533a4
2017-05-15Merge "update copyright to avoid noisy diff after build"Dan Timoney42-256/+351
Former-commit-id: 1abc42f6a8e299079ea11a1388a7a91b23d54850
2017-05-15Merge "Fix docker-compose.yml encoding"Dan Timoney0-0/+0
Former-commit-id: 01f3394fa9cef7008f2c7a706a2914db69c7b4df
2017-05-15[DOCKER] Update tagDan Timoney5-25/+25
Docker tag should end in -STAGING-latest, and remove invalid characters in docker-compose.yml Change-Id: I518ea5e6a60f189a38255ee9666d5400b5a5fe2b Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 5e114568fffa29940d6ec4f1554921a78b7d984b
2017-05-10Fix docker-compose.yml encodingVictor Morales1-4/+4
Apparently the encoding format of the file is not accepted in some *nix OSes or docker-compose versions. This change pretends to fix that issue. Change-Id: Ib2990f65caf4385b93be0caae63b308aabed8d6a Signed-off-by: Victor Morales <victor.morales@intel.com> Former-commit-id: 39e3049a3b3468ed64a6d5d4233cd4d67b93cefb
2017-05-10[UCA-10] Add MTU setupDan Timoney1-0/+7
Add MTU setting set up to docker-compose script for SDN-C Change-Id: I15b2b427edce5c62d4c901ee7b63f494576e48db Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: c1505aa33b2442479316ea73625c75ba7f2dd047
2017-05-07fix maven local build issueGuo Ruijing6-1/+9
onap jenkins use maven-assembly-plugin 2.2-beta-5. without fix, local build use maven-assembly-plugin 2.4.1 and build fails as: Assembly is incorrectly configured: null. to fix local build issue: 1. update to maven-assembly-plugin 2.6 2. add AssemblyId configuration which is needed for assembly >= 2.2 Change-Id: I7b0b4ac61351704b4beab073dda5779d6b6e6152 Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> Former-commit-id: 6485eecefff83d76557aa8aaf33d273d5033d967
2017-05-07update copyright to avoid noisy diff after buildGuo Ruijing42-256/+351
Change-Id: Ida725825312f9be2349cf1a1562c122e61efbcaa Signed-off-by: Guo Ruijing <ruijing.guo@intel.com> Former-commit-id: 53d11b9c8fa4a13c58f5b248998e9f8ce818e12a
2017-05-01[SDNC-7] Update SDNC Image - Use dependency pluginMarcus G K Williams3-13/+64
This patch removes OpenDaylight tar.gz and mysql-connector tar.gz and uses maven-dependency-plugin to get these files instead. Change-Id: I1c0885fe5beec3b9d151bc2f60fe2f669a620413 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com> Former-commit-id: 55d1ae5a085835731c6305cfaacec10a2b0314d8
2017-05-01Merge "[SDNC-7] Remove ODL tarball"Dan Timoney5-5/+4
Former-commit-id: cd98c6ee2394e934d6495e6bd17f745402239110
2017-05-01[SDNC-7] Remove ODL tarballDan Timoney5-5/+4
Remove OpenDaylight release tarball from Gerrit and instead use dependency plugin to pull from OpenDaylight nexus Change-Id: Ie9071b3d5f5dbf18455d857815ec9927e6aa5a54 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 90ed6f02f881d5598c24a17a02b602abe0e1c342
2017-04-28Update example-settings.xml to correct nexus repoMarcus G K Williams1-4/+4
Change-Id: If01afb76039d6767477602b66343f30d06540f83 Signed-off-by: Marcus G K Williams <marcus.williams@intel.com> Former-commit-id: 3678c63e675d926bcdf558d64d3a7c3924d7a596
2017-04-27Merge "fix url for dgbuilder DG list"Dan Timoney1-1/+1
Former-commit-id: 327ececb52e56f6c9ea2f11ad1f0faad07b14c8e
2017-04-26[RELEASE] Roll to 1.1.1-SNAPSHOTDan Timoney14-26/+26
Roll to next snapshot version Change-Id: Ia5f8bb92d5566cea07b98bbb7a63c9588ea975c8 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 5b0799ac9dbaf0022b0b668c7471f6e03df91b7a
2017-04-25[DOCKER] Fix dgbuilderTimoney, Daniel (dt5972)2-2/+16
Fix dgbuilder docker container build Change-Id: I0601bcd807a7d79a01788fb2d021554f013e43ea Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com> Former-commit-id: b93e5937498c01c8b1969104a5045d75d9985895
2017-04-25[DOCKER] Fix docker configDan Timoney4-40/+23
Fix docker config error in pom.xml Change-Id: I806c4e3f383da2be01d9ea6743807929c5378a15 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: d4698382607eb0df3e87a0a1ee29937c8d85fe39
2017-04-24fix url for dgbuilder DG listjwang51-1/+1
Change-Id: Ibc49698697a6202fdf548ee4184597ba8d826204 Signed-off-by: Jing Wang <jing.wang5@huawei.com> Former-commit-id: 9a002d547bbe34d0f5b4a2912c579b23ebc5dde7
2017-04-24[SDNC-5] Docker tagDan Timoney4-203/+382
Update docker tags to match latest ONAP standards Change-Id: I5db0fa66dabc625f6fe5febdf5511a2d33b48c42 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 3be2dec90f877dbca6c9663410053ae7dd229179
2017-04-24[SDNC-5] Rebase SDN-C oamDan Timoney90-414/+238
Apply fixes to directed graphs and docker containers discovered during local testing Change-Id: Ie675ecea7aa5119fb0b3ee180997b3a420be3e1b Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 596540a90b7cd031151943062b8c259314acce93
2017-04-18Fix sdnc dgbuilder build failureKanagaraj Manickam k003651061-5/+5
ant reports build_pom_for_yang_compile as invalid command on windows as ant plugin consider it as native command. executable directive make it explicit. Change-Id: I25d202eafeda6102cba38bd12e78a1d2a617e785 Signed-off-by: Kanagaraj Manickam <kanagaraj.manickam@huawei.com> Former-commit-id: 7e56426b59afa7866cd28a04efc6e133907d625d
2017-04-07Fix assembly xmls for maven-assembly-plugin v2.2+Gary Wu6-0/+7
Starting in version 2.2, maven-assembly-plugin requires an id tag in the assembly descriptor xmls. This patch allows the project to be built in environments that use newer versions of maven-assembly-plugin. For details, see: https://issues.apache.org/jira/browse/MASSEMBLY-517 Change-Id: I95df31b2eb880eb6d2a466eafcc57206f9d3d516 Signed-off-by: Gary Wu <gary.i.wu@huawei.com> Former-commit-id: 59263d726d0c6811c7608a0cbbbff18f74aa8c22
2017-04-07[SDNC-5] added yang uploadChinthakayala, Sheshashailavas52-689/+422
and added break node Change-Id: I8d36b5d400a51a6ebc248b100f04284cf27abcad Signed-off-by: Chinthakayala, Sheshashailavas <sc2914@att.com> Former-commit-id: ae6804f3c5805f78198b26de88ceb6dfa9bb335b
2017-04-05[SDNC-3] Update javadoc configDan Timoney1-2/+2
Update javadoc config to publish to onap.org site Change-Id: Iecf97532a04491d55d56fa2300ac3203cc29dfc1 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 71e34eca56478cae420cd69db0b8ff1195e1113f
2017-04-04[DOCKER] Fix dgbuilder docker buildDan Timoney1-1/+1
Correct error in Dockerfile for dgbuilder that prevents docker container from building Change-Id: I7c0f0eef62b759ebf04ef7a6bd08eca78a673ce9 Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: 493371eaedf4dbe9eb522474707c6f7c2db5b202
2017-03-31[SDNC-5] Rebase sdnc-oamDan Timoney51-451/+638
Port to OpenDaylight Boron and sync updates since 16.10 Change-Id: I9f6febe0bd3d50c3d27c775e5a41806ee3d2e6cb Signed-off-by: Dan Timoney <dtimoney@att.com> Former-commit-id: c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b
2017-03-30Merge "Update .gitreview with onap URL"Dan Timoney1-1/+1
Former-commit-id: b362bbc75a899951e8b9c4db004873bde1a51a59
2017-03-29Update domain URLs from openecomp.org to onap.orgAndrew Grimberg1-3/+3
The openecomp.org namespace is deprecated in favor of the onap.org namespace Change-Id: I28fe5014fd1c443fa8c68b58008e2a4c242cb7c5 Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org> Former-commit-id: e37d52d7152711e8638ffea320d35e6d74cc8c82
2017-03-29Update .gitreview with onap URLAndrew Grimberg1-1/+1
Change-Id: I35dc58f1cd6cd9c33f6d1f1ce260350e4ed820ea Signed-off-by: Andrew Grimberg <agrimberg@linuxfoundation.org> Former-commit-id: ffc7184b802e2972f8b5da9d2b25d6e6b842969d
2017-03-27[SDNGC-XXXX] fixing sql connection leakAl Rotundo7-69/+66
was not cleaning up sql connections during checkDB, removed call to checkDB, redundant Change-Id: I3d4a10cb7b743eb68a1969c1719c376829bc27c3 Signed-off-by: Al Rotundo <arotundo@att.com> Former-commit-id: d9b6e415838e94bf485c01a3f5d6aaa841e37c45
2017-03-15Merge "Add default path for mvn settings file"Dan Timoney1-3/+10
Former-commit-id: 9f4bdc553cfe0b509d6f536b31f44c30d7605935
2017-03-15[VERSION] Roll to next versionTimoney, Daniel (dt5972)13-25/+25
Roll to version 1.1.0-SNAPSHOT Change-Id: If078aef1ef1a05207d98125d01cec8abdf598af4 Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com> Former-commit-id: d239580db622f04200795e0343413dd288495d81
2017-03-14[ADMPORTAL] Connection leak fixTimoney, Daniel (dt5972)1-0/+2
Added connection.release() Change-Id: I1caeb4e9ea69099e37e8dc0c3869e1100699b40b Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com> Former-commit-id: 18e4ba71f5b4c553e045c6d02e1a0a5a000a2d6b
2017-03-08Add default path for mvn settings fileRashmi Pujar1-3/+10
I believe Jenkins is settings these env variables. However, having defaults when env is not set is helpful to build images locally. Change-Id: I0a40d5ce85e114a8ebb8003c94b7f0f7e3eb6d41 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Former-commit-id: 86b789e39591f2cbe7810806d196b8b342e89883
2017-03-08Merge "{feature}-installer.zip not copied to sdnc-img"Dan Timoney2-2/+1
Former-commit-id: 6215813a6014352fffe921b479e115f5b4076f32
2017-03-08{feature}-installer.zip not copied to sdnc-imgRashmi Pujar2-2/+1
The "generate-sources" phase assigned to docker-maven-plugin occurs much earlier than phase of for building and staging *-installer zip files. This leads to image not having any of these zip, thus ODL inside sdnc containers fails to load sdnc feature repos. The right Maven lifecycle phase for building docker should be "package" as this creates docker-build.tar. Also, removed the redundant file permission change in Dockerfile Change-Id: If951e97dd9568343a577e64a8dd9452aaf74557d Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Former-commit-id: 0aa8a5792b8e12f1423fcbe45742b3d6de330558
2017-03-07Grant permissions to *.sh from dockerfileRashmi Pujar1-0/+1
chmod from exec-maven-plugin in pom file doesn't grant file permission. Hence, changing it directly from the Dockerfile. Change-Id: Ic152f5d881e294ae53c11e67391b6892fee4b6a7 Signed-off-by: Rashmi Pujar <rashmi.pujar@bell.ca> Former-commit-id: 8c4f00ab3215d98e81e9480447696db59f36080e
2017-03-07[DOCKER] Dgbuilder docker build failsTimoney, Daniel (dt5972)1-1/+1
A change made to isolate issue with dgbuilder docker container build was inadvertantly carried forward into patch Change-Id: Ic6179b2cd0a5572e19f6e4265fa0b10dc027cbd8 Signed-off-by: Timoney, Daniel (dt5972) <dtimoney@att.com> Former-commit-id: e5a2ca15ad58e8fd83f2460e17ddaa821b4b7e6a