Merge "Update JJB version 2.0.5"

diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst
index fccbc7851828f87cadee341c27c42777de872a54..777c983e0339fb839b4815aaee4b75d361d1cc2e 100644 (file)
--- a/docs/cloud-images.rst
+++ b/docs/cloud-images.rst
@@ -10,6 +10,7 @@ Following are the list of published images available to be used with Jenkins job
 * ZZCI - CentOS 7 - docker - 20171209-0317
 * ZZCI - CentOS 7 - docker - 20180109-0346
 * ZZCI - CentOS 7 - docker - 20180110-1659
+* ZZCI - CentOS 7 - docker - 20180417-0311
 * ZZCI - CentOS 7 - java-builder - 20171206-1842
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
 * ZZCI - CentOS 7 - robot - 20171207-1911

diff --git a/docs/jenkins.rst b/docs/jenkins.rst
index 6cb6585836fda784667c9043e242171356972763..8ada1c7e66b924e09cfde88c297c87c99155458a 100644 (file)
--- a/docs/jenkins.rst
+++ b/docs/jenkins.rst
@@ -204,50 +204,38 @@ accounts in the cloud so should ensure consistent performance.
      - CPUs
      - Memory
 
-   * - v2-standard-1
+   * - odl-standard-1
      - 1
      - 4
 
-   * - v2-standard-2
+   * - odl-standard-2
      - 2
      - 8
 
-   * - v2-standard-4
+   * - odl-standard-4
      - 4
      - 16
 
-   * - v2-standard-8
+   * - odl-standard-8
      - 8
      - 32
 
-   * - v2-standard-16
+   * - odl-standard-16
      - 16
      - 64
 
-   * - v2-highcpu-1
-     - 1
-     - 1
-
-   * - v2-highcpu-2
+   * - odl-highcpu-2
      - 2
      - 2
 
-   * - v2-highcpu-4
+   * - odl-highcpu-4
      - 4
      - 4
 
-   * - v2-highcpu-8
+   * - odl-highcpu-8
      - 8
      - 8
 
-   * - v2-highcpu-16
-     - 16
-     - 16
-
-   * - v2-highcpu-32
-     - 32
-     - 32
-
 Pool: ODLVEX
 ^^^^^^^^^^^^
 

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
index a1ba643e44554e1b43251eec7e7f6513aa52db48..bbec5364d5c76f57ce61c6b600925f510d183b2a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
@@ -1,3 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - autorelease - 20180125-2240
 VOLUME_SIZE=150
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
index 4cedaefb08a218f6b0c047d80980aacc66b6b7b4..e7d1fa489b4e65152b193860e1a31f5875f3eef4 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
index 7be9c8b1e54673b124faf2cc3479df983134efd2..4d2f3cfd86bfcb12eda8e4551fb526ccafed510a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-standard-2
+HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
index 94468159cda13b2571b9737d74c4a46bb008267b..1c1936b1b0dc9e16277a7e7ba8c3ed9c8afe6f7d 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=odl-standard-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
index 637bea8b6cd0752050b4b4c948bb5fcc37309809..d7466e50d919ee5e0150372666b89685a7a5e37a 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=odl-highcpu-4

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
index 9288347093b833bbbef5c6e39dfdeec3d6e0839a..385fdff34ec86291ea44abbea0352ddfa0ece3e6 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180201-2139
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=odl-highcpu-8

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
index 28780b293170d7204719e789408709f73b681cff..3f3b64e55174656165126003a5b2302f1295a503 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311
-HARDWARE_ID=v2-standard-1
+HARDWARE_ID=odl-standard-1

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
index 3458aa3505be1272e76cfb520606ef6c62a71a44..459f6c593ceaa5c9d0642537a5a518c3492e68ce 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
index facf6119641466c010e049311800b7bb477a4b91..cbe2b2f6926500eaf40b89e3ab0217cbf63567aa 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311
-HARDWARE_ID=v2-standard-2
+HARDWARE_ID=odl-standard-2

diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
index d695ad5832d4f005f7c230faf0a032e51d2bcfca..081ffad4dc7562d22aedff300f9b4f07335df8c3 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
@@ -1,3 +1,3 @@
 IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
-HARDWARE_ID=v2-standard-2
+HARDWARE_ID=odl-standard-2
 INSTANCE_CAP=25

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
new file mode 100644 (file)
index 0000000..d58f8cc
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg
@@ -0,0 +1,3 @@
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+HARDWARE_ID=v1-standard-1
+INSTANCE_CAP=1

diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
new file mode 100644 (file)
index 0000000..2e79f1f
--- /dev/null
+++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg
@@ -0,0 +1,4 @@
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+HARDWARE_ID=v1-standard-1
+INSTANCE_CAP=1
+NUM_EXECUTORS=4

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
index d1cd1c931a5b58a242a28e679247af42352c1950..3ca18447cce60ce5b133cfbfed0b6ae564f540fe 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180220-2018
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=odl-highcpu-2

diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
index 2747b97b62631ae077fd76e93084971cfa246e76..bc1e0eed4ee7e92609b54d671a58bcd3a2c55cdd 100644 (file)
--- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
+++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
-HARDWARE_ID=v2-standard-1
+HARDWARE_ID=odl-standard-1

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index a143a0f7e33f58792bc6ea3eadd1c988cd6ebd70..1be27c06ebfe72f9a740d469ad7afc5bdbb11831 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -31,7 +31,7 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v2-highcpu-2'
+    tools_system_flavor: 'odl-highcpu-2'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20180417-0311'
 
     # Robot custom options

diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml
index 7145b02a77e0af38d9467663adfc09530d55f4a8..d5e6adb457b4ece90b42726601b3844f1f0fd3ab 100644 (file)
--- a/jjb/alto/alto.yaml
+++ b/jjb/alto/alto.yaml
@@ -2,7 +2,6 @@
 - project:
     name: alto-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml
index 34f659786950be9a352c7f7c00796d6067c90cb6..56db31b84f5155f3c8f42b6400153ed0a3a800ef 100644 (file)
--- a/jjb/atrium/atrium.yaml
+++ b/jjb/atrium/atrium.yaml
@@ -2,7 +2,6 @@
 - project:
     name: atrium-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml
index 80a133bfdaf4b26de94467f1410f01351940175f..2c6fd2d0d400dea261c2fdfe584b2bce799f38cb 100644 (file)
--- a/jjb/autorelease/autorelease-projects.yaml
+++ b/jjb/autorelease/autorelease-projects.yaml
@@ -21,6 +21,8 @@
           integration-test: fluorine
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - oxygen:
+          # Run once a week (Sunday) until Nitrogen-SR3 is out.
+          cron: 'H 12 * * 6'
           next-release-tag: '{stream}'
           branch: 'stable/oxygen'
           integration-test: oxygen
@@ -31,6 +33,8 @@
           integration-test: nitrogen
           extra-mvn-opts: -P!karaf -Dsft.heap.max=4g
       - carbon:
+          # Run once a week (Saturday) now that Fluorine branch is cut, and Oxygen is pending release
+          cron: 'H 12 * * 6'
           next-release-tag: '{stream}'
           branch: 'stable/carbon'
           integration-test: carbon

diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml
index e0733cb4fb04e2fd83e0659605818896cf54d48e..4c65c5b8078124993d33feb693119add6dd5f9e2 100644 (file)
--- a/jjb/autorelease/autorelease-templates.yaml
+++ b/jjb/autorelease/autorelease-templates.yaml
@@ -61,7 +61,7 @@
     build-node: '{build-node}'
     cron: 'H 0 * * *'
     java-version: openjdk8
-    mvn-version: mvn33
+    mvn-version: mvn35
     extra-mvn-opts: ''
 
     #####################
@@ -78,7 +78,7 @@
 
     parameters:
       - maven-exec:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
@@ -146,7 +146,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: |
               clean deploy
@@ -165,7 +165,7 @@
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: 'autorelease-settings'
           global-settings: 'global-settings'
       - autorelease-maven-sources-post-process
@@ -318,7 +318,7 @@
               and artifacts are not pushed to Nexus. Instead the build will be
               performed using the goals "clean install".
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - lf-infra-gerrit-scm:
@@ -337,7 +337,7 @@
     builders:
       # force jenkins install of maven version before any shell scripts use it
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           goals: '-version'
           settings: autorelease-settings
           settings-type: cfp
@@ -488,7 +488,7 @@
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: validate-pom.xml
           goals: |
               clean install dependency:tree
@@ -504,7 +504,7 @@
       # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
       - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom || true
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: pom.xml
           goals: |
               clean validate

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
index 763c5b6bf8fb0d69cda52ee965faf3a4e2f61292..14ec6d49e14ad5b599d30cd84fe91e0ab17922dd 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
@@ -46,7 +46,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
index e2a60ac03a6d9ae3133d3d3917869c97c9656321..99d71ebfcf0e9aec5666f050d973959c37a97b6a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
@@ -47,7 +47,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v2-standard-2
+    odl_system_flavor: odl-standard-2
 
     # Plot Info
     01-plot-title: 'Number of generated updates'

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index 06751ca0f975d89454b28d65671a0b968b2cbc7a..76f18bf9e809ab74fa25784a6741539742885b52 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -47,5 +47,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 60903eb61c277ad3e1edd55404ce69eb10eea2d5..1c2d76d71d900432331eeaa4bc53620586c3ce0b 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -36,4 +36,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: 'v2-standard-4'
+    odl_system_flavor: 'odl-standard-4'

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
index 3e7b71c86543a75a2ab1ea13255863688cdae82e..904d097ed2efca47920ed018f087fdbb8bbe7a41 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
@@ -40,4 +40,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 62d90dfef4b1e934c1ec0c68276758b6749d2404..f2e183547dec69e66d29d0ce86c70305148c7134 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -41,4 +41,4 @@
         -v UPDATER_TIMEOUT:900
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4

diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml
index be616372906f491d0757c9a633a76375bd335769..b0c17783ee8beb3a39bfbc8abb8302585ebdc60c 100644 (file)
--- a/jjb/bier/bier.yaml
+++ b/jjb/bier/bier.yaml
@@ -2,7 +2,6 @@
 - project:
     name: bier-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml
index 6836282e64f10e698886b6d41afc4c0e6d026093..d01c735b1f26a78c8ada9fac04cf78ef44339e95 100644 (file)
--- a/jjb/capwap/capwap.yaml
+++ b/jjb/capwap/capwap.yaml
@@ -2,7 +2,6 @@
 - project:
     name: capwap-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml
index 58b826da050149798b5c0e730eb79d0b677af324..3db33a8229583bff49d0630952d8ba5ba6f4c933 100644 (file)
--- a/jjb/cardinal/cardinal.yaml
+++ b/jjb/cardinal/cardinal.yaml
@@ -2,7 +2,6 @@
 - project:
     name: cardinal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml
index e65f791a3eb1d9e12868a61d44b1b33d9d4cb3c3..71d0b5cedeaf6b1e9e3b307c04c7aaa79a274e88 100644 (file)
--- a/jjb/centinel/centinel.yaml
+++ b/jjb/centinel/centinel.yaml
@@ -2,7 +2,6 @@
 - project:
     name: centinel-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 2e1f2a9433d4fd0dc81c4721ce8c1cdb0a874428..41169c5ac3635068703a31d0e923a82dff67ea3a 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml
@@ -36,7 +36,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: 'v2-standard-4'
+    odl_system_flavor: 'odl-standard-4'
 
     build-timeout: '480'
 

diff --git a/jjb/controller/controller-csit-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml
index f9a359f2e5e2af3057c362e1518f0df0304017e3..344ebb88f777fe7e39866ccf1c8271b463f55db5 100644 (file)
--- a/jjb/controller/controller-csit-dsbenchmark.yaml
+++ b/jjb/controller/controller-csit-dsbenchmark.yaml
@@ -37,7 +37,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 
     # Plot Info
     01-plot-title: 'Performance by structure'

diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml
index a9a6be7d4cd18ec1e3d51a77985950bf72262836..fae22b5b67ac90e9f48d8301e5b2b82ef8d0df97 100644 (file)
--- a/jjb/didm/didm.yaml
+++ b/jjb/didm/didm.yaml
@@ -2,7 +2,6 @@
 - project:
     name: didm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml
index 7f52f5c62ded93e2a260ba0bbceac5b16fac01a9..6356d44132fec9b28287e2a1be2b39637236ba25 100644 (file)
--- a/jjb/dlux/dlux.yaml
+++ b/jjb/dlux/dlux.yaml
@@ -2,7 +2,6 @@
 - project:
     name: dlux-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml
index 6cd7760b2a784e073628a3ec7068277f68481fd8..a31fdfa213721024ce2cc43d03b08f16270ca407 100644 (file)
--- a/jjb/dluxapps/dluxapps.yaml
+++ b/jjb/dluxapps/dluxapps.yaml
@@ -2,7 +2,6 @@
 - project:
     name: dluxapps-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'

diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml
index 36e06e98ad88be0388b7bfd66e3b5043e494c97f..c5fd3112e2a946f25f213719f128851d1539a8ec 100644 (file)
--- a/jjb/eman/eman.yaml
+++ b/jjb/eman/eman.yaml
@@ -2,7 +2,6 @@
 - project:
     name: eman-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 08ec7ea29fa2deb04957c8b2272d80a3d2edc53c..c01098b30185d68bd511cd74c01c014f0876592d 100644 (file)
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -2,7 +2,6 @@
 - project:
     name: faas-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml
index 428f14b0d8db0f3960b17528d05536d68d039aa3..a0ded3310c10d20536a0b33d6cd4eff34cfddb64 100644 (file)
--- a/jjb/federation/federation.yaml
+++ b/jjb/federation/federation.yaml
@@ -2,7 +2,6 @@
 - project:
     name: federation-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml
index 77d08b0d780fd61331505cb8d219410daf6242b9..33e6dbbd101ba30a24fe48df98e76601f423d0d4 100644 (file)
--- a/jjb/genius/genius-csit-genius.yaml
+++ b/jjb/genius/genius-csit-genius.yaml
@@ -1,58 +1,45 @@
 ---
 - project:
-    name: genius-csit-genius-oxygen
+    name: genius-csit-genius-oxygen-fluorine
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
-          schedule: ''
 
-    # Project branches
     stream:
       - fluorine:
           branch: 'master'
       - oxygen:
           branch: 'stable/oxygen'
+
     install:
       - all:
           scope: 'all'
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
-    # Features to install
     install-features: 'odl-genius-rest'
 
-    # Robot custom options
-    robot-options: ' '
 
 - project:
-    name: genius-csit-genius-{stream}
+    name: genius-csit-genius-carbon-nitrogen
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
 
-    # The project name
     project: 'genius'
 
-    # The functionality under test
     functionality:
       - 'upstream'
       - 'gate'
 
-    # Project branches
     stream:
       - nitrogen:
           branch: 'stable/nitrogen'
@@ -60,6 +47,29 @@
           branch: 'stable/carbon'
           karaf-version: karaf3
 
+    install:
+      - all:
+          scope: 'all'
+
+    tools_system_count: 3
+
+    install-features: 'odl-genius-rest'
+
+
+- project:
+    name: genius-csit-genius-verify
+    jobs:
+      - inttest-csit-verify-1node
+      - inttest-csit-verify-3node
+
+    project: 'genius'
+
+    functionality: 'verify'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+
     verify-stream: 'oxygen'
     verify-branch: 'stable/oxygen'
     verify-karaf-version: 'karaf4'
@@ -68,12 +78,6 @@
       - all:
           scope: 'all'
 
-    # Mininet configuration
     tools_system_count: 3
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
-    # Features to install
     install-features: 'odl-genius-rest'
-
-    # Robot custom options
-    robot-options: ' '

diff --git a/jjb/global-jjb b/jjb/global-jjb
index 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7..536325e5186cf8883d630feaea2d91591b39fd50 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7
+Subproject commit 536325e5186cf8883d630feaea2d91591b39fd50

diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
index 6792b6307baf3aa037756f20004045745c8d0657..678ed3629509f7c11e4484f663283358d83bd88b 100644 (file)
--- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml
+++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml
@@ -2,7 +2,6 @@
 - project:
     name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml
index f4829d180f15b851a03706820039e495922752e6..90cb5157447e96fd6eeb19ccd2cb977c1f0e22d3 100644 (file)
--- a/jjb/honeycomb/vbd/vbd.yaml
+++ b/jjb/honeycomb/vbd/vbd.yaml
@@ -2,7 +2,6 @@
 - project:
     name: vbd-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index 605cd8f0ac9ac8a49a8d2f16d6053681efd28c02..836100b774e7c1fa3f266b4b4daa86caabe3f866 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -115,3 +115,13 @@ function configure_karaf_log() {
     echo "cat ${LOGCONF}"
     cat ${LOGCONF}
 } # function configure_karaf_log()
+
+# convert commas in csv strings to spaces (ssv)
+function csv2ssv() {
+    local csv=$1
+    if [ -n "${csv}" ]; then
+        ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g')
+    fi
+
+    echo "${ssv}"
+} # csv2ssv

diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml
index 5cfd5a6bf73d3bc2931f9c79aa522459cc0fe9f0..78ba3a4b6d012c4f2dc123b42f0c296fa934b8db 100644 (file)
--- a/jjb/integration/distribution/distribution-jobs.yaml
+++ b/jjb/integration/distribution/distribution-jobs.yaml
@@ -41,7 +41,7 @@
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: pom.xml
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -117,7 +117,7 @@
           path: '$KARAF_ARTIFACT/src/main/assembly'
 
     maven:
-      maven-name: 'mvn33'
+      maven-name: 'mvn35'
       root-pom: 'pom.xml'
       goals: >
           clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B
@@ -158,7 +158,7 @@
     # Default parameters #
     ######################
 
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
@@ -188,7 +188,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:

diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml
index 4453612348a80996a87379cb8d6abfa2e8d92443..dc2f73aa66006f495b762a99c7ebd89488f677f3 100644 (file)
--- a/jjb/integration/distribution/distribution-templates.yaml
+++ b/jjb/integration/distribution/distribution-templates.yaml
@@ -10,7 +10,7 @@
     ######################
 
     java-version: openjdk8
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 6a0e9463b27b86896206a96c6ab23ef82f3e7709..7b5f690be96621b6835d104e8a8ce824167bad3c 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -4,6 +4,8 @@
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
+
 PYTHON="${ROBOT_VENV}/bin/python"
 SSH="ssh -t -t"
 ADMIN_PASSWORD="admin"
@@ -111,7 +113,9 @@ function create_etc_hosts() {
 # openstack release
 function install_openstack_clients_in_robot_vm() {
     packages=("python-novaclient" "python-neutronclient" "python-openstackclient")
-    for plugin_name in ${ENABLE_OS_PLUGINS}; do
+    local os_plugins
+    os_plugins=$(csv2ssv "${ENABLE_OS_PLUGINS}")
+    for plugin_name in $os_plugins; do
         if [ "$plugin_name" == "networking-sfc" ]; then
             packages+=("networking-sfc")
         fi
@@ -136,16 +140,6 @@ function install_openstack_clients_in_robot_vm() {
     fi
 }
 
-# convert commas in csv strings to spaces (ssv)
-function csv2ssv() {
-    local csv=$1
-    if [ -n "${csv}" ]; then
-        ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g')
-    fi
-
-    echo "${ssv}"
-} # csv2ssv
-
 function is_openstack_feature_enabled() {
     local feature=$1
     for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES})

diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index fa0db5bfc99eeefe5db684babc34d59409f2de5f..7bc5e1e0068c416e661a3053f09c637c71bb18f4 100644 (file)
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -118,6 +118,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -152,6 +153,8 @@
           controller-scope: '{scope}'
       - integration-controller-features:
           controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
@@ -354,6 +357,7 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -449,6 +453,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -482,6 +487,8 @@
           controller-scope: '{scope}'
       - integration-controller-features:
           controller-features: 'odl-jolokia,{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-stream-test-plan:
@@ -680,6 +687,7 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -797,6 +805,7 @@
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -1004,6 +1013,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
@@ -1213,6 +1223,7 @@
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
@@ -1251,7 +1262,7 @@
           default: 'all'
           description: 'Specific feature test for patch'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
@@ -1289,7 +1300,7 @@
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: '{project}/pom.xml'
           goals: |
               clean install dependency:tree
@@ -1307,7 +1318,7 @@
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index cf298ca5ae6ed7456cba141ec85f9ad892681dff..97d882d1c4939d68b4baa8e9cd32b4e65f424663 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -33,7 +33,7 @@
           csit-sanity-list: '{csit-sanity-list-fluorine}'
           csit-weekly-list: '{csit-weekly-list-fluorine}'
           csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
       - oxygen:
           branch: 'stable/oxygen'
           csit-blacklist: >
@@ -43,7 +43,7 @@
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
 
       - nitrogen:
           branch: 'stable/nitrogen'
@@ -52,7 +52,7 @@
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
           csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
 
       - carbon:
           branch: 'stable/carbon'
@@ -62,7 +62,7 @@
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
-          mvn-version: 'mvn33'
+          mvn-version: 'mvn35'
 
     # tools system image
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
@@ -75,7 +75,7 @@
     name: 'integration-distribution-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-disttest-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -110,7 +110,7 @@
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -164,7 +164,7 @@
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
@@ -203,7 +203,7 @@
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: '$GERRIT_PROJECT/pom.xml'
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -218,7 +218,7 @@
           global-settings: global-settings
           global-settings-type: cfp
       - maven-target:
-          maven-version: mvn33
+          maven-version: mvn35
           pom: distribution/pom.xml
           goals: |
               clean install dependency:tree -DoutputFile=dependency_tree.txt
@@ -279,7 +279,7 @@
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     wrappers:
       - opendaylight-infra-wrappers:
@@ -329,7 +329,7 @@
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
@@ -361,7 +361,7 @@
     name: 'integration-distribution-high-frequency-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:

diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh
index e9e2bdf828c28cf9075947fde2c66a9a83e2e17d..39cdbeca55cd1f1a9bf5ebf0810f3086a42cf8ca 100644 (file)
--- a/jjb/integration/integration-upload-distribution.sh
+++ b/jjb/integration/integration-upload-distribution.sh
@@ -22,7 +22,7 @@ echo "Uploading distribution to Nexus..."
 
 cat "${LOG_FILE}"
 
-BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $3}') || true
+BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $5}') || true
 echo "Bundle uploaded to ${BUNDLE_URL}"
 
 # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus

diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml
index 7ebc16da4c9f0e966c549dec3cdf173a9406a092..3a29a05cafa30e88b667f458a1f1dedbb20f3346 100644 (file)
--- a/jjb/iotdm/iotdm.yaml
+++ b/jjb/iotdm/iotdm.yaml
@@ -2,7 +2,6 @@
 - project:
     name: iotdm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml
index e2955c1019f0da4693fa73af00f9fa2607c565fb..3792df73364a4a909e27c85f1bb1436048c046ab 100644 (file)
--- a/jjb/l2switch/l2switch.yaml
+++ b/jjb/l2switch/l2switch.yaml
@@ -2,7 +2,6 @@
 - project:
     name: l2switch-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml
index c089d6123237479e1a01b2e15d9f561c0f6e4426..850c4a52438f7d4c44859ec8e9e94caee319c0db 100644 (file)
--- a/jjb/lacp/lacp.yaml
+++ b/jjb/lacp/lacp.yaml
@@ -2,7 +2,6 @@
 - project:
     name: lacp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml
new file mode 100644 (file)
index 0000000..d43a067
--- /dev/null
+++ b/jjb/lfn/lfn.yaml
@@ -0,0 +1,19 @@
+---
+- project:
+    name: lf-infra-lfn-process
+    jobs:
+      - '{project-name}-rtd-jobs'
+      - gerrit-tox-verify
+
+    project-name: lf-infra-lfn-process
+    project: lfn/process
+    project-pattern: lfn/process
+    build-node: centos7-builder-2c-1g
+    rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/
+    rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+

diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
index 01b9e23baeac5cfe2e4db75c1694e8e92eae0e4c..e9a27a52a02908e2c60efa21b82a9401412cf4bb 100644 (file)
--- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
+++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job instance type
-    odl_system_flavor: 'v2-highcpu-8'
+    odl_system_flavor: 'odl-highcpu-8'
 
     # Features to install
     install-features: 'odl-lispflowmapping-msmr'

diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml
index b0b9524470ad70a95d51e541aafecce8318f5f5c..6a6cb9b2ef5bdba66c05916b4bd8abe3515fbf1e 100644 (file)
--- a/jjb/mdsal/mdsal-csit-bindingv1.yaml
+++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml
@@ -28,7 +28,7 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
 
     # Features to install
     install-features: 'odl-restconf'

diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml
index b27a82795bc1e8cc8f233b95247b749cbe6bbb12..e9c9b085837e0ef46df0b646dc0c9bacef690ec3 100644 (file)
--- a/jjb/messaging4transport/messaging4transport.yaml
+++ b/jjb/messaging4transport/messaging4transport.yaml
@@ -2,7 +2,6 @@
 - project:
     name: messaging4transport-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml
index 5bffab7480d0849e7014a99e2589fc62631d4f66..b0d5a86296c443e24db5c1d76c9ff61c39f5a17f 100644 (file)
--- a/jjb/natapp/natapp.yaml
+++ b/jjb/natapp/natapp.yaml
@@ -2,7 +2,6 @@
 - project:
     name: natapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml
index 49d944258f209364dd48b6d9a84811610cf8388e..61564eb05cef802a56ac681f8ffd5a36d9f642ce 100644 (file)
--- a/jjb/nemo/nemo.yaml
+++ b/jjb/nemo/nemo.yaml
@@ -2,7 +2,6 @@
 - project:
     name: nemo-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index e081c45d26910bb0eeb5976b0a3a47d71a156d43..b736bc20a33480c5c9f977417900cd0b90c54604 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -37,4 +37,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # ODL system configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4

diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml
index 732afd3c1c5b44f700b1e917dba04bc976c1aad3..38965fcfcb73b1d211d6e968d3c305fa9a45a6aa 100644 (file)
--- a/jjb/netide/netide.yaml
+++ b/jjb/netide/netide.yaml
@@ -2,7 +2,6 @@
 - project:
     name: netide-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
index 6aff8bf1e395f776d70937a027d96aa92f2ad959..ad9aefa2c9968dd6c8bb2827e60fa1632f366763 100644 (file)
--- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
@@ -12,9 +12,9 @@
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -65,9 +65,9 @@
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -118,9 +118,9 @@
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 
@@ -172,9 +172,9 @@
     enable-openstack-services: 'placement-api,l2gw-plugin'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
     tools_system_count: 2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
 

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 6f525f57f1cdfdf7b3df8c7ce7df35f66c8cc042..02475d741d793ed0b7799d9af5b7e687d900bab4 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -12,9 +12,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -71,9 +71,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -129,9 +129,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -184,9 +184,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
-    openstack_system2_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
+    openstack_system2_flavor: odl-standard-4
 
     topology:
       - 1node:
@@ -232,8 +232,8 @@
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v2-standard-4
-    openstack_system2_flavor: v2-standard-2
+    odl_system_flavor: odl-standard-4
+    openstack_system2_flavor: odl-standard-2
 
     topology:
       - 1node:
@@ -250,8 +250,10 @@
           testplan: '{project}-extensions-sfc.txt'
 
     stream:
-      - oxygen:
+      - fluorine:
           branch: 'master'
+      - oxygen:
+          branch: 'stable/oxygen'
       - nitrogen:
           branch: 'stable/nitrogen'
       - carbon:
@@ -259,10 +261,9 @@
           karaf-version: karaf3
 
     openstack:
-      - pike:
-          openstack-branch: 'stable/pike'
-          odl-ml2-branch: 'stable/pike'
+      - queens:
+          openstack-branch: 'stable/queens'
+          odl-ml2-branch: 'stable/queens'
           odl-ml2-port-binding: 'pseudo-agentdb-binding'
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
-          enable-openstack-network-services: '{openstack_legacy_default_network_services}'

diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml
new file mode 100644 (file)
index 0000000..ec10ee5
--- /dev/null
+++ b/jjb/neutron/neutron-patch-test.yaml
@@ -0,0 +1,22 @@
+---
+- project:
+    name: neutron-patch-test
+    jobs:
+      - inttest-patch-test
+
+    project: 'neutron'
+
+    stream:
+      - fluorine:
+          branch: 'master'
+          os-branch: 'queens'
+      - oxygen:
+          branch: 'stable/oxygen'
+          os-branch: 'queens'
+
+    jdk: 'openjdk8'
+
+    feature:
+      - netvirt:
+          csit-list: >
+              netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream}

diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml
index b160dc6d3623499cd2966fdbaf70d29ba6878162..7303620545f5abb5ae9a8ed6f6465dc35e561965 100644 (file)
--- a/jjb/next/next.yaml
+++ b/jjb/next/next.yaml
@@ -2,7 +2,6 @@
 - project:
     name: next-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml
index bf200779bc98a87860e09ecf472cf05540f1e5c1..0502ea4a623c4c2ce943c5d9035c977f591eba43 100644 (file)
--- a/jjb/nic/nic.yaml
+++ b/jjb/nic/nic.yaml
@@ -2,7 +2,6 @@
 - project:
     name: nic-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml
index f9e55c810e20df10dc2c535d6853573105b896b6..a9e86a85b755ffbf81c4f99b047c0ac22c304f43 100644 (file)
--- a/jjb/ocpplugin/ocpplugin.yaml
+++ b/jjb/ocpplugin/ocpplugin.yaml
@@ -2,7 +2,6 @@
 - project:
     name: ocpplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml
index c7a309ad8e9e4db2986732970f528c30b095e3ff..0d918badf99a051eba268eed18fcf668ee4f7c3f 100644 (file)
--- a/jjb/of-config/of-config.yaml
+++ b/jjb/of-config/of-config.yaml
@@ -2,7 +2,6 @@
 - project:
     name: of-config-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml
similarity index 94%
rename from jjb/opflex/opflex-dependencies.yaml
rename to jjb/opflex/opflex-thirdparty-dependencies.yaml
index b772ead2e8fb6b2d6f17129aea1e0bb871423f14..516fa7195bbbafea562720f5ec85d511bac1e3d4 100644 (file)
--- a/jjb/opflex/opflex-dependencies.yaml
+++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml
@@ -2,9 +2,9 @@
 - project:
     name: opflex-dependencies
     jobs:
-      - 'opflex-libuv-{stream}'
-      - 'opflex-rapidjson-{stream}'
-      - 'opflex-openvswitch-{stream}'
+      - 'opflex-thirdparty-libuv-{stream}'
+      - 'opflex-thirdparty-rapidjson-{stream}'
+      - 'opflex-thirdparty-openvswitch-{stream}'
 
     stream:
       - oxygen:
@@ -34,7 +34,7 @@
     upload-files-dir: '$WORKSPACE/upload_files'
 
 - job-template:
-    name: 'opflex-libuv-{stream}'
+    name: 'opflex-thirdparty-libuv-{stream}'
 
     project-type: freestyle
     node: centos7-builder-2c-8g
@@ -89,7 +89,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'opflex-rapidjson-{stream}'
+    name: 'opflex-thirdparty-rapidjson-{stream}'
 
     project-type: freestyle
     node: centos7-builder-2c-8g
@@ -144,7 +144,7 @@
       - lf-infra-publish
 
 - job-template:
-    name: 'opflex-openvswitch-{stream}'
+    name: 'opflex-thirdparty-openvswitch-{stream}'
 
     project-type: freestyle
     node: centos7-builder-2c-8g

diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml
index 90802ab7385a9fa728cac918291c36510459e038..05c04d96781b7035e862e796e7d7e25caa11e0f6 100644 (file)
--- a/jjb/p4plugin/p4plugin.yaml
+++ b/jjb/p4plugin/p4plugin.yaml
@@ -2,7 +2,6 @@
 - project:
     name: p4plugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml
index 14a83cd2283ed95041c31c3b7f03f4c0f477bb7f..bba23473590e8ea3bc4feedb5d0fac61b27825eb 100644 (file)
--- a/jjb/packetcable/packetcable.yaml
+++ b/jjb/packetcable/packetcable.yaml
@@ -2,7 +2,6 @@
 - project:
     name: packetcable-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml
index 69738a5c84ed822546d88b04c8a7a83de1b22fc9..0c37c0bb49b0f58c9bb7b6367d5518252bce164b 100644 (file)
--- a/jjb/releng-defaults.yaml
+++ b/jjb/releng-defaults.yaml
@@ -74,19 +74,19 @@
     openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649
     stack-template: csit-2-instance-type.yaml
     docker_system_count: 1
-    docker_system_flavor: v2-standard-1
+    docker_system_flavor: odl-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311
     odl_system_count: 1
-    odl_system_flavor: v2-highcpu-4
+    odl_system_flavor: odl-highcpu-4
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v2-standard-4
+    openstack_system_flavor: odl-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v2-standard-1
+    openstack_system2_flavor: odl-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v2-highcpu-2
+    tools_system_flavor: odl-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options

diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml
index 2316b19ca3cc6c16b5b9d94365861edc4d298441..f34d5aa7e19bb2e90792f4da3e2102c990f62d1f 100644 (file)
--- a/jjb/releng-macros.yaml
+++ b/jjb/releng-macros.yaml
@@ -454,6 +454,25 @@
                 settings: '{settings}'
                 global-settings: '{global-settings}'
 
+- publisher:
+    name: releng-openstack-stack-delete
+    publishers:
+      - postbuildscript:
+          builders:
+            - role: BOTH
+              build-on:
+                - ABORTED
+                - FAILURE
+                - SUCCESS
+                - UNSTABLE
+              build-steps:
+                - shell: |
+                    #!/bin/bash
+                    echo "Deleting $STACK_NAME"
+                    source "/tmp/v/openstack/bin/activate"
+                    openstack stack delete --yes "$STACK_NAME"
+          mark-unstable-if-failed: false
+
 - builder:
     name: releng-stage-release
     builders:

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 3e9a0025b52d50401b23a7101db7b397eebce0d3..3f001989e03f86ceb4dfe49d45be272709dfb94e 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -76,7 +76,7 @@
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           goals: |
               {mvn-goals}
               {opendaylight-infra-mvn-opts}
@@ -110,7 +110,7 @@
       **/target/surefire-reports/*-output.txt
     cron: 'H H * * 0'
     mvn-opts: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     java-version: openjdk8
 
     #####################

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 4a5eef8b18b0526a452a73e63e7c7b1bdea22090..d830b59a8bd9aa607117d224057c92ee49f5d3c6 100644 (file)
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -45,7 +45,7 @@
           global-settings-file: 'global-settings'
           settings-file: 'autorelease-settings'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: >
               clean deploy -V -B
@@ -94,12 +94,12 @@
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - releng-fetch-p2zip-if-necessary:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: '{mvn-settings}'
           global-settings: 'global-settings'
       - releng-generate-p2pom
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
           settings: '{mvn-settings}'
@@ -107,7 +107,7 @@
           global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-update-p2composite-metadata:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: '{mvn-settings}'
           global-settings: 'global-settings'
 

diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
index d14de626599d1740443b8149ac1b788265d21730..a9dd8c51fcceb8d1a76a9b6dbed0139ecaf17a2e 100644 (file)
--- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml
+++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml
@@ -2,7 +2,6 @@
 - project:
     name: sdninterfaceapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml
index f9ecd01f649f73a69225107c4cd71346fcb1171e..86c6be31cf5823c1f9386433da32a28e821ed322 100644 (file)
--- a/jjb/snbi/snbi.yaml
+++ b/jjb/snbi/snbi.yaml
@@ -2,7 +2,6 @@
 - project:
     name: snbi-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml
index 4a5c47d15e91d55e2b194ad9f9ea6ff6f89d9d48..5eb654f4872f03b958b8ab8319d807fcae936f82 100644 (file)
--- a/jjb/snmp/snmp.yaml
+++ b/jjb/snmp/snmp.yaml
@@ -2,7 +2,6 @@
 - project:
     name: snmp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml
index 1ad2b6a864bd6f71ff1cebb2a1798402a1fbae23..9d07ce18bc6c63d5b0ef2c6597dfb787144b210e 100644 (file)
--- a/jjb/snmp4sdn/snmp4sdn.yaml
+++ b/jjb/snmp4sdn/snmp4sdn.yaml
@@ -2,7 +2,6 @@
 - project:
     name: snmp4sdn-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml
index 08b5b7556db68a1ae56d50399cb0de0d33ca65c4..e3bb0b8768584d1062d74d721ca9910c8fdaaf5a 100644 (file)
--- a/jjb/sxp/sxp.yaml
+++ b/jjb/sxp/sxp.yaml
@@ -2,7 +2,6 @@
 - project:
     name: sxp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml
index 75a34f5a7c2e276fbceee18b67745ddbdc00b104..c28c14e24414f4effefa8e4b52cd512886132dfd 100644 (file)
--- a/jjb/telemetry/telemetry.yaml
+++ b/jjb/telemetry/telemetry.yaml
@@ -3,7 +3,6 @@
     name: telemetry-fluorine
     jobs:
       - 'odl-maven-jobs'
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
 
     stream: fluorine

diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml
index 8aacb504110802c81b455ff521d4aa3eae1d480f..b2a84b5d70163a3cfef8806057939b8b9a657112 100644 (file)
--- a/jjb/topoprocessing/topoprocessing.yaml
+++ b/jjb/topoprocessing/topoprocessing.yaml
@@ -2,7 +2,6 @@
 - project:
     name: topoprocessing-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml
index 04bd66db352550e77110f8d02aa185b36a1961f7..a213d46d0ae4dae8b0d66dc2b24669d724cf1cc0 100644 (file)
--- a/jjb/tsdr/tsdr.yaml
+++ b/jjb/tsdr/tsdr.yaml
@@ -2,7 +2,6 @@
 - project:
     name: tsdr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml
index 323a75b8aaf19e1f4f490b7711e32bbb6b68f137..0d06e7e91d32d50246a7ec8803795295a63d4299 100644 (file)
--- a/jjb/ttp/ttp.yaml
+++ b/jjb/ttp/ttp.yaml
@@ -2,7 +2,6 @@
 - project:
     name: ttp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml
index e53712d932f9d646d844ffff372823711a9b7aee..5a73394ed6ae8f4f3037a62c4c7965dbceb6256d 100644 (file)
--- a/jjb/unimgr/unimgr.yaml
+++ b/jjb/unimgr/unimgr.yaml
@@ -2,7 +2,6 @@
 - project:
     name: unimgr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml
index 772a8d932797bc59816592abedd581a0be2fd931..b11b299d81546a4a19b9679df86399bcf8e23b47 100644 (file)
--- a/jjb/usc/usc.yaml
+++ b/jjb/usc/usc.yaml
@@ -2,7 +2,6 @@
 - project:
     name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml
index 459dccd32c83b02055ace6717e379e6483441240..32263d804e0950efcde13677dccf806070b68c2d 100644 (file)
--- a/jjb/usecplugin/usecplugin.yaml
+++ b/jjb/usecplugin/usecplugin.yaml
@@ -2,7 +2,6 @@
 - project:
     name: usecplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
index 6fd69d8202b8c116b300a46c2ab4f1bab1dc8a6f..e82edbe73d652e5a3b6646b783c845e3bc6a1f19 100644 (file)
--- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
+++ b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml
@@ -44,6 +44,6 @@
     public-bridge: 'br-ex'
     disable-openstack-services: 'n-net,q-l3'
     tenant-network-type: 'local'
-    odl_system_flavor: v2-standard-8
-    openstack_system_flavor: v2-standard-8
+    odl_system_flavor: odl-standard-8
+    openstack_system_flavor: odl-standard-8
     odl-ml2-driver-version: 'v2'

diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml
index 9d47eaf4cd03f63aa67264410098c7601f4fc7a4..ef91bab075093f191771a6590e3932fdd6b8d9aa 100644 (file)
--- a/jjb/vtn/vtn.yaml
+++ b/jjb/vtn/vtn.yaml
@@ -2,7 +2,6 @@
 - project:
     name: vtn-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 

diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml
index da08c4bdd5dbbad411c0c0d265bc64ebd8ec86a7..8a775119ab876e765c251237c39c817bddd2a9a4 100644 (file)
--- a/jjb/yang-push/yang-push.yaml
+++ b/jjb/yang-push/yang-push.yaml
@@ -2,7 +2,6 @@
 - project:
     name: yang-push-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine

diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml
index f4cbb5cddf416214c37a02a1405aaae91a0b238b..6fbab522c4999d80152f0b4c18029eabb5e00496 100644 (file)
--- a/openstack-hot/generic-server.yaml
+++ b/openstack-hot/generic-server.yaml
@@ -39,17 +39,11 @@ resources:
             allowed_address_pairs:
                 - ip_address: 10.250.0.0/24
             network: odlci
-    volume:
-        type: "OS::Cinder::Volume"
-        properties:
-            image: {get_param: vm_image}
-            size: 40
     instance:
         type: "OS::Nova::Server"
         properties:
+            image: {get_param: vm_image}
             flavor: {get_param: vm_flavor}
-            block_device_mapping_v2:
-                - volume_id: {get_resource: volume}
             name:
                 str_replace:
                     template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX