Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

update mvn command

Browse Source
This commit is contained in:
cschabert 2022-03-30 17:04:05 +02:00
parent cf9a4d736c
commit 0e49beeede
3 changed files with 33 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bamboo-specs/src/main/java/buildjob/PlanSpec.java
View File

@ -93,6 +93,7 @@ public class PlanSpec {
"rm -rf ./*"), "rm -rf ./*"),
new VcsCheckoutTask() new VcsCheckoutTask()
.description("Checkout Default Repository") .description("Checkout Default Repository")
.cleanCheckout(true)
.checkoutItems(new CheckoutItem().defaultRepository()), .checkoutItems(new CheckoutItem().defaultRepository()),
new ScriptTask() new ScriptTask()
.description("Build") .description("Build")
@ -146,6 +147,7 @@ public class PlanSpec {
"rm -rf ./*"), "rm -rf ./*"),
new VcsCheckoutTask() new VcsCheckoutTask()
.description("Checkout Default Repository") .description("Checkout Default Repository")
.cleanCheckout(true)
.checkoutItems(new CheckoutItem().defaultRepository()), .checkoutItems(new CheckoutItem().defaultRepository()),
new ScriptTask() new ScriptTask()
.description("Sonar") .description("Sonar")
@ -156,7 +158,7 @@ public class PlanSpec {
new DockerConfiguration() new DockerConfiguration()
.image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim") .image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
.dockerRunArguments("--net=host") .dockerRunArguments("--net=host")
.volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml") .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
.volume("/var/run/docker.sock", "/var/run/docker.sock") .volume("/var/run/docker.sock", "/var/run/docker.sock")
) )
) )

18
bamboo-specs/src/main/resources/scripts/build-java.sh
View File

@ -17,8 +17,7 @@ elif [[ "${bamboo_version_tag}" != "dev" ]]
then then
newVersion="${bamboo_version_tag}" newVersion="${bamboo_version_tag}"
else else
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
--no-transfer-progress \ --no-transfer-progress \
${bamboo_maven_add_param} \ ${bamboo_maven_add_param} \
clean install \ clean install \
@ -29,20 +28,17 @@ fi
echo "gitTag=${newVersion}" > git.tag echo "gitTag=${newVersion}" > git.tag
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
versions:set \ versions:set \
-DnewVersion=${newVersion} -DnewVersion=${newVersion}
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
versions:set \ versions:set \
-DnewVersion=${newVersion} -DnewVersion=${newVersion}
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
--no-transfer-progress \ --no-transfer-progress \
clean deploy \ clean deploy \
${bamboo_maven_add_param} \ ${bamboo_maven_add_param} \
@ -53,13 +49,11 @@ ${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \
-Dmaven.wagon.http.ssl.ignore.validity.dates=true \ -Dmaven.wagon.http.ssl.ignore.validity.dates=true \
-DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases -DaltDeploymentRepository=iqser_release::default::https://nexus.iqser.com/repository/red-platform-releases
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
package package
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-image-v1/pom.xml \
docker:push docker:push

53
bamboo-specs/src/main/resources/scripts/sonar-java.sh
View File

@ -4,46 +4,41 @@ set -e
SERVICE_NAME=$1 SERVICE_NAME=$1
echo "build jar binaries" echo "build jar binaries"
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
--no-transfer-progress \ --no-transfer-progress \
clean install \ clean install \
-Djava.security.egd=file:/dev/./urandomelse -Djava.security.egd=file:/dev/./urandomelse
echo "dependency-check:aggregate" echo "dependency-check:aggregate"
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
org.owasp:dependency-check-maven:aggregate org.owasp:dependency-check-maven:aggregate
if [[ -z "${bamboo_repository_pr_key}" ]] if [[ -z "${bamboo_repository_pr_key}" ]]
then then
echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}" echo "Sonar Scan for branch: ${bamboo_planRepository_1_branch}"
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ sonar:sonar \
sonar:sonar \ -Dsonar.projectKey=RED_$SERVICE_NAME \
-Dsonar.projectKey=RED_$SERVICE_NAME \ -Dsonar.host.url=https://sonarqube.iqser.com \
-Dsonar.host.url=https://sonarqube.iqser.com \ -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-Dsonar.login=${bamboo_sonarqube_api_token_secret} \ -Dsonar.branch.name=${bamboo_planRepository_1_branch} \
-Dsonar.branch.name=${bamboo_planRepository_1_branch} \ -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \ -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \ -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
else else
echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}" echo "Sonar Scan for PR with key1: ${bamboo_repository_pr_key}"
${bamboo_capability_system_builder_mvn3_Maven_3}/bin/mvn \ mvn --no-transfer-progress \
--no-transfer-progress \ -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
-f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ sonar:sonar \
sonar:sonar \ -Dsonar.projectKey=RED_$SERVICE_NAME \
-Dsonar.projectKey=RED_$SERVICE_NAME \ -Dsonar.host.url=https://sonarqube.iqser.com \
-Dsonar.host.url=https://sonarqube.iqser.com \ -Dsonar.login=${bamboo_sonarqube_api_token_secret} \
-Dsonar.login=${bamboo_sonarqube_api_token_secret} \ -Dsonar.pullrequest.key=${bamboo_repository_pr_key} \
-Dsonar.pullrequest.key=${bamboo_repository_pr_key} \ -Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \
-Dsonar.pullrequest.branch=${bamboo_repository_pr_sourceBranch} \ -Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \
-Dsonar.pullrequest.base=${bamboo_repository_pr_targetBranch} \ -Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \
-Dsonar.dependencyCheck.jsonReportPath=target/dependency-check-report.json \ -Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \
-Dsonar.dependencyCheck.xmlReportPath=target/dependency-check-report.xml \ -Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
-Dsonar.dependencyCheck.htmlReportPath=target/dependency-check-report.html
fi fi