Skip to content
Snippets Groups Projects
Verified Commit 8015c2ba authored by Sebastian Bergandy's avatar Sebastian Bergandy :keyboard:
Browse files

OZG-8252 change default active profile

parent 8f01b70f
Branches
Tags
No related merge requests found
...@@ -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 -Pjenkins,!gitlab clean install -Dmaven.wagon.http.retryHandler.count=3 -DelasticTests.disabled=true' sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -Pjenkins 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 -Pjenkins,!gitlab -DskipTests deploy -Dmaven.wagon.http.retryHandler.count=3' sh 'mvn --no-transfer-progress -s $MAVEN_SETTINGS -Pjenkins -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 -Pjenkins,!gitlab 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 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"
} }
} }
......
...@@ -127,9 +127,6 @@ ...@@ -127,9 +127,6 @@
<profiles> <profiles>
<profile> <profile>
<id>jenkins</id> <id>jenkins</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -160,9 +157,6 @@ ...@@ -160,9 +157,6 @@
</profile> </profile>
<profile> <profile>
<id>gitlab</id> <id>gitlab</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
......
...@@ -113,9 +113,6 @@ ...@@ -113,9 +113,6 @@
<profiles> <profiles>
<profile> <profile>
<id>jenkins</id> <id>jenkins</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
<build> <build>
<plugins> <plugins>
<plugin> <plugin>
...@@ -146,10 +143,7 @@ ...@@ -146,10 +143,7 @@
</profile> </profile>
<profile> <profile>
<id>gitlab</id> <id>gitlab</id>
<activation> 1 <build>
<activeByDefault>true</activeByDefault>
</activation>
<build>
<plugins> <plugins>
<plugin> <plugin>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment