Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
aggregation-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
OZG-Cloud
app
aggregation-manager
Commits
e7778513
Verified
Commit
e7778513
authored
1 week ago
by
Sebastian Bergandy
Browse files
Options
Downloads
Patches
Plain Diff
OZG-8252 add gitlab pipeline
parent
d4c4201c
No related branches found
No related tags found
No related merge requests found
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
.gitlab-ci.yml
+9
-0
9 additions, 0 deletions
.gitlab-ci.yml
Jenkinsfile
+3
-3
3 additions, 3 deletions
Jenkinsfile
aggregation-manager-job/pom.xml
+74
-13
74 additions, 13 deletions
aggregation-manager-job/pom.xml
aggregation-manager-server/pom.xml
+73
-13
73 additions, 13 deletions
aggregation-manager-server/pom.xml
with
159 additions
and
29 deletions
.gitlab-ci.yml
0 → 100644
+
9
−
0
View file @
e7778513
stages
:
-
download
-
build
-
test
-
deploy
-
publish
include
:
-
component
:
$CI_SERVER_FQDN/sh/zit/ozg-cloud/devops/ci-components/maven@main
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Jenkinsfile
+
3
−
3
View file @
e7778513
...
@@ -102,7 +102,7 @@ pipeline {
...
@@ -102,7 +102,7 @@ pipeline {
}
}
configFileProvider
([
configFile
(
fileId:
'maven-settings'
,
variable:
'MAVEN_SETTINGS'
)])
{
configFileProvider
([
configFile
(
fileId:
'maven-settings'
,
variable:
'MAVEN_SETTINGS'
)])
{
sh
'mvn --no-transfer-progress -s $MAVEN_SETTINGS clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true'
sh
'mvn --no-transfer-progress -s $MAVEN_SETTINGS
-Pjenkins,!gitlab
clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true'
}
}
}
}
}
}
...
@@ -113,7 +113,7 @@ pipeline {
...
@@ -113,7 +113,7 @@ pipeline {
FAILED_STAGE
=
env
.
STAGE_NAME
FAILED_STAGE
=
env
.
STAGE_NAME
}
}
configFileProvider
([
configFile
(
fileId:
'maven-settings'
,
variable:
'MAVEN_SETTINGS'
)])
{
configFileProvider
([
configFile
(
fileId:
'maven-settings'
,
variable:
'MAVEN_SETTINGS'
)])
{
sh
'mvn --no-transfer-progress -s $MAVEN_SETTINGS -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
sh
'mvn --no-transfer-progress -s $MAVEN_SETTINGS
-Pjenkins,!gitlab
-DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3'
}
}
}
}
}
}
...
@@ -123,7 +123,7 @@ pipeline {
...
@@ -123,7 +123,7 @@ pipeline {
FAILED_STAGE
=
env
.
STAGE_NAME
FAILED_STAGE
=
env
.
STAGE_NAME
}
}
configFileProvider
([
configFile
(
fileId:
'maven-settings'
,
variable:
'MAVEN_SETTINGS'
)])
{
configFileProvider
([
configFile
(
fileId:
'maven-settings'
,
variable:
'MAVEN_SETTINGS'
)])
{
sh
'mvn --no-transfer-progress -s $MAVEN_SETTINGS spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -pl aggregation-manager-job,aggregation-manager-server'
sh
'mvn --no-transfer-progress -s $MAVEN_SETTINGS
-Pjenkins,!gitlab
spring-boot:build-image -DskipTests -Dmaven.wagon.http.retryHandler.count=3 -pl aggregation-manager-job,aggregation-manager-server'
sh
"mvn -s $MAVEN_SETTINGS versions:revert"
sh
"mvn -s $MAVEN_SETTINGS versions:revert"
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
aggregation-manager-job/pom.xml
+
74
−
13
View file @
e7778513
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
<properties>
<properties>
<spring-boot.build-image.imageName>
docker.ozg-sh.de/aggregation-manager-job:build-latest
</spring-boot.build-image.imageName>
<spring-boot.build-image.imageName>
docker.ozg-sh.de/aggregation-manager-job:build-latest
</spring-boot.build-image.imageName>
<spring-boot.build-image.imageTags>
${project.version}
</spring-boot.build-image.imageTags>
</properties>
</properties>
<dependencies>
<dependencies>
<!-- Own projects -->
<!-- Own projects -->
...
@@ -104,19 +105,6 @@
...
@@ -104,19 +105,6 @@
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-compiler-plugin
</artifactId>
<artifactId>
maven-compiler-plugin
</artifactId>
</plugin>
</plugin>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<mainClass>
de.ozgcloud.aggregation.AggregationManagerApplication
</mainClass>
<image>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS
xml:space=
"preserve"
>
</BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>
-Dfile.encoding=UTF-8
</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
</image>
</configuration>
</plugin>
<plugin>
<plugin>
<groupId>
org.jacoco
</groupId>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<artifactId>
jacoco-maven-plugin
</artifactId>
...
@@ -135,4 +123,77 @@
...
@@ -135,4 +123,77 @@
</plugin>
</plugin>
</plugins>
</plugins>
</build>
</build>
<profiles>
<profile>
<id>
jenkins
</id>
<activation>
<activeByDefault>
false
</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<mainClass>
de.ozgcloud.aggregation.AggregationManagerApplication
</mainClass>
<image>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS
xml:space=
"preserve"
>
</BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>
-Dfile.encoding=UTF-8
</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
</image>
<profiles>
<profile>
local
</profile>
</profiles>
<docker>
<publishRegistry>
<username>
${docker-username}
</username>
<password>
${docker-password}
</password>
<url>
${docker-url}
</url>
</publishRegistry>
</docker>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>
gitlab
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<mainClass>
de.ozgcloud.aggregation.AggregationManagerApplication
</mainClass>
<image>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS
xml:space=
"preserve"
>
</BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>
-Dfile.encoding=UTF-8
</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
<tags>
${spring-boot.build-image.imageTags}
</tags>
<publish>
true
</publish>
</image>
<profiles>
<profile>
local
</profile>
</profiles>
</configuration>
<executions>
<execution>
<phase>
install
</phase>
<goals>
<goal>
build-image-no-fork
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
aggregation-manager-server/pom.xml
+
73
−
13
View file @
e7778513
...
@@ -39,6 +39,7 @@
...
@@ -39,6 +39,7 @@
<properties>
<properties>
<spring-boot.build-image.imageName>
docker.ozg-sh.de/aggregation-manager-server:build-latest
</spring-boot.build-image.imageName>
<spring-boot.build-image.imageName>
docker.ozg-sh.de/aggregation-manager-server:build-latest
</spring-boot.build-image.imageName>
<spring-boot.build-image.imageTags>
${project.version}
</spring-boot.build-image.imageTags>
</properties>
</properties>
<dependencies>
<dependencies>
...
@@ -90,19 +91,6 @@
...
@@ -90,19 +91,6 @@
<groupId>
org.apache.maven.plugins
</groupId>
<groupId>
org.apache.maven.plugins
</groupId>
<artifactId>
maven-compiler-plugin
</artifactId>
<artifactId>
maven-compiler-plugin
</artifactId>
</plugin>
</plugin>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<mainClass>
de.ozgcloud.aggregation.AggregationManagerApplication
</mainClass>
<image>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS
xml:space=
"preserve"
>
</BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>
-Dfile.encoding=UTF-8
</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
</image>
</configuration>
</plugin>
<plugin>
<plugin>
<groupId>
org.jacoco
</groupId>
<groupId>
org.jacoco
</groupId>
<artifactId>
jacoco-maven-plugin
</artifactId>
<artifactId>
jacoco-maven-plugin
</artifactId>
...
@@ -121,4 +109,76 @@
...
@@ -121,4 +109,76 @@
</plugin>
</plugin>
</plugins>
</plugins>
</build>
</build>
<profiles>
<profile>
<id>
jenkins
</id>
<activation>
<activeByDefault>
false
</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<mainClass>
de.ozgcloud.aggregation.AggregationManagerApplication
</mainClass>
<image>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS
xml:space=
"preserve"
>
</BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>
-Dfile.encoding=UTF-8
</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
</image>
<profiles>
<profile>
local
</profile>
</profiles>
<docker>
<publishRegistry>
<username>
${docker-username}
</username>
<password>
${docker-password}
</password>
<url>
${docker-url}
</url>
</publishRegistry>
</docker>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>
gitlab
</id>
<activation>
<activeByDefault>
true
</activeByDefault>
</activation>
<build>
<plugins>
<plugin>
<groupId>
org.springframework.boot
</groupId>
<artifactId>
spring-boot-maven-plugin
</artifactId>
<configuration>
<image>
<env>
<BPE_DELIM_JAVA_TOOL_OPTIONS
xml:space=
"preserve"
>
</BPE_DELIM_JAVA_TOOL_OPTIONS>
<BPE_APPEND_JAVA_TOOL_OPTIONS>
-Dfile.encoding=UTF-8
</BPE_APPEND_JAVA_TOOL_OPTIONS>
</env>
<tags>
${spring-boot.build-image.imageTags}
</tags>
<publish>
true
</publish>
</image>
<profiles>
<profile>
local
</profile>
</profiles>
</configuration>
<executions>
<execution>
<phase>
install
</phase>
<goals>
<goal>
build-image-no-fork
</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles>
</project>
</project>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment