diff options
author | 2018-08-07 09:32:43 +0200 | |
---|---|---|
committer | 2018-08-07 09:32:43 +0200 | |
commit | f16fff6a5c15474d86ea304b499535076d5a368c (patch) | |
tree | 13b76f93b0c0dff6b5d80c650fdc9004cca5c8cd | |
parent | 77f11bb84dc36638abcce8ffa1e1a67a3600b5a2 (diff) |
Clean up repository
There are some leftover from gitlab that should be removed from/updated in official repo.
Change-Id: I9e47321433ed2f744135b7fb85f140f381fe84e1
Issue-ID: DCAEGEN2-690
Signed-off-by: Jakub Dudycz <jakub.dudycz@nokia.com>
-rw-r--r-- | .gitlab-ci.yml | 52 | ||||
-rw-r--r-- | CONTRIBUTING.md | 74 | ||||
-rwxr-xr-x | development.sh | 66 | ||||
-rw-r--r-- | public/index.html | 64 | ||||
-rw-r--r-- | req.json | 20 | ||||
-rwxr-xr-x | ssl/connect.sh | 26 |
6 files changed, 0 insertions, 302 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index c35353b3..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,52 +0,0 @@ -image: archive.docker-registry.eecloud.nsn-net.net/imp/matryoshka:latest - -stages: - - build - - publish - - trigger-integration-tests - -build: - stage: build - script: - - mvn -e -T2 -Panalysis clean install -Ddocker.http_proxy="http://$PROXY_HOST:$PROXY_PORT" -Ddocker.https_proxy="http://$PROXY_HOST:$PROXY_PORT" - artifacts: - paths: - - hv-collector-coverage/target/site/jacoco-aggregate - - hv-collector-core/target/reports - - hv-collector-main/target/reports - - hv-collector-utils/target/reports - - hv-collector-dcae-app-simulator/target/reports - - hv-collector-xnf-simulator/target/reports - -publish: - stage: publish - only: - - master - script: - - docker login $DOCKER_REPO_ADDR -u $DOCKER_REPO_USER -p $DOCKER_REPO_PASS - - | - mvn -e -DskipTests -DskipAnalysis \ - -Ddocker-image.registry="$DOCKER_REPO_ADDR" \ - -Ddocker.http_proxy="http://$PROXY_HOST:$PROXY_PORT" \ - -Ddocker.https_proxy="http://$PROXY_HOST:$PROXY_PORT" \ - deploy - - "curl -X POST -F token=$INTEGRATION_TESTS_TRIGGER_TOKEN -F ref=master https://gitlabe1.ext.net.nokia.com/api/v4/projects/33403/trigger/pipeline" - -pages: - stage: publish - only: - - master - dependencies: - - build - artifacts: - paths: - - public - script: - - mkdir -p public/analysis - - mv hv-collector-coverage/target/site/jacoco-aggregate public/coverage - - mv hv-collector-core/target/reports public/analysis/core - - mv hv-collector-main/target/reports public/analysis/main - - mv hv-collector-utils/target/reports public/analysis/utils - - mv hv-collector-dcae-app-simulator/target/reports public/analysis/dcae-app-simulator - - mv hv-collector-xnf-simulator/target/reports public/analysis/xnf-simulator - diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 6fc7e0ae..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,74 +0,0 @@ -# Contribution guidelines -Project will probably be moved to ONAP Gerrit repository. Thus, please follow ONAP contribution guidelines. - -## Merging - -First of all let's avoid merge commits. To achieve it we should: - -* rebase master changes to task branches, -* manually merge task branches to master with `--ff-only option`. - -The last part needs some comment. In Gerrit master history is linear and easy to follow. That is probably the greatest (only? :wink:) advantage of Gerrit over GitLab. In GitLab EE it is possible to configure MRs so merge commits are avoided. However in GitLab CE it is not possible. To mitigate this, we should manually merge branches into master. - -Some commands which you might find useful: - -```shell -# 1. Update master -git checkout master -git fetch -git merge -ff-only - -# 2. Rebase branch on fresh master -git checkout $BRANCH -git rebase -i master -git push --force - -# 3. Merge branch -git checkout master -git merge --ff-only $BRANCH -git branch -d $BRANCH -git push origin --delete $BRANCH -git push - -``` - -## Sign-off rules -Each commit has to be signed-off. By signing the commit you certify that you did follow rules defined in the document https://gerrit.onap.org/r/static/signoffrules.txt: - -``` -Sign your work - -To improve tracking of who did what, especially with contributions that -can percolate to their final resting place in the code base through -several layers of maintainers, we've introduced a "sign-off" procedure -on all contributions submitted. - -The sign-off is a simple line at the end of the explanation for the -contribution, which certifies that you wrote it or otherwise have the -right to pass it on as an open-source contribution. When you sign-off -your contribution you are stating the following: - - By making a contribution to this project, I certify that: - - (a) The contribution was created in whole or in part by me and I - have the right to submit it under the open source license - indicated in the file; or - - (b) The contribution is based upon previous work that, to the best - of my knowledge, is covered under an appropriate open source - license and I have the right under that license to submit that - work with modifications, whether created in whole or in part - by me, under the same open source license (unless I am - permitted to submit under a different license), as indicated - in the file; or - - (c) The contribution was provided directly to me by some other - person who certified (a), (b) or (c) and I have not modified - it. - - (d) I understand and agree that this project and the contribution - are public and that a record of the contribution (including all - personal information I submit with it, including my sign-off) is - maintained indefinitely and may be redistributed consistent with - this project or the open source license(s) involved. -``` diff --git a/development.sh b/development.sh deleted file mode 100755 index 94500079..00000000 --- a/development.sh +++ /dev/null @@ -1,66 +0,0 @@ -#!/bin/bash - -# Usage: source ./development.sh and use functions defined here -# https://httpie.org/ is required for API calls - -export MAVEN_OPTS="-T1C" - -function veshv_full_rebuild() { - mvn clean install -Panalysis ${MAVEN_OPTS} -} - -function veshv_rebuild() { - mvn clean install ${MAVEN_OPTS} -} - -function veshv_build() { - mvn install ${MAVEN_OPTS} -} - -function veshv_fast_build() { - mvn install -DskipTests ${MAVEN_OPTS} -} - -function veshv_docker_start() { - docker-compose down - docker-compose rm -f - docker-compose up -} - -function veshv_docker_clean() { - docker volume prune -} - -function veshv_build_and_start() { - veshv_fast_build && veshv_docker_start -} - -function veshv_fresh_restart() { - docker-compose down - docker-compose rm -f - veshv_docker_clean - veshv_fast_build && docker-compose up -} - -function veshv_simul_dcaeapp_count() { - http --json GET http://localhost:8100/messages/count -} - -function veshv_simul_dcaeapp_last_key() { - http --json GET http://localhost:8100/messages/last/key -} - -function veshv_simul_dcaeapp_last_value() { - http --json GET http://localhost:8100/messages/last/value -} - -function veshv_simul_client() { - # feed me with json file using "<" - http --json POST http://localhost:8000/simulator/sync -} - -function veshv_simul_client_async() { - # feed me with json file using "<" - http --json POST http://localhost:8000/simulator/async -} - diff --git a/public/index.html b/public/index.html deleted file mode 100644 index 26b0b13c..00000000 --- a/public/index.html +++ /dev/null @@ -1,64 +0,0 @@ -<!doctype html> -<html lang="en"> -<head> - <!-- Required meta tags --> - <meta charset="utf-8"> - <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no"> - - <!-- Bootstrap CSS --> - <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" - integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous"> - - <title>VES High Volume collector</title> -</head> -<body> -<div class="container"> - - <div class="jumbotron jumbotron-fluid"> - <div class="container"> - <h1 class="display-4">VES High Volume collector</h1> - <p class="lead">ONAP collector for high volume data, eg. real-time PM</p> - </div> - <div class="container"> - <span class="badge badge-light">Build - <a href="https://gitlabe1.ext.net.nokia.com/onap-wro/ves-hv-collector/pipelines/charts"> - <img alt="pipeline status" - src="https://gitlabe1.ext.net.nokia.com/onap-wro/ves-hv-collector/badges/master/pipeline.svg"/> - </a> - </span> - <span class="badge badge-light">Integration tests - <a href="https://gitlabe1.ext.net.nokia.com/onap-wro/ves-hv-integration/pipelines/charts"> - <img alt="pipeline status" - src="https://gitlabe1.ext.net.nokia.com/onap-wro/ves-hv-integration/badges/master/pipeline.svg"/> - </a> - </span> - - </div> - </div> - - - - <ul> - <li>Repositories - <ul> - <li><a href="https://gitlabe1.ext.net.nokia.com/onap-wro/ves-hv-collector">Implementation</a></li> - <li><a href="https://gitlabe1.ext.net.nokia.com/onap-wro/ves-hv-integration">Integration tests</a> based on ONAP CSIT framework</li> - </ul> - </li> - </li> - <li><a href="https://onap-wro.gitlabe1-pages.ext.net.nokia.com/ves-hv-integration/report.html">Last IT results</a></li> - <li>Static code analysis: - <ul> - <li><a href="./analysis/core/detekt-report.html">Core</a></li> - <li><a href="./analysis/main/detekt-report.html">Main</a></li> - <li><a href="./analysis/utils/detekt-report.html">Utils</a></li> - <li><a href="./analysis/dcae-app-simulator/detekt-report.html">DCAE APP simulator</a></li> - <li><a href="./analysis/xnf-simulator/detekt-report.html">xNF simulator</a></li> - </ul> - </li> - <li><a href="./coverage">Coverage</a> (please note that Jacoco support for Kotlin is currently very problematic so the values are invalid) - </ul> -</div> - -</body> -</html> diff --git a/req.json b/req.json deleted file mode 100644 index e092ed66..00000000 --- a/req.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "commonEventHeader": { - "version": "sample-version", - "domain": 10, - "sequence": 1, - "priority": 1, - "eventId": "sample-event-id", - "eventName": "sample-event-name", - "eventType": "sample-event-type", - "startEpochMicrosec": 120034455, - "lastEpochMicrosec": 120034455, - "nfNamingCode": "sample-nf-naming-code", - "nfcNamingCode": "sample-nfc-naming-code", - "reportingEntityId": "sample-reporting-entity-id", - "reportingEntityName": "sample-reporting-entity-name", - "sourceId": "sample-source-id", - "sourceName": "sample-source-name" - }, - "messagesAmount": 1000000 -} diff --git a/ssl/connect.sh b/ssl/connect.sh deleted file mode 100755 index 16524c3e..00000000 --- a/ssl/connect.sh +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/bash -set -eou pipefail - -if [[ $# < 2 ]]; then - echo "Please provide a key file prefix and a target host:port" - exit 1 -fi - -key_prefix=$1 -host_and_port=$2 - -cert_file="$key_prefix.crt" -key_file="$key_prefix.key" - -if [[ ! -r "$cert_file" ]]; then - echo "$cert_file is not readable" - exit 2 -fi - -if [[ ! -r "$key_file" ]]; then - echo "$key_file is not readable" - exit 2 -fi - -openssl s_client -connect $host_and_port -cert "$cert_file" -key "$key_file" -CAfile onap.crt - |