From: wasala Date: Mon, 18 Jun 2018 09:45:08 +0000 (+0200) Subject: Added build step CI in gitlab X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F85%2F58385%2F8;p=dcaegen2%2Fservices%2Fprh.git Added build step CI in gitlab Change-Id: I11430c0dfe9c8794d1266c5fd675712f83d30e3e Issue-ID: DCAEGEN2-557 Signed-off-by: wasala --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 00000000..e9aac09c --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,24 @@ +image: archive.docker-registry.eecloud.nsn-net.net/imp/matryoshka:18.02.0 + +stages: + - build + - publish + +build: + stage: build + script: + - mvn -e clean install -T2 docker:build + artifacts: + expire_in: 5 days + paths: + - prh-commons/target/site/jacoco + - prh-aai-client/target/site/jacoco + - prh-dmaap-client/target/site/jacoco + - prh-app-server/target/site/jacoco +publish: + stage: publish +# only: +# - master + script: + - docker login $DOCKER_REPO_ADDR -u $DOCKER_REPO_USER -p $DOCKER_REPO_PASS + - mvn -e -DskipTests -Ddocker.repo.url="$DOCKER_REPO_ADDR" -Dnexus.staging="true" deploy \ No newline at end of file diff --git a/pom.xml b/pom.xml index 955e6e1d..d08c9e9c 100644 --- a/pom.xml +++ b/pom.xml @@ -78,6 +78,21 @@ + + + + 40_openecomp-release + 40_openecomp-release + https://nexus.onap.org/content/repositories/releases/ + + true + daily + + + false + + + JCenter @@ -91,11 +106,24 @@ + external-repository https://oss.sonatype.org/content/repositories + + 40_openecomp-release + 40_openecomp-release + https://nexus.onap.org/content/repositories/releases/ + + true + daily + + + false + + @@ -377,6 +405,13 @@ + + org.apache.maven.plugins + maven-deploy-plugin + + true + + diff --git a/prh-aai-client/pom.xml b/prh-aai-client/pom.xml index 28abdd81..f8aeea5c 100644 --- a/prh-aai-client/pom.xml +++ b/prh-aai-client/pom.xml @@ -38,7 +38,6 @@ ${project.parent.basedir} - diff --git a/prh-app-server/pom.xml b/prh-app-server/pom.xml index 5706dc93..aad1c99a 100644 --- a/prh-app-server/pom.xml +++ b/prh-app-server/pom.xml @@ -37,6 +37,8 @@ https://nexus.onap.org content/repositories/snapshots/ content/repositories/releases/ + ${onap.nexus.dockerregistry.daily} + false @@ -114,18 +116,7 @@ ${project.version} latest - ${onap.nexus.dockerregistry.daily} - - - - org.sonatype.plugins - nexus-staging-maven-plugin - 1.6.7 - true - - ecomp-staging - ${nexusproxy} - 176c31dfe190a + ${docker.repo.url} diff --git a/prh-commons/pom.xml b/prh-commons/pom.xml index 40ad85f5..8aa966cc 100644 --- a/prh-commons/pom.xml +++ b/prh-commons/pom.xml @@ -1,71 +1,70 @@ - 4.0.0 + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + 4.0.0 - - prh - org.onap.dcaegen2.services - 1.0.0-SNAPSHOT - - - prh-commons - org.onap.dcaegen2.services.prh + + prh + org.onap.dcaegen2.services 1.0.0-SNAPSHOT - jar + - - ${project.parent.basedir} - + prh-commons + org.onap.dcaegen2.services.prh + 1.0.0-SNAPSHOT + jar - - - org.immutables - value - - - org.immutables - gson - - - org.apache.httpcomponents - httpclient - - - org.apache.commons - commons-lang3 - + + ${project.parent.basedir} + + + + org.immutables + value + + + org.immutables + gson + + + org.apache.httpcomponents + httpclient + + + org.apache.commons + commons-lang3 + - - - org.junit.jupiter - junit-jupiter-api - test - - - org.junit.jupiter - junit-jupiter-engine - test - - - org.mockito - mockito-core - test - + + + org.junit.jupiter + junit-jupiter-api + test + + + org.junit.jupiter + junit-jupiter-engine + test + + + org.mockito + mockito-core + test + - - - ch.qos.logback - logback-classic - - - org.slf4j - jul-to-slf4j - - - org.slf4j - log4j-over-slf4j - - + + + ch.qos.logback + logback-classic + + + org.slf4j + jul-to-slf4j + + + org.slf4j + log4j-over-slf4j + + \ No newline at end of file diff --git a/prh-dmaap-client/pom.xml b/prh-dmaap-client/pom.xml index bce5ccbb..a84382b2 100644 --- a/prh-dmaap-client/pom.xml +++ b/prh-dmaap-client/pom.xml @@ -36,7 +36,6 @@ ${project.parent.basedir} - @@ -104,6 +103,5 @@ mockito-core test - \ No newline at end of file