JJB cleanup tasks

[releng/builder.git] / jjb / ovsdb / ovsdb.yaml

diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml
index 47303e56d7415b59190a0cf9756c2d532a77a225..13250dcd55d07fa00b649038037189557fbe925c 100644 (file)
--- a/jjb/ovsdb/ovsdb.yaml
+++ b/jjb/ovsdb/ovsdb.yaml
@@ -1,6 +1,6 @@
 ---
 - project:
-    name: ovsdb-silicon
+    name: ovsdb-phosphorus
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -12,10 +12,7 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
-    stream: silicon
+    stream: phosphorus
     project: "ovsdb"
     project-name: "ovsdb"
     branch: "master"
@@ -30,7 +27,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-aluminium
+    name: ovsdb-silicon
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -42,13 +39,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
-    stream: aluminium
+    stream: silicon
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/aluminium"
+    branch: "stable/silicon"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
@@ -60,7 +54,7 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-magnesium
+    name: ovsdb-aluminium
     jobs:
       - "{project-name}-distribution-check-{stream}"
       - "{project-name}-maven-javadoc-jobs"
@@ -72,13 +66,10 @@
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs
 
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
-
-    stream: magnesium
+    stream: aluminium
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/magnesium"
+    branch: "stable/aluminium"
     build-node: centos7-builder-2c-8g
     java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
@@ -90,33 +81,23 @@
     staging-profile-id: a68b188166958
 
 - project:
-    name: ovsdb-sodium
+    name: ovsdb-sonar
     jobs:
-      - "{project-name}-distribution-check-{stream}"
-      - "{project-name}-maven-javadoc-jobs"
-      - "{project-name}-rtd-jobs":
-          build-node: centos7-builder-2c-2g
-          project-pattern: ovsdb
-          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/
-          rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be
-      - odl-maven-jobs
-      - odl-maven-verify-jobs
-
-    csit-gate-list: "netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-gate-snat-conntrack-{stream}"
-    block_on_csit: false
+      - gerrit-maven-sonar
 
-    stream: sodium
     project: "ovsdb"
     project-name: "ovsdb"
-    branch: "stable/sodium"
+    branch: "master"
     build-node: centos7-builder-2c-8g
+    build-timeout: 90
+    java-version: "openjdk11"
     mvn-settings: "ovsdb-settings"
+    mvn-goals: "clean deploy javadoc:aggregate"
     mvn-opts: "-Xmx1024m"
-    dependencies: "odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}"
-    email-upstream: "[ovsdb] [odlparent] [controller] [yangtools]"
-
-    # Used by the release job
-    staging-profile-id: a68b188166958
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-api-token: "{sonarcloud_api_token}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
 
 - project:
     name: ovsdb-info