diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/ci-management/ci-management.yaml | 3 | ||||
| -rw-r--r-- | jjb/clamp/clamp.yaml | 2 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml | 22 | ||||
| -rw-r--r-- | jjb/music/music.yaml | 4 | ||||
| -rw-r--r-- | jjb/vid/vid-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/vid/vid.yaml | 4 |
6 files changed, 11 insertions, 26 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index b31cffac3..8b4d6e5bb 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -18,6 +18,9 @@ build-timeout: '60' build-node: 'centos7-builder-2c-1g' jjb-version: 2.9.1 + # configure the gerrit-jjb-verify job + build-node-label-check: true + build-node-label-list: "" - project: name: builder-openstack diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index b14841404..67b3f67f4 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -31,6 +31,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' - 'elalto': branch: 'elalto' mvn-settings: 'clamp-settings' diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index 0ab9b0cff..776eea238 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -5,6 +5,8 @@ project-name: 'dcaegen2-services' jobs: - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java': + mvn-goals: 'clean install' subproject: - 'bbs-event-processor': pom: 'components/bbs-event-processor/pom.xml' @@ -25,26 +27,6 @@ build-node: 'ubuntu1804-docker-8c-8g' - project: - name: dcaegen2-services-bbs-event-processor-merge - project: 'dcaegen2/services' - project-name: 'dcaegen2-services-bbs-event-processor' - jobs: - - gerrit-maven-merge: - mvn-params: '-f components/bbs-event-processor/pom.xml' - mvn-goals: 'clean install -Dmaven.deploy.skip=true' - branch: 'master' - java-version: openjdk11 - mvn-settings: 'dcaegen2-services-settings' - maven-version: 'mvn35' - maven-deploy-properties: | - deployAtEnd=false - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1804-docker-8c-8g' - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - -- project: name: dcaegen2-services-bbs-event-processor-release project: 'dcaegen2/services' project-name: 'dcaegen2-services-bbs-event-processor' diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml index fb7bdd8da..0d152365b 100644 --- a/jjb/music/music.yaml +++ b/jjb/music/music.yaml @@ -27,8 +27,8 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'music-settings' files: '**' archive-artifacts: '' diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index c300a50b2..6f734e5fc 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -9,8 +9,6 @@ stream: - 'master': branch: 'master' - - 'dublin': - branch: 'dublin' functionality: - 'healthCheck': trigger_jobs: '{project-name}-{stream}-docker-version-java-daily' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index a8668dcd9..75da082a1 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -27,8 +27,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'vid-settings' files: '**' archive-artifacts: '' |