Marmelator/redaction-service
1
0
Fork 0
Code Issues Pull Requests 14 Actions Packages Projects Releases 622 Wiki Activity

Pull request #466: hotfix: remove push from nightly build

Browse Source 
Merge in RED/redaction-service from fixNightly to master

* commit '430a08e611cb6ac99a31139f1a46bf36a66bb6ab':
  hotfix: remove push from nightly build
This commit is contained in:
Christoph Schabert 2022-09-12 11:29:26 +02:00
commit ce15faf072
2 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,23 +89,36 @@ public class PlanSpec {
return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Plan created from (enter repository url of your plan)") return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Plan created from (enter repository url of your plan)")
.variables(new Variable("maven_add_param", "")) .variables(new Variable("maven_add_param", ""))
.stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean") .stages(new Stage("Default Stage").jobs(new Job("Default Job",
.inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository") new BambooKey("JOB1")).tasks(
.cleanCheckout(true) new CleanWorkingDirectoryTask()
.checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build") .description("Clean working directory.")
.location(Location.FILE) .enabled(true),
.fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh") new VcsCheckoutTask().description("Checkout Default Repository")
.argument(SERVICE_NAME), createJUnitParserTask().description("Resultparser") .cleanCheckout(true)
.resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml") .checkoutItems(
.enabled(true), new InjectVariablesTask().description("Inject git Tag") new CheckoutItem()
.path("git.tag") .defaultRepository()),
.namespace("g") new ScriptTask().description("Build")
.scope(InjectVariablesScope.LOCAL), new VcsTagTask().description("${bamboo.g.gitTag}").tagName("${bamboo.g.gitTag}").defaultRepository()) .location(Location.FILE)
.dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim") .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
.argument(SERVICE_NAME), createJUnitParserTask()
.description("Resultparser")
.resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
.enabled(true),
new InjectVariablesTask().description("Inject git Tag")
.path("git.tag")
.namespace("g")
.scope(InjectVariablesScope.LOCAL),
new VcsTagTask().description("${bamboo.g.gitTag}")
.tagName("${bamboo.g.gitTag}")
.defaultRepository())
.dockerConfiguration(
new DockerConfiguration()
.image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
.volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml") .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
.volume("/var/run/docker.sock", "/var/run/docker.sock")))) .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
.linkedRepositories("RED / " + SERVICE_NAME) .linkedRepositories("RED / " + SERVICE_NAME)
.triggers(new BitbucketServerTrigger()) .triggers(new BitbucketServerTrigger())
.planBranchManagement(new PlanBranchManagement().createForVcsBranch() .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
.delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)) .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
@ -117,18 +130,29 @@ public class PlanSpec {
return new Plan(project(), SERVICE_NAME + "-Night", new BambooKey(SERVICE_KEY + "NIGHT")).description("Long running nightly Plan for tests") return new Plan(project(), SERVICE_NAME + "-Night", new BambooKey(SERVICE_KEY + "NIGHT")).description("Long running nightly Plan for tests")
.variables(new Variable("maven_add_param", "-Dtest-groups=rules-test")) .variables(new Variable("maven_add_param", "-Dtest-groups=rules-test"))
.stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new CleanWorkingDirectoryTask().description("Clean working directory.") .stages(new Stage("Default Stage").jobs(
.enabled(true), new VcsCheckoutTask().description("Checkout Default Repository") new Job("Default Job", new BambooKey("JOB1")).tasks(
.cleanCheckout(true) new CleanWorkingDirectoryTask()
.checkoutItems(new CheckoutItem().defaultRepository()), new ScriptTask().description("Build") .description("Clean working directory.")
.location(Location.FILE) .enabled(true),
.fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh") new VcsCheckoutTask()
.argument(SERVICE_NAME), createJUnitParserTask().description("Resultparser") .description("Checkout Default Repository")
.resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml") .cleanCheckout(true)
.enabled(true)) .checkoutItems(
.dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim") new CheckoutItem()
.volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml") .defaultRepository()),
.volume("/var/run/docker.sock", "/var/run/docker.sock")))) new ScriptTask()
.description("Build")
.location(Location.FILE)
.fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
.argument(SERVICE_NAME + " verify"), createJUnitParserTask().description("Resultparser")
.resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
.enabled(true))
.dockerConfiguration(
new DockerConfiguration()
.image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
.volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
.volume("/var/run/docker.sock", "/var/run/docker.sock"))))
.linkedRepositories("RED / " + SERVICE_NAME) .linkedRepositories("RED / " + SERVICE_NAME)
.triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00))) .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
.planBranchManagement(new PlanBranchManagement().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)).notificationForCommitters()); .planBranchManagement(new PlanBranchManagement().delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14)).notificationForCommitters());

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

@ -2,6 +2,7 @@
set -e set -e
SERVICE_NAME=$1 SERVICE_NAME=$1
MVN_TARGET=${2:-deploy}
if [[ "$bamboo_planRepository_branchName" == "master" ]] if [[ "$bamboo_planRepository_branchName" == "master" ]]
then then
@ -46,7 +47,7 @@ mvn --no-transfer-progress \
mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \ mvn -f ${bamboo_build_working_directory}/$SERVICE_NAME-v1/pom.xml \
--no-transfer-progress \ --no-transfer-progress \
clean deploy \ clean $MVN_TARGET \
${bamboo_maven_add_param} \ ${bamboo_maven_add_param} \
-e \ -e \
-DdeployAtEnd=true \ -DdeployAtEnd=true \