Merge "Seperating dependency in usecase suites"

diff --git a/jenkins-config/clouds/openstack/cattle/cloud.cfg b/jenkins-config/clouds/openstack/cattle/cloud.cfg
index 7872de3..2b0ca12 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/cloud.cfg
+++ b/jenkins-config/clouds/openstack/cattle/cloud.cfg
@@ -1,6 +1,6 @@
 # Cloud Configuration
 CLOUD_CREDENTIAL_ID=vexx-ecompci
-CLOUD_URL=https://auth.vexxhost.net/v3/
+CLOUD_URL=https://auth.vexxhost.net/v3
 CLOUD_IGNORE_SSL=false
 CLOUD_ZONE=ca-ymq-1
 

diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index b31cffa..8b4d6e5 100644 (file)
--- 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 b148414..67b3f67 100644 (file)
--- 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 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'

diff --git a/jjb/music/music.yaml b/jjb/music/music.yaml
index fb7bdd8..0d15236 100644 (file)
--- 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 c300a50..6f734e5 100644 (file)
--- 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 a8668dc..75da082 100644 (file)
--- 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: ''