Merge "Auto Update CSIT Jobs to run for sodium"

diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst
index bf63c8de7c2684b7622afabc53f2703afcab2390..89aafe91a7646fc83a88a027cca48d2c252b2792 100644 (file)
--- a/jjb/integration/csit-jobs-fluorine.lst
+++ b/jjb/integration/csit-jobs-fluorine.lst
@@ -5,7 +5,6 @@ bgpcep-csit-1node-throughpcep-all-fluorine,
 bgpcep-csit-1node-userfeatures-all-fluorine,
 bgpcep-csit-3node-bgpclustering-all-fluorine,
 bgpcep-csit-3node-bgpclustering-ha-only-fluorine,
-coe-csit-1node-container-networking-only-fluorine,
 controller-csit-1node-akka1-all-fluorine,
 controller-csit-1node-benchmark-all-fluorine,
 controller-csit-1node-rest-cars-perf-all-fluorine,

diff --git a/jjb/integration/csit-jobs-magnesium.lst b/jjb/integration/csit-jobs-magnesium.lst
index 5f9aeb58697275d9c2db980774877ae943cae879..7fd9148192f0d22fa47b609d2ca8c7c63e01f1c0 100644 (file)
--- a/jjb/integration/csit-jobs-magnesium.lst
+++ b/jjb/integration/csit-jobs-magnesium.lst
@@ -5,7 +5,6 @@ bgpcep-csit-1node-throughpcep-all-magnesium,
 bgpcep-csit-1node-userfeatures-all-magnesium,
 bgpcep-csit-3node-bgpclustering-all-magnesium,
 bgpcep-csit-3node-bgpclustering-ha-only-magnesium,
-coe-csit-1node-container-networking-only-magnesium,
 controller-csit-1node-akka1-all-magnesium,
 controller-csit-1node-benchmark-all-magnesium,
 controller-csit-1node-rest-cars-perf-all-magnesium,

diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml
index adb4b96e6ab86854b66057dbc5a41e92698b4b41..b588b68930810605450dfaf11b218c5bb2850836 100644 (file)
--- a/jjb/mdsal/mdsal.yaml
+++ b/jjb/mdsal/mdsal.yaml
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-master
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - 'gerrit-release-merge'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: mdsal

diff --git a/jjb/netvirt/netvirt-apex-images.yaml b/jjb/netvirt/netvirt-apex-images.yaml
index bb3dfe795e6452bd32960699fe6f75711a7dd556..4b9ebd50e416f43030eb48bd75b5641458873873 100644 (file)
--- a/jjb/netvirt/netvirt-apex-images.yaml
+++ b/jjb/netvirt/netvirt-apex-images.yaml
@@ -6,10 +6,14 @@
 
     project: 'netvirt'
     os-cloud: vex
+    disable-job: true
 
 - job-template:
     name: 'netvirt-apex-image-management'
+    disable-job: false
+
     node: 'centos7-apex-2c-2g'
+    disabled: '{disable-job}'
 
     parameters:
       - string:

diff --git a/jjb/netvirt/netvirt-csit-multi-apex.yaml b/jjb/netvirt/netvirt-csit-multi-apex.yaml
index afb5ed8f714614fa062157a71a908a0bbec42020..e9f579d28ad4d4f7ca19de57c73aec78432e0b08 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-apex.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-apex.yaml
@@ -4,6 +4,8 @@
     jobs:
       - inttest-csit-apex-custom
 
+    disable-job: true
+
     project: 'netvirt'
     stream:
       - magnesium:

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index d496f2bc21f1db189d25a84cc633f4cb5bbaf9d3..42d29a30340462645a6f2f1275b5af62a646b6a5 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -2,7 +2,7 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - 'gerrit-release-merge'
       - '{project-name}-rtd-jobs':
           build-node: centos7-builder-2c-2g
           project-pattern: odlparent

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index ac30afb8a33dfb7342dfc6681e8b50ac984c6896..bffa04905acb1f91e133d20b2947e10034bae149 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -14,6 +14,7 @@
           sign-artifacts: true
           mvn-central: true
           ossrh-profile-id: 6386ebbbf3a563
+          cron: ''
 
     java-version: openjdk11
     mvn-version: mvn35
@@ -42,6 +43,7 @@
           sign-artifacts: true
           mvn-central: true
           ossrh-profile-id: 6386ebbbf3a563
+          cron: ''
 
     java-version: openjdk8
     mvn-version: mvn35

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index afa40b3e76bb5068cd377431c313865fbab6f3ae..02359c7ac27400c5f01b3ad356393d4616c9755c 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -2,7 +2,7 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-gerrit-release-jobs'
+      - 'gerrit-release-merge'
       - odl-maven-jobs-jdk11
       - odl-maven-verify-jobs:
           java-version: