diff options
Diffstat (limited to 'jjb/sdc')
| -rw-r--r-- | jjb/sdc/sdc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-jtosca.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-docker-base.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-titan-cassandra.yaml | 15 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-tosca.yaml | 5 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 11 |
8 files changed, 9 insertions, 41 deletions
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index dfd0905d5..86018ae5d 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,8 +8,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' functionality: - 'sanity': trigger_jobs: diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index 58763225f..306d07290 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -5,20 +5,16 @@ project-name: 'sdc-jtosca' jobs: - gerrit-maven-clm: - java-version: '' - '{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': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' @@ -27,8 +23,8 @@ name: sdc-jtosca-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/jtosca' project-name: 'sdc-jtosca' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 518482ce4..71d7d0ab0 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -5,20 +5,16 @@ project-name: 'sdc-sdc-distribution-client' jobs: - gerrit-maven-clm: - java-version: '' - '{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': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' archive-artifacts: '' @@ -27,8 +23,8 @@ name: sdc-sdc-distribution-client-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-distribution-client' project-name: 'sdc-sdc-distribution-client' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 3c765daeb..6b59c5259 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -11,8 +11,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-titan-cassandra.yaml b/jjb/sdc/sdc-sdc-titan-cassandra.yaml index 74a62ea59..a10fcc9ea 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-titan-cassandra' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -17,21 +16,7 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-sdc-titan-cassandra-settings' files: '**' archive-artifacts: '' build-timeout: 60 -- project: - name: sdc-sdc-titan-cassandra-sonar - jobs: - - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' - project: 'sdc/sdc-titan-cassandra' - project-name: 'sdc-sdc-titan-cassandra' - branch: 'master' - mvn-settings: 'sdc-sdc-titan-cassandra-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 5ed7e82ed..bb44f833d 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -5,7 +5,6 @@ project-name: 'sdc-sdc-tosca' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-merge-java' @@ -17,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' @@ -27,8 +24,8 @@ name: sdc-sdc-tosca-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' branch: 'master' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 8279d4c12..f02fa73c3 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -4,7 +4,6 @@ project-name: 'sdc-sdc-workflow-designer' jobs: - gerrit-maven-clm: - java-version: '' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' @@ -27,8 +26,8 @@ name: sdc-sdc-workflow-designer-sonar jobs: - gerrit-maven-sonar + cron: 'H 11 * * *' build-node: ubuntu1604-basebuild-4c-4g - java-version: '' project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' branch: 'master' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 17e8abfd6..9b5501f43 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -11,16 +11,15 @@ - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-{stream}-docker-version-java-daily': docker-pom: 'pom.xml' - mvn-profile: 'docker,docker-staging' + 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: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' @@ -29,11 +28,11 @@ name: sdc-sonar jobs: - gerrit-maven-sonar - build-node: ubuntu1604-basebuild-4c-4g - java-version: '' + cron: 'H 11 * * *' + build-node: ubuntu1604-basebuild-8c-8g project: 'sdc' project-name: 'sdc' branch: 'master' mvn-settings: 'sdc-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
\ No newline at end of file + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' |