diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ecompsdkos/ecompsdkos.yaml | 4 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 52 | ||||
| -rw-r--r-- | jjb/policy/include-raw-docker-merge.sh | 2 | ||||
| -rw-r--r-- | jjb/policy/include-raw-docker-release.sh | 2 | ||||
| -rw-r--r-- | jjb/policy/include-raw-docker-verify.sh | 2 | ||||
| -rw-r--r-- | jjb/portal/docker-build-deploy.sh | 3 | ||||
| -rw-r--r-- | jjb/portal/docker-build-push.sh | 3 | ||||
| -rw-r--r-- | jjb/portal/docker-build-release.sh | 3 | ||||
| -rw-r--r-- | jjb/portal/portal.yaml | 4 | ||||
| -rw-r--r-- | jjb/ui/ui-dmaapbc.yaml | 4 |
10 files changed, 42 insertions, 37 deletions
diff --git a/jjb/ecompsdkos/ecompsdkos.yaml b/jjb/ecompsdkos/ecompsdkos.yaml index 89b88d5d6..035d3839e 100644 --- a/jjb/ecompsdkos/ecompsdkos.yaml +++ b/jjb/ecompsdkos/ecompsdkos.yaml @@ -12,8 +12,8 @@ - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'ecomp-sdk/pom.xml' - trigger-job: '{project-name}-{stream}-{subproject}-release-java-daily' + site-pom: 'ecomp-sdk/pom.xml' + trigger-job: '{project-name}-{stream}-{subproject}-release-java-daily' project: 'ecompsdkos' stream: diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 66013dee6..52e0c3a57 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -49,7 +49,8 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' - goals: 'clean install -DskipTests=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean install -DskipTests=true -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -111,7 +112,8 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' - goals: 'clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean install -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -171,7 +173,8 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' - goals: 'clean install -P {mvn-profile} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean install -P {mvn-profile} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -235,7 +238,8 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean install -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -295,7 +299,8 @@ - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' settings: '{mvn-settings}' @@ -369,7 +374,8 @@ - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' settings: '{mvn-settings}' @@ -435,7 +441,8 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean deploy sonar:sonar -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' settings: '{mvn-settings}' @@ -495,9 +502,8 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' - # yamllint disable rule:line-length - goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - # yamllint enable + goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -558,9 +564,8 @@ - maven-target: maven-version: '{maven-version}' - # yamllint disable rule:line-length - goals: 'clean deploy -P {mvn-profile} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - # yamllint enable + goals: 'clean deploy -P {mvn-profile} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -625,9 +630,8 @@ settings-file: '{mvn-settings}' - maven-target: maven-version: '{maven-version}' - # yamllint disable rule:line-length - goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - # yamllint enable + goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -690,9 +694,8 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - # yamllint disable rule:line-length - goals: 'clean deploy -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' - # yamllint enable + goals: 'clean deploy -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -996,7 +999,8 @@ - maven-target: maven-version: '{maven-version}' pom: 'pom.xml' - goals: 'clean install -DskipTests -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean install -DskipTests -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' settings: '{mvn-settings}' settings-type: cfp global-settings: 'global-settings' @@ -1084,7 +1088,9 @@ - maven-target: maven-version: '{maven-version}' - goals: 'clean deploy sonar:sonar site:site site:stage-deploy -Dsonar.host.url=${{SONAR}} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean deploy sonar:sonar site:site site:stage-deploy + -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' settings: '{mvn-settings}' @@ -1165,7 +1171,9 @@ - maven-target: maven-version: '{maven-version}' pom: '{pom}' - goals: 'clean deploy sonar:sonar site:site site:stage-deploy -Dsonar.host.url=${{SONAR}} -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' + goals: 'clean deploy sonar:sonar site:site site:stage-deploy + -Dsonar.host.url=${{SONAR}} -B + -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' properties: - '{maven-deploy-properties}' settings: '{mvn-settings}' diff --git a/jjb/policy/include-raw-docker-merge.sh b/jjb/policy/include-raw-docker-merge.sh index 998a93d26..abb38abe1 100644 --- a/jjb/policy/include-raw-docker-merge.sh +++ b/jjb/policy/include-raw-docker-merge.sh @@ -7,4 +7,4 @@ echo $CURRENTDIR chmod 755 *.* -./docker_merge.sh
\ No newline at end of file +./docker_merge.sh diff --git a/jjb/policy/include-raw-docker-release.sh b/jjb/policy/include-raw-docker-release.sh index 00aa7f74c..68a24b1fd 100644 --- a/jjb/policy/include-raw-docker-release.sh +++ b/jjb/policy/include-raw-docker-release.sh @@ -7,4 +7,4 @@ echo $CURRENTDIR chmod 755 *.* -./docker_build.sh
\ No newline at end of file +./docker_build.sh diff --git a/jjb/policy/include-raw-docker-verify.sh b/jjb/policy/include-raw-docker-verify.sh index c89b26778..2a7dd7b23 100644 --- a/jjb/policy/include-raw-docker-verify.sh +++ b/jjb/policy/include-raw-docker-verify.sh @@ -7,4 +7,4 @@ echo $CURRENTDIR chmod 755 *.* -./docker_verify.sh
\ No newline at end of file +./docker_verify.sh diff --git a/jjb/portal/docker-build-deploy.sh b/jjb/portal/docker-build-deploy.sh index f7d1b823f..dd114af76 100644 --- a/jjb/portal/docker-build-deploy.sh +++ b/jjb/portal/docker-build-deploy.sh @@ -1,8 +1,7 @@ - CURRENTDIR="$(pwd)" echo $CURRENTDIR ls -ltr cd deliveries ls -ltr chmod 755 *.* -./run.sh
\ No newline at end of file +./run.sh diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh index ca2c8760b..c3851dd48 100644 --- a/jjb/portal/docker-build-push.sh +++ b/jjb/portal/docker-build-push.sh @@ -1,8 +1,7 @@ - CURRENTDIR="$(pwd)" echo $CURRENTDIR ls -ltr cd deliveries ls -ltr chmod 755 *.* -./os_docker_push.sh
\ No newline at end of file +./os_docker_push.sh diff --git a/jjb/portal/docker-build-release.sh b/jjb/portal/docker-build-release.sh index 4f8c14eb2..89a5fc131 100644 --- a/jjb/portal/docker-build-release.sh +++ b/jjb/portal/docker-build-release.sh @@ -1,8 +1,7 @@ - CURRENTDIR="$(pwd)" echo $CURRENTDIR ls -ltr cd deliveries ls -ltr chmod 755 *.* -./os_docker_release.sh
\ No newline at end of file +./os_docker_release.sh diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 2cfe69f90..399c4ea17 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -5,8 +5,8 @@ jobs: - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'portal' stream: diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 78a493300..a57a5af22 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -8,8 +8,8 @@ - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' + site-pom: 'pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'ui/dmaapbc' stream: |