Revert introducing global-jjb for BBS-ep

Change-Id: I69c1226aafe27de6ce11280a13f671b048def98a
Issue-ID: DCAEGEN2-2105
Signed-off-by: Stavros Kanarakis <stavros.kanarakis@nokia.com>

diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml
index 0ab9b0c..776eea2 100644 (file)
--- 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'
@@ -24,26 +26,6 @@
     archive-artifacts: ''
     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'