diff options
| -rw-r--r-- | jjb/appc/appc-master.yaml | 1 | ||||
| -rw-r--r-- | jjb/ccsdk/parent.yaml | 12 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-analytics.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-collectors.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform-cli.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-platform.yaml | 2 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-buscontroller.yaml | 4 | ||||
| -rw-r--r-- | jjb/dmaap/dmaap-dbcapi.yaml | 4 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 27 | ||||
| -rw-r--r-- | jjb/portal-sdk/portal-sdk.yaml | 2 |
11 files changed, 24 insertions, 36 deletions
diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index 35cd86c04..2b14835c1 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -7,6 +7,7 @@ java-version: '' mvn-params: '-DskipTests' build-timeout: 30 + build-node: ubuntu1604-basebuild-8c-8g - '{project-name}-{stream}-verify-java': build-node: ubuntu1604-basebuild-8c-8g - '{project-name}-{stream}-merge-java': diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 1f76950ab..ac8024c1c 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -23,15 +23,3 @@ deployAtEnd=true files: '**' archive-artifacts: '' -- project: - name: ccsdk-parent-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'ccsdk/parent' - project-name: 'ccsdk-parent' - branch: 'master' - mvn-settings: 'ccsdk-parent-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 5049193c1..0f68fcf38 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-analytics-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index add42386a..35a5ec723 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-snmptrap-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml index 0a55b032e..d802d2be2 100644 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-collectors-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform-cli.yaml b/jjb/dcaegen2/dcaegen2-platform-cli.yaml index e7e824124..00cfdddc5 100644 --- a/jjb/dcaegen2/dcaegen2-platform-cli.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-cli.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-cli-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index cb7fd466f..314219685 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'dcaegen2-platform-settings' # due to a strange macro / variable translation problem this needs # to be passed as a string block to properly get the properties diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 9cb73cf2d..08a55e0c0 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' @@ -32,4 +30,4 @@ branch: 'master' mvn-settings: 'dmaap-buscontroller-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/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index b0c7b0b4d..0f644c605 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'release-1.0.0': - branch: 'release-1.0.0' mvn-settings: 'dmaap-dbcapi-settings' files: '**' archive-artifacts: '' @@ -32,4 +30,4 @@ branch: 'master' mvn-settings: 'dmaap-dbcapi-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/global-templates-java.yaml b/jjb/global-templates-java.yaml index 0c82e70c2..6ccc2b491 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -327,6 +327,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -398,6 +399,7 @@ name: '{project-name}-{stream}-release-java-daily-checkstyle' project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -473,6 +475,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -551,6 +554,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -632,6 +636,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -704,6 +709,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -1108,7 +1114,7 @@ name: '{project-name}-{stream}-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1177,6 +1183,7 @@ name: '{project-name}-{stream}-docker-java-properties-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1249,7 +1256,7 @@ name: '{project-name}-{stream}-docker-java-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1318,7 +1325,7 @@ name: '{project-name}-{stream}-docker-java-version-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1402,7 +1409,7 @@ name: '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1487,7 +1494,7 @@ name: '{project-name}-{stream}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1568,7 +1575,7 @@ name: '{project-name}-{stream}-{subproject}-docker-version-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1650,7 +1657,7 @@ project-type: freestyle node: 'ubuntu1604-docker-8c-8g' docker-image-name: '' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' @@ -1738,6 +1745,7 @@ name: '{project-name}-{stream}-{subproject}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + disabled: false docker-image-name: '' properties: @@ -1829,6 +1837,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -1910,6 +1919,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -1994,6 +2004,7 @@ project-type: freestyle node: '{build-node}' + disabled: false maven-deploy-properties: properties: - infra-properties: @@ -2211,7 +2222,7 @@ name: '{project-name}-{stream}-aai-docker-java-version-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' - + disabled: false properties: - infra-properties: build-days-to-keep: '{build-days-to-keep}' diff --git a/jjb/portal-sdk/portal-sdk.yaml b/jjb/portal-sdk/portal-sdk.yaml index c5e7cb8d5..0fc475cde 100644 --- a/jjb/portal-sdk/portal-sdk.yaml +++ b/jjb/portal-sdk/portal-sdk.yaml @@ -27,6 +27,8 @@ branch: 'release-1.3.1' - 'release-1.3.2': branch: 'release-1.3.2' + - 'release-2.1.0': + branch: 'release-2.1.0' mvn-settings: 'portal-sdk-settings' files: '**' archive-artifacts: '' |