summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@linuxfoundation.org>2018-03-13 20:35:25 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-13 20:35:25 +0000
commit46b6edb7eefc3a4b4444544ac80f3cbc3441b6ef (patch)
tree92ec7e5df1e0a70524a0c31d2b58a0ce139bc84b
parentb9e870f4526a5dfcc63b7f99517c2f362a88193f (diff)
parentbb48141fb90d3727cc7c21170955f22f45f35ea0 (diff)
Merge "Remove stage-site-java template"
-rw-r--r--jjb/aaf/aaf-authz.yaml5
-rw-r--r--jjb/aaf/aaf-cadi.yaml4
-rw-r--r--jjb/aaf/aaf-inno.yaml6
-rw-r--r--jjb/aai/aai-aai-common.yaml5
-rw-r--r--jjb/aai/aai-champ.yaml5
-rw-r--r--jjb/aai/aai-resources.yaml4
-rw-r--r--jjb/aai/aai-traversal.yaml4
-rw-r--r--jjb/cli/cli.yaml3
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml4
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml4
-rw-r--r--jjb/dmaap/dmaap-dbcapi.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-mirroragent.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-msgrtr.yaml4
-rw-r--r--jjb/global-templates-java.yaml79
-rw-r--r--jjb/logging-analytics/logging-analytics.yaml4
-rw-r--r--jjb/msb/msb-swagger-sdk.yaml4
-rw-r--r--jjb/music/music.yaml5
-rw-r--r--jjb/portal-sdk/portal-sdk.yaml5
-rw-r--r--jjb/portal/portal.yaml5
-rw-r--r--jjb/sdc/sdc-jtosca.yaml5
-rw-r--r--jjb/sdc/sdc-sdc-distribution-client.yaml5
-rw-r--r--jjb/sdc/sdc-sdc-titan-cassandra.yaml4
-rw-r--r--jjb/sdc/sdc-sdc-tosca.yaml6
-rw-r--r--jjb/sdc/sdc-sdc-workflow-designer.yaml6
-rw-r--r--jjb/sdc/sdc.yaml3
-rw-r--r--jjb/so/so-libs.yaml6
-rw-r--r--jjb/so/so.yaml5
-rw-r--r--jjb/ui/ui-dmaapbc.yaml6
-rw-r--r--jjb/vid/vid.yaml7
31 files changed, 10 insertions, 209 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 7ee7a4c33..5d5774894 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-version-java-daily':
mvn-goals: 'docker:build'
project: 'aaf/authz'
@@ -33,4 +30,4 @@
branch: 'master'
mvn-settings: 'aaf-authz-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aaf/aaf-cadi.yaml b/jjb/aaf/aaf-cadi.yaml
index 4ba5d524e..5752db13b 100644
--- a/jjb/aaf/aaf-cadi.yaml
+++ b/jjb/aaf/aaf-cadi.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'aaf/cadi'
stream:
- 'master':
diff --git a/jjb/aaf/aaf-inno.yaml b/jjb/aaf/aaf-inno.yaml
index b1beb646e..a5a900281 100644
--- a/jjb/aaf/aaf-inno.yaml
+++ b/jjb/aaf/aaf-inno.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'aaf/inno'
stream:
- 'master':
@@ -29,4 +25,4 @@
branch: 'master'
mvn-settings: 'aaf-inno-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index 2a89847de..4fc047e89 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -8,11 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- disabled: true
-
project: 'aai/aai-common'
stream:
- 'master':
diff --git a/jjb/aai/aai-champ.yaml b/jjb/aai/aai-champ.yaml
index ba37c2433..0c1c2e5df 100644
--- a/jjb/aai/aai-champ.yaml
+++ b/jjb/aai/aai-champ.yaml
@@ -12,11 +12,6 @@
mvn-goals: 'docker:build'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- disabled: true
-
project: 'aai/champ'
stream:
- 'master':
diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml
index 14bffbc8a..5c6aac42b 100644
--- a/jjb/aai/aai-resources.yaml
+++ b/jjb/aai/aai-resources.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- disabled: true
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'aai-resources/pom.xml'
mvn-profile: 'docker'
diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml
index 21abd7f38..a0c15cb21 100644
--- a/jjb/aai/aai-traversal.yaml
+++ b/jjb/aai/aai-traversal.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily':
disabled: true
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- disabled: true
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'aai-traversal/pom.xml'
mvn-profile: 'docker'
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml
index 0ab3d0eef..ca3b36ff2 100644
--- a/jjb/cli/cli.yaml
+++ b/jjb/cli/cli.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- '{project-name}-{stream}-aai-docker-java-daily':
pom: 'deployment/docker/pom.xml'
mvn-goals: 'docker:build'
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index d06314e16..53e1922da 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install docker:build'
- '{project-name}-{stream}-docker-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 6fdbf3e98..1ad6daf44 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'dmaap/datarouter'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml
index 6dd4c0ed2..06f6b81f6 100644
--- a/jjb/dmaap/dmaap-dbcapi.yaml
+++ b/jjb/dmaap/dmaap-dbcapi.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'dmaap/dbcapi'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index c04e04834..c9ddf7b34 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'dmaap/messagerouter/dmaapclient'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index 3d9274143..3270204c6 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'dmaap/messagerouter/messageservice'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
index c6862ed8a..6b0c1024e 100644
--- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'dmaap/messagerouter/mirroragent'
stream:
- 'master':
diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
index 05bad888d..8de95da18 100644
--- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
- mvn-goals: 'clean install'
project: 'dmaap/messagerouter/msgrtr'
stream:
- 'master':
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 6ccc2b491..3c662957b 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -2067,85 +2067,6 @@
maven-version: '{maven-version}'
- job-template:
- # Template for maven site plugin invocation
- #
- # It's designed to be triggered when the trigger-job job
- # succeeds as there's no need for new documentaiton
- # if the build job fails.
- #
- # The purpose of this job template is to run:
- # 1. maven set versions
- # 2. maven clean site
- #
- # Those parameters should be set :
- # - site-pom : the pom file that contains the site confiration
- # - trigger-job : the name of the project that triggers this job
- # upon success. The job name can be
- # parameterized.
-
- name: '{project-name}-{stream}-stage-site-java'
- project-type: freestyle
- node: '{build-node}'
- pom: 'pom.xml'
-
- properties:
- - infra-properties:
- build-days-to-keep: '{build-days-to-keep}'
-
- parameters:
- - infra-parameters:
- project: '{project}'
- branch: '{branch}'
- refspec: 'refs/heads/{branch}'
- artifacts: '{archive-artifacts}'
- - maven-exec:
- maven-version: '{maven-version}'
-
- scm:
- - gerrit-trigger-scm:
- refspec: ''
- choosing-strategy: 'default'
- submodule-recursive: '{submodule-recursive}'
-
- wrappers:
- - infra-wrappers:
- build-timeout: '{build-timeout}'
-
- triggers:
- - trigger-on-build-success:
- job-name: '{trigger-job}'
-
- builders:
- - provide-maven-settings:
- global-settings-file: 'global-settings'
- settings-file: '{mvn-settings}'
- - inject:
- properties-file: version.properties
- - maven-target:
- maven-version: '{maven-version}'
- pom: '{pom}'
- goals: 'versions:set versions:update-child-modules versions:commit -B'
- properties:
- - 'newVersion=${{release_version}}'
- settings: '{mvn-settings}'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
-
- - maven-target:
- maven-version: '{maven-version}'
- pom: '{site-pom}'
- goals: 'clean site:site site:stage-deploy -B'
- settings: '{mvn-settings}'
- settings-type: cfp
- global-settings: 'global-settings'
- global-settings-type: cfp
-
- publishers:
- - infra-shiplogs:
- maven-version: '{maven-version}'
-
-- job-template:
# Job template for Java merge jobs for SDC specific repos
#
# The purpose of this job template is to run:
diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml
index 9aa99507e..aa26fbcc6 100644
--- a/jjb/logging-analytics/logging-analytics.yaml
+++ b/jjb/logging-analytics/logging-analytics.yaml
@@ -10,10 +10,6 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
project: 'logging-analytics'
stream:
- 'master':
diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml
index 81021daf0..6a52bd605 100644
--- a/jjb/msb/msb-swagger-sdk.yaml
+++ b/jjb/msb/msb-swagger-sdk.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
-
project: 'msb/swagger-sdk'
stream:
- 'master':
diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index 92eb99b40..780d5224c 100644
--- a/jjb/music/music.yaml
+++ b/jjb/music/music.yaml
@@ -10,11 +10,6 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: docker
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- build-node: 'ubuntu1604-basebuild-8c-8g'
-
project: 'music'
stream:
- 'master':
diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml
index c5660d4f4..2d6d9365c 100644
--- a/jjb/portal-sdk/portal-sdk.yaml
+++ b/jjb/portal-sdk/portal-sdk.yaml
@@ -14,11 +14,6 @@
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
- '{project-name}-{stream}-{subproject}-release-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- pom: 'ecomp-sdk/pom.xml'
- site-pom: 'ecomp-sdk/pom.xml'
- trigger-job: '{project-name}-{stream}-{subproject-name}-release-java-daily'
-
project: 'portal/sdk'
stream:
- 'master':
diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml
index 25cee2a94..5f244f6ed 100644
--- a/jjb/portal/portal.yaml
+++ b/jjb/portal/portal.yaml
@@ -5,9 +5,6 @@
jobs:
- gerrit-maven-clm:
- '{project-name}-{stream}-release-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-java-daily'
project: 'portal'
stream:
- 'master':
@@ -30,4 +27,4 @@
branch: 'master'
mvn-settings: 'portal-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml
index 306d07290..c9dd15c6e 100644
--- a/jjb/sdc/sdc-jtosca.yaml
+++ b/jjb/sdc/sdc-jtosca.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
project: 'sdc/jtosca'
stream:
- 'master':
@@ -30,4 +27,4 @@
branch: 'master'
mvn-settings: 'sdc-jtosca-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml
index 71d7d0ab0..e685eab2e 100644
--- a/jjb/sdc/sdc-sdc-distribution-client.yaml
+++ b/jjb/sdc/sdc-sdc-distribution-client.yaml
@@ -8,9 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
project: 'sdc/sdc-distribution-client'
stream:
- 'master':
@@ -30,4 +27,4 @@
branch: 'master'
mvn-settings: 'sdc-sdc-distribution-client-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
index a10fcc9ea..d0aac73d5 100644
--- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml
+++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
project: 'sdc/sdc-titan-cassandra'
stream:
- 'master':
diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml
index bb44f833d..1bf90bdfe 100644
--- a/jjb/sdc/sdc-sdc-tosca.yaml
+++ b/jjb/sdc/sdc-sdc-tosca.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-merge-java'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
project: 'sdc/sdc-tosca'
stream:
- 'master':
@@ -31,4 +27,4 @@
branch: 'master'
mvn-settings: 'sdc-sdc-tosca-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml
index f02fa73c3..6d6f3a29e 100644
--- a/jjb/sdc/sdc-sdc-workflow-designer.yaml
+++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
- '{project-name}-{stream}-docker-java-daily'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
-
project: 'sdc/sdc-workflow-designer'
stream:
- 'master':
@@ -33,4 +29,4 @@
branch: 'master'
mvn-settings: 'sdc-sdc-workflow-designer-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml
index 9b5501f43..bc99a175e 100644
--- a/jjb/sdc/sdc.yaml
+++ b/jjb/sdc/sdc.yaml
@@ -12,9 +12,6 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-docker-version-java-daily'
- gerrit-maven-clm
project: 'sdc'
stream:
diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml
index 079a5c1f6..719b424d3 100644
--- a/jjb/so/so-libs.yaml
+++ b/jjb/so/so-libs.yaml
@@ -7,10 +7,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
-
project: 'so/libs'
stream:
- 'master':
@@ -34,4 +30,4 @@
branch: 'master'
mvn-settings: 'so-libs-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml
index d197c9199..213ffdebf 100644
--- a/jjb/so/so.yaml
+++ b/jjb/so/so.yaml
@@ -19,11 +19,6 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- build-node: 'ubuntu1604-basebuild-8c-8g'
-
project: 'so'
stream:
- 'master':
diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml
index 01104c257..1438b3d98 100644
--- a/jjb/ui/ui-dmaapbc.yaml
+++ b/jjb/ui/ui-dmaapbc.yaml
@@ -8,10 +8,6 @@
- '{project-name}-{stream}-verify-java'
- '{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'
-
project: 'ui/dmaapbc'
stream:
- 'master':
@@ -33,4 +29,4 @@
branch: 'master'
mvn-settings: 'ui-dmaapbc-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml
index bbf558cb7..4dc5285dc 100644
--- a/jjb/vid/vid.yaml
+++ b/jjb/vid/vid.yaml
@@ -10,11 +10,6 @@
- '{project-name}-{stream}-docker-version-java-daily':
docker-pom: 'pom.xml'
mvn-profile: 'docker'
- - '{project-name}-{stream}-stage-site-java':
- site-pom: 'pom.xml'
- trigger-job: '{project-name}-{stream}-release-version-java-daily'
- build-node: 'ubuntu1604-basebuild-8c-8g'
-
project: 'vid'
stream:
- 'master':
@@ -34,4 +29,4 @@
branch: 'master'
mvn-settings: 'vid-settings'
mvn-goals: 'clean install'
- mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' \ No newline at end of file
+ mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'