aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml18
-rw-r--r--hv-collector-analysis/pom.xml11
-rw-r--r--pom.xml17
3 files changed, 39 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c1e55541..54bbacf2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,6 +2,8 @@ image: archive.docker-registry.eecloud.nsn-net.net/imp/matryoshka:latest
stages:
- build
+ - publish
+ - trigger-integration-tests
build:
stage: build
@@ -9,8 +11,16 @@ build:
- mvn -e -T2 -Panalysis clean install
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-coverage/target/site/jacoco-aggregate
+ - hv-collector-core/target/reports
+ - hv-collector-main/target/reports
+ - hv-collector-utils/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.registry="$DOCKER_REPO_ADDR" 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"
diff --git a/hv-collector-analysis/pom.xml b/hv-collector-analysis/pom.xml
index 19955dea..9950ec1f 100644
--- a/hv-collector-analysis/pom.xml
+++ b/hv-collector-analysis/pom.xml
@@ -35,5 +35,16 @@
<version>1.0.0-SNAPSHOT</version>
<description>VES HighVolume Collector :: Code analysis configuration</description>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project> \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 2fc094e0..17a86b46 100644
--- a/pom.xml
+++ b/pom.xml
@@ -94,6 +94,13 @@
</configuration>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <configuration>
+ <skip>true</skip>
+ </configuration>
+ </plugin>
+ <plugin>
<artifactId>kotlin-maven-plugin</artifactId>
<groupId>org.jetbrains.kotlin</groupId>
<version>${kotlin.version}</version>
@@ -352,6 +359,13 @@
<goal>build</goal>
</goals>
</execution>
+ <execution>
+ <id>push-docker-image</id>
+ <phase>deploy</phase>
+ <goals>
+ <goal>push</goal>
+ </goals>
+ </execution>
</executions>
<configuration>
<verbose>true</verbose>
@@ -362,9 +376,6 @@
<name>${docker-image.namespace}/${docker-image.name}</name>
<build>
<dockerFileDir>${project.basedir}</dockerFileDir>
- <tags>
- <tag>${project.version}</tag>
- </tags>
</build>
</image>
</images>