diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/sdc/sdc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-jtosca.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 3 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-docker-base.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-titan-cassandra.yaml | 14 | ||||
| -rw-r--r-- | jjb/sdc/sdc-sdc-tosca.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 9 |
7 files changed, 4 insertions, 31 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 fe20f0f01..306d07290 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -11,13 +11,10 @@ - '{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: '' diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 3a920e424..71d7d0ab0 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -11,13 +11,10 @@ - '{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: '' 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 87260937a..a10fcc9ea 100644 --- a/jjb/sdc/sdc-sdc-titan-cassandra.yaml +++ b/jjb/sdc/sdc-sdc-titan-cassandra.yaml @@ -16,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 - cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g - 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 d401a9fe8..bb44f833d 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,8 +16,6 @@ stream: - 'master': branch: 'master' - - 'amsterdam': - branch: 'amsterdam' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 10b39b247..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: '' @@ -30,10 +29,10 @@ jobs: - gerrit-maven-sonar cron: 'H 11 * * *' - build-node: ubuntu1604-basebuild-4c-4g + 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' |