diff options
author | 2018-11-15 16:03:44 +0000 | |
---|---|---|
committer | 2018-11-15 16:03:44 +0000 | |
commit | 78dc6b05c60cc7c10d259d0ecd32e072c2a297fa (patch) | |
tree | 31c108e7d75dc30366f11f14552ed56e9f766d5a | |
parent | 228e9aefbe1edd7a3cba9a86a2c84e74415a5b45 (diff) | |
parent | 59c50ec80ac11f7ac630820541ee100449295a3a (diff) |
Merge "Update SDC JJB"
-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-docker-base.yaml | 2 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-tosca.yaml | 7 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-workflow-designer.yaml | 6 | ||||
-rw-r--r-- | jjb/sdc/sdc.yaml | 6 |
6 files changed, 21 insertions, 8 deletions
diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index c5d7261ff..33923c07f 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -8,6 +8,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' functionality: - 'sanity': trigger_jobs: '{project-name}-{stream}-sdc-merge-java' diff --git a/jjb/sdc/sdc-jtosca.yaml b/jjb/sdc/sdc-jtosca.yaml index f3bf7eb51..07409c84a 100644 --- a/jjb/sdc/sdc-jtosca.yaml +++ b/jjb/sdc/sdc-jtosca.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' files: '**' archive-artifacts: '' @@ -30,7 +32,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/jtosca' project-name: 'sdc-jtosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -42,5 +44,5 @@ - gerrit-maven-clm project: sdc/jtosca project-name: 'sdc-jtosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-jtosca-settings' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index c03e353a9..41a04440a 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -11,6 +11,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 044468bb0..c45bd4fd1 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -16,6 +16,9 @@ stream: - 'master': branch: 'master' + stream: + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' @@ -30,7 +33,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-tosca' project-name: 'sdc-sdc-tosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -42,5 +45,5 @@ - gerrit-maven-clm project: sdc/sdc-tosca project-name: 'sdc-sdc-tosca' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-tosca-settings' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 66b78399a..7da28b846 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -18,6 +18,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' @@ -34,7 +36,7 @@ build-node: ubuntu1604-builder-4c-4g project: 'sdc/sdc-workflow-designer' project-name: 'sdc-sdc-workflow-designer' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch}' mvn-goals: 'clean install' @@ -47,5 +49,5 @@ project: sdc/sdc-workflow-designer project-name: 'sdc-sdc-workflow-designer' build-node: ubuntu1604-builder-4c-4g - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-sdc-workflow-designer-settings' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 46bde2d48..b0e566bce 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -43,6 +43,8 @@ stream: - 'master': branch: 'master' + - 'casablanca': + branch: 'casablanca' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' @@ -57,7 +59,7 @@ build-node: ubuntu1604-builder-8c-8g project: 'sdc' project-name: 'sdc' - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-settings' mvn-params: '-Djacoco.skip=false -Dsonar.branch={branch} -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' mvn-goals: 'clean install' @@ -73,5 +75,5 @@ project: sdc project-name: 'sdc' build-node: ubuntu1604-docker-8c-8g - branch: 'master' + branch: 'casablanca' mvn-settings: 'sdc-settings' |