Chore: Update global-jjb

[ci-management.git] / jjb / dcaegen2 / dcaegen2-platform-configbinding.yaml

diff --git a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
index 4b161fb..a0e3d32 100644 (file)
--- a/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-configbinding.yaml
@@ -1,17 +1,12 @@
 ---
 - project:
     name: dcaegen2-platform-configbinding
-    project-name: 'dcaegen2-platform-configbinding'
-    jobs:
-      - '{project-name}-{stream}-verify-java'
-      - '{project-name}-{stream}-merge-java'
-      - '{project-name}-{stream}-release-version-java-daily'
-
-    project: 'dcaegen2/platform/configbinding'
-    stream:
-      - 'master':
-          branch: 'master'
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
+    # git repo
+    project: dcaegen2/platform/configbinding
+    # jenkins job prefix
+    project-name: dcaegen2-platform-configbinding
+    # push credentials
+    mvn-settings: dcaegen2-platform-configbinding-settings
     # due to a strange macro / variable translation problem this needs
     # to be passed as a string block to properly get the properties
     # correctly defined in the job
@@ -19,36 +14,53 @@
       deployAtEnd=true
     files: '**'
     archive-artifacts: ''
-    build-node: 'ubuntu1604-docker-8c-8g'
+    build-node: ubuntu1804-docker-8c-8g
+    # used by tox-install.sh to specify the interpreter used to install tox
+    python-version: python3
+    jobs:
+      # clm and tox
+      - '{project-name}-python-jobs'
+      # build docker image
+      - '{project-name}-{stream}-merge-java'
+      - '{project-name}-{stream}-release-version-java-daily'
+      - gerrit-release-verify:
+          build-node: centos7-docker-8c-8g
+      - gerrit-release-merge:
+          build-node: centos7-docker-8c-8g
+    stream:
+      - master:
+          branch: master
+      - guilin:
+          branch: guilin
+      - honolulu:
+          branch: honolulu
 
 - project:
     name: dcaegen2-platform-configbinding-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-tox-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: '{sonarcloud_project_organization}'
+    sonarcloud-api-token: '{sonarcloud_api_token}'
+    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
+    sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: ubuntu1604-builder-4c-4g
+    build-node: ubuntu1804-docker-8c-8g
     project: 'dcaegen2/platform/configbinding'
     project-name: 'dcaegen2-platform-configbinding'
     branch: 'master'
+    # used by tox-install.sh to specify the interpreter used to install tox
+    python-version: python3
     mvn-settings: 'dcaegen2-platform-configbinding-settings'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean test'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- project:
-    name: dcaegen2-platform-configbinding-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    project: dcaegen2/platform/configbinding
-    build-node: ubuntu1604-docker-8c-8g
-    project-name: 'dcaegen2-platform-configbinding'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-configbinding-settings'
 
 - project:
     name: dcaegen2-platform-configbinding-info
+    project: dcaegen2/platform/configbinding
     project-name: dcaegen2-platform-configbinding
+    branch: master
     jobs:
       - gerrit-info-yaml-verify
-    project: dcaegen2/platform/configbinding
-    branch: master
+    build-node: centos7-builder-2c-1g