Merge "Update SFC netvirt CSIT with fluorine and queens"
authorSam Hague <shague@redhat.com>
Mon, 23 Apr 2018 21:10:49 +0000 (21:10 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Mon, 23 Apr 2018 21:10:49 +0000 (21:10 +0000)
120 files changed:
docs/cloud-images.rst
docs/jenkins.rst
jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg
jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg [new file with mode: 0644]
jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg
jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg
jjb/aaa/aaa-csit-keystone.yaml
jjb/alto/alto.yaml
jjb/archetypes/archetypes.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml
jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml
jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/controller/controller-csit-dsbenchmark-cluster.yaml [moved from jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml with 99% similarity]
jjb/controller/controller-csit-dsbenchmark.yaml [moved from jjb/controller/controller-csit-periodic-dsbenchmark.yaml with 98% similarity]
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/integration/common-functions.sh
jjb/integration/csit-jobs-carbon.lst
jjb/integration/csit-jobs-fluorine.lst
jjb/integration/csit-jobs-nitrogen.lst
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-deploy-verify.sh
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/integration-configure-clustering.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration-upload-distribution.sh
jjb/iotdm/iotdm.yaml
jjb/l2switch/l2switch-csit-host-scalability-daily.yaml
jjb/l2switch/l2switch-patch-test.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lfn/lfn.yaml [new file with mode: 0644]
jjb/lispflowmapping/lispflowmapping-csit-performance.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-scale.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/neutron/neutron-patch-test.yaml [new file with mode: 0644]
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-cleanup-stale-volumes.sh [new file with mode: 0644]
jjb/of-config/of-config.yaml
jjb/opflex/opflex-thirdparty-dependencies.yaml [moved from jjb/opflex/opflex-dependencies.yaml with 94% similarity]
jjb/p4plugin/p4plugin.yaml
jjb/packaging/packaging.yaml
jjb/packetcable/packetcable.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp-csit-basic.yaml
jjb/sxp/sxp-csit-cluster-routing.yaml
jjb/sxp/sxp-csit-clustering.yaml
jjb/sxp/sxp-csit-filtering.yaml
jjb/sxp/sxp-csit-performance.yaml
jjb/sxp/sxp-csit-topology.yaml
jjb/sxp/sxp.yaml
jjb/telemetry/telemetry.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.yaml
jjb/usc/usc-csit-channel.yaml
jjb/usc/usc-csit-tcp.yaml
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml
jjb/vtn/vtn-manager-csit-1node-openstack.yaml
jjb/vtn/vtn.yaml
jjb/yang-push/yang-push.yaml
jjb/yangtools/yangtools-csit-system.yaml
openstack-hot/generic-server.yaml
packer/provision/local-builder.yaml
packer/provision/local-docker.yaml
packer/provision/mininet-ovs-2.8.yaml

index fccbc7851828f87cadee341c27c42777de872a54..777c983e0339fb839b4815aaee4b75d361d1cc2e 100644 (file)
@@ -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
index 6cb6585836fda784667c9043e242171356972763..8ada1c7e66b924e09cfde88c297c87c99155458a 100644 (file)
@@ -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
 ^^^^^^^^^^^^
 
index a1ba643e44554e1b43251eec7e7f6513aa52db48..bbec5364d5c76f57ce61c6b600925f510d183b2a 100644 (file)
@@ -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
index 4cedaefb08a218f6b0c047d80980aacc66b6b7b4..e7d1fa489b4e65152b193860e1a31f5875f3eef4 100644 (file)
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=odl-highcpu-2
index 7be9c8b1e54673b124faf2cc3479df983134efd2..4d2f3cfd86bfcb12eda8e4551fb526ccafed510a 100644 (file)
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-standard-2
+HARDWARE_ID=odl-standard-2
index 94468159cda13b2571b9737d74c4a46bb008267b..1c1936b1b0dc9e16277a7e7ba8c3ed9c8afe6f7d 100644 (file)
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-standard-4
+HARDWARE_ID=odl-standard-4
index 637bea8b6cd0752050b4b4c948bb5fcc37309809..d7466e50d919ee5e0150372666b89685a7a5e37a 100644 (file)
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659
-HARDWARE_ID=v2-highcpu-4
+HARDWARE_ID=odl-highcpu-4
index 9288347093b833bbbef5c6e39dfdeec3d6e0839a..385fdff34ec86291ea44abbea0352ddfa0ece3e6 100644 (file)
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180201-2139
-HARDWARE_ID=v2-highcpu-8
+HARDWARE_ID=odl-highcpu-8
index 733c4038d4a6890ff1ff8ddccf20d89e5d228ee7..3f3b64e55174656165126003a5b2302f1295a503 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121
-HARDWARE_ID=v2-standard-1
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311
+HARDWARE_ID=odl-standard-1
index 0b3d3a9ec0ea09c8bc88d59389dca22ad9e8aed5..459f6c593ceaa5c9d0642537a5a518c3492e68ce 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121
-HARDWARE_ID=v2-highcpu-2
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311
+HARDWARE_ID=odl-highcpu-2
index 89387d0308b615c4f6e5eeb3ba2b0939682d5537..cbe2b2f6926500eaf40b89e3ab0217cbf63567aa 100644 (file)
@@ -1,2 +1,2 @@
-IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121
-HARDWARE_ID=v2-standard-2
+IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311
+HARDWARE_ID=odl-standard-2
index d695ad5832d4f005f7c230faf0a032e51d2bcfca..081ffad4dc7562d22aedff300f9b4f07335df8c3 100644 (file)
@@ -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
@@ -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
@@ -0,0 +1,4 @@
+IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917
+HARDWARE_ID=v1-standard-1
+INSTANCE_CAP=1
+NUM_EXECUTORS=4
index d1cd1c931a5b58a242a28e679247af42352c1950..3ca18447cce60ce5b133cfbfed0b6ae564f540fe 100644 (file)
@@ -1,2 +1,2 @@
 IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180220-2018
-HARDWARE_ID=v2-highcpu-2
+HARDWARE_ID=odl-highcpu-2
index 2747b97b62631ae077fd76e93084971cfa246e76..bc1e0eed4ee7e92609b54d671a58bcd3a2c55cdd 100644 (file)
@@ -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
index f4483c246fa4068957a079448c9556bb567a8bac..1be27c06ebfe72f9a740d469ad7afc5bdbb11831 100644 (file)
@@ -31,8 +31,8 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v2-highcpu-2'
-    tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
+    tools_system_flavor: 'odl-highcpu-2'
+    tools_system_image: 'ZZCI - CentOS 7 - docker - 20180417-0311'
 
     # Robot custom options
     robot-options: ''
index 7145b02a77e0af38d9467663adfc09530d55f4a8..d5e6adb457b4ece90b42726601b3844f1f0fd3ab 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: alto-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 657fa09c04bfec58d2199fe270e7a651ab85f569..c31164de36367af6aeafc2bea8b240a682197917 100644 (file)
@@ -2,7 +2,15 @@
 - project:
     name: archetypes-fluorine
     jobs:
-      - odl-maven-jobs
+      - gerrit-maven-clm
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          cron: '@daily'
+          mvn-goals: clean install -V -Dmaven.compile.fork=true
+      - gerrit-maven-release
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies:
+          build-timeout: 180
 
     stream: fluorine
     project: 'archetypes'
index 34f659786950be9a352c7f7c00796d6067c90cb6..56db31b84f5155f3c8f42b6400153ed0a3a800ef 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: atrium-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 80a133bfdaf4b26de94467f1410f01351940175f..2c6fd2d0d400dea261c2fdfe584b2bce799f38cb 100644 (file)
@@ -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
index e0733cb4fb04e2fd83e0659605818896cf54d48e..4c65c5b8078124993d33feb693119add6dd5f9e2 100644 (file)
@@ -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}'
       # 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
       - 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
               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:
     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
       # 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
       # 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
index 763c5b6bf8fb0d69cda52ee965faf3a4e2f61292..14ec6d49e14ad5b599d30cd84fe91e0ab17922dd 100644 (file)
@@ -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'
index 16976ff6a050e5630311079d77fad14bf8b254ae..99d71ebfcf0e9aec5666f050d973959c37a97b6a 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest-mixed
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
@@ -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'
index b61c1b819722690a64237c6d4493ba4a23db39de..76f18bf9e809ab74fa25784a6741539742885b52 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgp-ingest
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition.
 
     # The project name
@@ -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
 
index 7521007347bedf0bf86b78f913744d040e1f6c68..137abb967c639bcbf853476298f40e0f43a60b9b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering-ha
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'
index 96f954631a801c760960879cf002850027e913dd..1c2d76d71d900432331eeaa4bc53620586c3ce0b 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-bgpclustering
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'bgpcep'
@@ -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'
index 3e7b71c86543a75a2ab1ea13255863688cdae82e..904d097ed2efca47920ed018f087fdbb8bbe7a41 100644 (file)
@@ -40,4 +40,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
index 39e0958293ad32d57a7a6f6c3bc6d6d56f6ae169..f2e183547dec69e66d29d0ce86c70305148c7134 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: bgpcep-csit-throughpcep
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
       # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality.
 
     # The project name
@@ -36,9 +36,9 @@
     # Robot custom options:
     robot-options: >
         -v USE_NETCONF_CONNECTOR:False
-        -v PCEP_READY_VERIFY_TIMEOUT:5
+        -v PCEP_READY_VERIFY_TIMEOUT:180
         -v RESTCONF_REUSE:False
         -v UPDATER_TIMEOUT:900
 
     # Controller configuration
-    odl_system_flavor: v2-standard-4
+    odl_system_flavor: odl-standard-4
index be616372906f491d0757c9a633a76375bd335769..b0c17783ee8beb3a39bfbc8abb8302585ebdc60c 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: bier-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 6836282e64f10e698886b6d41afc4c0e6d026093..d01c735b1f26a78c8ada9fac04cf78ef44339e95 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: capwap-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 58b826da050149798b5c0e730eb79d0b677af324..3db33a8229583bff49d0630952d8ba5ba6f4c933 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: cardinal-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index e65f791a3eb1d9e12868a61d44b1b33d9d4cb3c3..71d0b5cedeaf6b1e9e3b307c04c7aaa79a274e88 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: centinel-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
similarity index 99%
rename from jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
rename to jjb/controller/controller-csit-dsbenchmark-cluster.yaml
index 43a9f55b8a397f5076c93ac8fa35bd7f97c40447..41169c5ac3635068703a31d0e923a82dff67ea3a 100644 (file)
@@ -1,8 +1,8 @@
 ---
 - project:
-    name: mdsal-csit-periodic-dsbenchmark-cluster
+    name: mdsal-csit-dsbenchmark-cluster
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'controller'
@@ -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'
 
similarity index 98%
rename from jjb/controller/controller-csit-periodic-dsbenchmark.yaml
rename to jjb/controller/controller-csit-dsbenchmark.yaml
index 25f583679cdc0e883ed087f63a0e9e030a3767fc..344ebb88f777fe7e39866ccf1c8271b463f55db5 100644 (file)
@@ -1,8 +1,8 @@
 ---
 - project:
-    name: mdsal-csit-periodic-dsbenchmark
+    name: mdsal-csit-dsbenchmark
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'controller'
@@ -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'
index a9a6be7d4cd18ec1e3d51a77985950bf72262836..fae22b5b67ac90e9f48d8301e5b2b82ef8d0df97 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: didm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 7f52f5c62ded93e2a260ba0bbceac5b16fac01a9..6356d44132fec9b28287e2a1be2b39637236ba25 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: dlux-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 6cd7760b2a784e073628a3ec7068277f68481fd8..a31fdfa213721024ce2cc43d03b08f16270ca407 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: dluxapps-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
index 36e06e98ad88be0388b7bfd66e3b5043e494c97f..c5fd3112e2a946f25f213719f128851d1539a8ec 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: eman-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 08ec7ea29fa2deb04957c8b2272d80a3d2edc53c..c01098b30185d68bd511cd74c01c014f0876592d 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: faas-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 428f14b0d8db0f3960b17528d05536d68d039aa3..a0ded3310c10d20536a0b33d6cd4eff34cfddb64 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: federation-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 77d08b0d780fd61331505cb8d219410daf6242b9..33e6dbbd101ba30a24fe48df98e76601f423d0d4 100644 (file)
@@ -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'
           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'
       - 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: ' '
index 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7..536325e5186cf8883d630feaea2d91591b39fd50 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 9f237eb9ddb18fe6e01cbadea0a75e36a0baf8d7
+Subproject commit 536325e5186cf8883d630feaea2d91591b39fd50
index 6792b6307baf3aa037756f20004045745c8d0657..678ed3629509f7c11e4484f663283358d83bd88b 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: groupbasedpolicy-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index f4829d180f15b851a03706820039e495922752e6..90cb5157447e96fd6eeb19ccd2cb977c1f0e22d3 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: vbd-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 605cd8f0ac9ac8a49a8d2f16d6053681efd28c02..836100b774e7c1fa3f266b4b4daa86caabe3f866 100644 (file)
@@ -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
index ac2f4910538d9b9a46c651c4a49c950e97566d94..2cc6ff8d4aa424bd8bee0dc9eef4775903d8bdf2 100644 (file)
@@ -2,18 +2,18 @@ aaa-csit-1node-authn-all-carbon,
 aaa-csit-1node-keystone-all-carbon,
 aaa-csit-1node-tls-only-carbon,
 alto-csit-1node-setup-all-carbon,
-bgpcep-csit-1node-periodic-bgp-ingest-all-carbon,
-bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-carbon,
-bgpcep-csit-1node-periodic-throughpcep-all-carbon,
+bgpcep-csit-1node-bgp-ingest-all-carbon,
+bgpcep-csit-1node-bgp-ingest-mixed-all-carbon,
+bgpcep-csit-1node-throughpcep-all-carbon,
 bgpcep-csit-1node-userfeatures-all-carbon,
-bgpcep-csit-3node-periodic-bgpclustering-all-carbon,
-bgpcep-csit-3node-periodic-bgpclustering-ha-only-carbon,
+bgpcep-csit-3node-bgpclustering-all-carbon,
+bgpcep-csit-3node-bgpclustering-ha-only-carbon,
 bier-csit-1node-basic-all-carbon,
 controller-csit-1node-akka1-all-carbon,
-controller-csit-1node-periodic-benchmark-all-carbon,
+controller-csit-1node-benchmark-all-carbon,
 controller-csit-1node-rest-cars-perf-all-carbon,
+controller-csit-3node-benchmark-all-carbon,
 controller-csit-3node-clustering-all-carbon,
-controller-csit-3node-periodic-benchmark-all-carbon,
 controller-csit-3node-rest-clust-cars-perf-only-carbon,
 didm-csit-1node-discovery-only-carbon,
 distribution-csit-1node-userfeatures-all-carbon,
@@ -26,23 +26,23 @@ groupbasedpolicy-csit-1node-openstack-ocata-openstack-carbon,
 groupbasedpolicy-csit-1node-sxp-only-carbon,
 groupbasedpolicy-csit-3node-clustering-all-carbon,
 iotdm-csit-1node-basic-all-carbon,
-l2switch-csit-1node-periodic-host-scalability-daily-only-carbon,
+l2switch-csit-1node-host-scalability-daily-only-carbon,
 l2switch-csit-1node-scalability-all-carbon,
 l2switch-csit-1node-switch-all-carbon,
 lacp-csit-1node-lacp-all-carbon,
 lispflowmapping-csit-1node-msmr-all-carbon,
 lispflowmapping-csit-1node-performance-only-carbon,
 lispflowmapping-csit-3node-msmr-all-carbon,
-mdsal-csit-1node-periodic-bindingv1-only-carbon,
+mdsal-csit-1node-bindingv1-only-carbon,
 messaging4transport-csit-1node-basic-all-carbon,
 natapp-csit-1node-basic-all-carbon,
 nemo-csit-1node-engine-all-carbon,
 netconf-csit-1node-callhome-only-carbon,
-netconf-csit-1node-periodic-scale-all-carbon,
+netconf-csit-1node-scale-all-carbon,
 netconf-csit-1node-userfeatures-all-carbon,
 netconf-csit-3node-cluster-stress-all-carbon,
 netconf-csit-3node-clustering-all-carbon,
-netconf-csit-3node-periodic-clustering-scale-all-carbon,
+netconf-csit-3node-clustering-scale-all-carbon,
 netide-csit-1node-basic-all-carbon,
 netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon,
 netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-carbon,
@@ -79,10 +79,10 @@ sfc-csit-3node-docker-full-deploy-all-carbon,
 sfc-csit-3node-rest-basic-all-carbon,
 sxp-csit-1node-basic-all-carbon,
 sxp-csit-1node-filtering-all-carbon,
-sxp-csit-1node-periodic-performance-all-carbon,
+sxp-csit-1node-performance-all-carbon,
 sxp-csit-1node-topology-all-carbon,
-sxp-csit-3node-periodic-clustering-all-carbon,
-sxp-csit-3node-periodic-routing-all-carbon,
+sxp-csit-3node-clustering-all-carbon,
+sxp-csit-3node-routing-all-carbon,
 topoprocessing-csit-1node-topology-operations-all-carbon,
 tsdr-csit-1node-cassandra-datastore-only-carbon,
 tsdr-csit-1node-elasticsearch-datastore-only-carbon,
@@ -94,4 +94,4 @@ usc-csit-1node-channel-all-carbon,
 usc-csit-1node-tcp-all-carbon,
 usecplugin-csit-1node-basic-all-carbon,
 vtn-csit-1node-openstack-pike-neutron-carbon,
-yangtools-csit-1node-periodic-system-only-carbon,
+yangtools-csit-1node-system-only-carbon,
index 1bebf0ae2f65168164ebb8172531f8ae982041d9..01e20cd215b1078ad3eaa355222ab1d32e5b61fb 100644 (file)
@@ -1,17 +1,17 @@
 aaa-csit-1node-authn-all-fluorine,
 aaa-csit-1node-keystone-all-fluorine,
 aaa-csit-1node-tls-only-fluorine,
-bgpcep-csit-1node-periodic-bgp-ingest-all-fluorine,
-bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-fluorine,
-bgpcep-csit-1node-periodic-throughpcep-all-fluorine,
+bgpcep-csit-1node-bgp-ingest-all-fluorine,
+bgpcep-csit-1node-bgp-ingest-mixed-all-fluorine,
+bgpcep-csit-1node-throughpcep-all-fluorine,
 bgpcep-csit-1node-userfeatures-all-fluorine,
-bgpcep-csit-3node-periodic-bgpclustering-all-fluorine,
-bgpcep-csit-3node-periodic-bgpclustering-ha-only-fluorine,
+bgpcep-csit-3node-bgpclustering-all-fluorine,
+bgpcep-csit-3node-bgpclustering-ha-only-fluorine,
 controller-csit-1node-akka1-all-fluorine,
-controller-csit-1node-periodic-benchmark-all-fluorine,
+controller-csit-1node-benchmark-all-fluorine,
 controller-csit-1node-rest-cars-perf-all-fluorine,
+controller-csit-3node-benchmark-all-fluorine,
 controller-csit-3node-clustering-all-fluorine,
-controller-csit-3node-periodic-benchmark-all-fluorine,
 controller-csit-3node-rest-clust-cars-perf-only-fluorine,
 daexim-csit-1node-basic-only-fluorine,
 daexim-csit-3node-clustering-basic-only-fluorine,
@@ -21,13 +21,13 @@ genius-csit-3node-upstream-all-fluorine,
 lispflowmapping-csit-1node-msmr-all-fluorine,
 lispflowmapping-csit-1node-performance-only-fluorine,
 lispflowmapping-csit-3node-msmr-all-fluorine,
-mdsal-csit-1node-periodic-bindingv1-only-fluorine,
+mdsal-csit-1node-bindingv1-only-fluorine,
 netconf-csit-1node-callhome-only-fluorine,
-netconf-csit-1node-periodic-scale-all-fluorine,
+netconf-csit-1node-scale-all-fluorine,
 netconf-csit-1node-userfeatures-all-fluorine,
 netconf-csit-3node-cluster-stress-all-fluorine,
 netconf-csit-3node-clustering-all-fluorine,
-netconf-csit-3node-periodic-clustering-scale-all-fluorine,
+netconf-csit-3node-clustering-scale-all-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine,
 netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine,
@@ -54,4 +54,4 @@ ovsdb-csit-1node-upstream-southbound-all-fluorine,
 ovsdb-csit-3node-upstream-clustering-only-fluorine,
 sfc-csit-3node-docker-full-deploy-all-fluorine,
 sfc-csit-3node-rest-basic-all-fluorine,
-yangtools-csit-1node-periodic-system-only-fluorine,
+yangtools-csit-1node-system-only-fluorine,
index 2263f3284940612c4cd1c749e6b70ea0963fba93..f6dfac0aa87cdbdaead69aa1317ad8e996184a2e 100644 (file)
@@ -2,18 +2,18 @@ aaa-csit-1node-authn-all-nitrogen,
 aaa-csit-1node-keystone-all-nitrogen,
 aaa-csit-1node-tls-only-nitrogen,
 alto-csit-1node-setup-all-nitrogen,
-bgpcep-csit-1node-periodic-bgp-ingest-all-nitrogen,
-bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-nitrogen,
-bgpcep-csit-1node-periodic-throughpcep-all-nitrogen,
+bgpcep-csit-1node-bgp-ingest-all-nitrogen,
+bgpcep-csit-1node-bgp-ingest-mixed-all-nitrogen,
+bgpcep-csit-1node-throughpcep-all-nitrogen,
 bgpcep-csit-1node-userfeatures-all-nitrogen,
-bgpcep-csit-3node-periodic-bgpclustering-all-nitrogen,
-bgpcep-csit-3node-periodic-bgpclustering-ha-only-nitrogen,
+bgpcep-csit-3node-bgpclustering-all-nitrogen,
+bgpcep-csit-3node-bgpclustering-ha-only-nitrogen,
 bier-csit-1node-basic-all-nitrogen,
 controller-csit-1node-akka1-all-nitrogen,
-controller-csit-1node-periodic-benchmark-all-nitrogen,
+controller-csit-1node-benchmark-all-nitrogen,
 controller-csit-1node-rest-cars-perf-all-nitrogen,
+controller-csit-3node-benchmark-all-nitrogen,
 controller-csit-3node-clustering-all-nitrogen,
-controller-csit-3node-periodic-benchmark-all-nitrogen,
 controller-csit-3node-rest-clust-cars-perf-only-nitrogen,
 daexim-csit-1node-basic-only-nitrogen,
 daexim-csit-3node-clustering-basic-only-nitrogen,
@@ -26,21 +26,21 @@ groupbasedpolicy-csit-1node-6node-all-nitrogen,
 groupbasedpolicy-csit-1node-openstack-ocata-openstack-nitrogen,
 groupbasedpolicy-csit-1node-sxp-only-nitrogen,
 groupbasedpolicy-csit-3node-clustering-all-nitrogen,
-l2switch-csit-1node-periodic-host-scalability-daily-only-nitrogen,
+l2switch-csit-1node-host-scalability-daily-only-nitrogen,
 l2switch-csit-1node-scalability-all-nitrogen,
 l2switch-csit-1node-switch-all-nitrogen,
 lispflowmapping-csit-1node-msmr-all-nitrogen,
 lispflowmapping-csit-1node-performance-only-nitrogen,
 lispflowmapping-csit-3node-msmr-all-nitrogen,
-mdsal-csit-1node-periodic-bindingv1-only-nitrogen,
+mdsal-csit-1node-bindingv1-only-nitrogen,
 messaging4transport-csit-1node-basic-all-nitrogen,
 nemo-csit-1node-engine-all-nitrogen,
 netconf-csit-1node-callhome-only-nitrogen,
-netconf-csit-1node-periodic-scale-all-nitrogen,
+netconf-csit-1node-scale-all-nitrogen,
 netconf-csit-1node-userfeatures-all-nitrogen,
 netconf-csit-3node-cluster-stress-all-nitrogen,
 netconf-csit-3node-clustering-all-nitrogen,
-netconf-csit-3node-periodic-clustering-scale-all-nitrogen,
+netconf-csit-3node-clustering-scale-all-nitrogen,
 netvirt-csit-1node-openstack-pike-sfc-nitrogen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen,
@@ -76,10 +76,10 @@ sfc-csit-3node-docker-full-deploy-all-nitrogen,
 sfc-csit-3node-rest-basic-all-nitrogen,
 sxp-csit-1node-basic-all-nitrogen,
 sxp-csit-1node-filtering-all-nitrogen,
-sxp-csit-1node-periodic-performance-all-nitrogen,
+sxp-csit-1node-performance-all-nitrogen,
 sxp-csit-1node-topology-all-nitrogen,
-sxp-csit-3node-periodic-clustering-all-nitrogen,
-sxp-csit-3node-periodic-routing-all-nitrogen,
+sxp-csit-3node-clustering-all-nitrogen,
+sxp-csit-3node-routing-all-nitrogen,
 topoprocessing-csit-1node-topology-operations-all-nitrogen,
 unimgr-csit-1node-basic-all-nitrogen,
 unimgr-csit-1node-legato-all-nitrogen,
@@ -87,4 +87,4 @@ usc-csit-1node-channel-all-nitrogen,
 usc-csit-1node-tcp-all-nitrogen,
 usecplugin-csit-1node-basic-all-nitrogen,
 vtn-csit-1node-openstack-pike-neutron-nitrogen,
-yangtools-csit-1node-periodic-system-only-nitrogen,
+yangtools-csit-1node-system-only-nitrogen,
index f0ce5ae5b63b58c7f509a0113a84370ea8254af9..63f8c3eedb2c92f0f7fde69b62c806e2b6ea620a 100644 (file)
@@ -2,18 +2,18 @@ aaa-csit-1node-authn-all-oxygen,
 aaa-csit-1node-keystone-all-oxygen,
 aaa-csit-1node-tls-only-oxygen,
 alto-csit-1node-setup-all-oxygen,
-bgpcep-csit-1node-periodic-bgp-ingest-all-oxygen,
-bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-oxygen,
-bgpcep-csit-1node-periodic-throughpcep-all-oxygen,
+bgpcep-csit-1node-bgp-ingest-all-oxygen,
+bgpcep-csit-1node-bgp-ingest-mixed-all-oxygen,
+bgpcep-csit-1node-throughpcep-all-oxygen,
 bgpcep-csit-1node-userfeatures-all-oxygen,
-bgpcep-csit-3node-periodic-bgpclustering-all-oxygen,
-bgpcep-csit-3node-periodic-bgpclustering-ha-only-oxygen,
+bgpcep-csit-3node-bgpclustering-all-oxygen,
+bgpcep-csit-3node-bgpclustering-ha-only-oxygen,
 bier-csit-1node-basic-all-oxygen,
 controller-csit-1node-akka1-all-oxygen,
-controller-csit-1node-periodic-benchmark-all-oxygen,
+controller-csit-1node-benchmark-all-oxygen,
 controller-csit-1node-rest-cars-perf-all-oxygen,
+controller-csit-3node-benchmark-all-oxygen,
 controller-csit-3node-clustering-all-oxygen,
-controller-csit-3node-periodic-benchmark-all-oxygen,
 controller-csit-3node-rest-clust-cars-perf-only-oxygen,
 daexim-csit-1node-basic-only-oxygen,
 daexim-csit-3node-clustering-basic-only-oxygen,
@@ -26,20 +26,20 @@ groupbasedpolicy-csit-1node-6node-all-oxygen,
 groupbasedpolicy-csit-1node-openstack-ocata-openstack-oxygen,
 groupbasedpolicy-csit-1node-sxp-only-oxygen,
 groupbasedpolicy-csit-3node-clustering-all-oxygen,
-l2switch-csit-1node-periodic-host-scalability-daily-only-oxygen,
+l2switch-csit-1node-host-scalability-daily-only-oxygen,
 l2switch-csit-1node-scalability-all-oxygen,
 l2switch-csit-1node-switch-all-oxygen,
 lispflowmapping-csit-1node-msmr-all-oxygen,
 lispflowmapping-csit-1node-performance-only-oxygen,
 lispflowmapping-csit-3node-msmr-all-oxygen,
-mdsal-csit-1node-periodic-bindingv1-only-oxygen,
+mdsal-csit-1node-bindingv1-only-oxygen,
 nemo-csit-1node-engine-all-oxygen,
 netconf-csit-1node-callhome-only-oxygen,
-netconf-csit-1node-periodic-scale-all-oxygen,
+netconf-csit-1node-scale-all-oxygen,
 netconf-csit-1node-userfeatures-all-oxygen,
 netconf-csit-3node-cluster-stress-all-oxygen,
 netconf-csit-3node-clustering-all-oxygen,
-netconf-csit-3node-periodic-clustering-scale-all-oxygen,
+netconf-csit-3node-clustering-scale-all-oxygen,
 netvirt-csit-1node-openstack-pike-sfc-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-oxygen,
 netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-oxygen,
@@ -72,10 +72,10 @@ sfc-csit-3node-docker-full-deploy-all-oxygen,
 sfc-csit-3node-rest-basic-all-oxygen,
 sxp-csit-1node-basic-all-oxygen,
 sxp-csit-1node-filtering-all-oxygen,
-sxp-csit-1node-periodic-performance-all-oxygen,
+sxp-csit-1node-performance-all-oxygen,
 sxp-csit-1node-topology-all-oxygen,
-sxp-csit-3node-periodic-clustering-all-oxygen,
-sxp-csit-3node-periodic-routing-all-oxygen,
+sxp-csit-3node-clustering-all-oxygen,
+sxp-csit-3node-routing-all-oxygen,
 tsdr-csit-1node-cassandra-datastore-only-oxygen,
 tsdr-csit-1node-elasticsearch-datastore-only-oxygen,
 tsdr-csit-1node-hbase-datastore-all-oxygen,
@@ -83,4 +83,4 @@ tsdr-csit-1node-hsqldb-datastore-all-oxygen,
 usc-csit-1node-channel-all-oxygen,
 usc-csit-1node-tcp-all-oxygen,
 vtn-csit-1node-openstack-pike-neutron-oxygen,
-yangtools-csit-1node-periodic-system-only-oxygen,
+yangtools-csit-1node-system-only-oxygen,
index 2a333dea772f553e762e41d85cdced555f814f81..35076e1fc09ad550a9f0feae86a256a093cd2522 100644 (file)
@@ -73,42 +73,50 @@ ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 # No need for verbose printing during repeating operations.
 set +x
 
-echo "Waiting for controller to come up..."
-COUNT=0
-while true; do
-    RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-    echo "${RESP}"
-    if [[ "${RESP}" == *"200"* ]]; then
-        echo Controller is UP
-        break
-    elif (( "${COUNT}" > 600 )); then
-        echo Timeout Controller DOWN
-        echo "Dumping Karaf log..."
-        cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
-    else
-        COUNT=$(( ${COUNT} + 1 ))
-        sleep 1
-        if [[ $(($COUNT % 5)) == 0 ]]; then
-            echo already waited ${COUNT} seconds...
-        fi
-    fi
-done
+function dump_log_and_exit {
+    echo "Dumping first 500K bytes of karaf log..."
+    head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Dumping last 500K bytes of karaf log..."
+    tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
+    exit 1
+}
 
-echo "loading many features at once.  Need to allow time for problems to show up in logs.  cool down for 5 min ..."
-COUNT="300"
-while true; do
-    if (( "${COUNT}" <= "0" )); then
-        break
-    fi
-    echo "${COUNT} seconds yet to wait..."
-    sleep 10
-    COUNT="$(( ${COUNT} - 10 ))"
-done
+echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
+if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
+    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
+    COUNT="0"
+    while true; do
+        COUNT=$(( ${COUNT} + 5 ))
+        sleep 5
+        echo "already waited ${COUNT} seconds..."
+        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
+        echo ${RESP}
+        if [[ ${RESP} == *"200"* ]]; then
+            echo "Controller is UP"
+            break
+        elif (( "${COUNT}" > "300" )); then
+            echo "Timeout Controller DOWN"
+            dump_log_and_exit
+        fi
+    done
+else
+    COUNT="0"
+    while true; do
+        COUNT=$(( ${COUNT} + 5 ))
+        sleep 5
+        echo "already waited ${COUNT} seconds..."
+        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
+            echo "Controller is UP"
+            break
+        elif (( "${COUNT}" > "300" )); then
+            echo "Timeout Controller DOWN"
+            dump_log_and_exit
+        fi
+    done
+fi
 
-# End of repeating operations, enable verbose printing.
 set -x
 
 # echo "Checking OSGi bundles..."
@@ -122,25 +130,13 @@ function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf.log file"
     if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "$1"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-        exit 1
+        dump_log_and_exit
     fi
 
     echo "looking for \"$1\" in karaf_console.log file"
     if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then
         echo ABORTING: found "$1"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-        exit 1
+        dump_log_and_exit
     fi
 }
 
index c81ac6db6734fd7472c28236fe801a4ead40a633..ba28c7f6474f5b0803d028a30156257aed4f27b2 100644 (file)
@@ -61,34 +61,51 @@ mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
-echo "Waiting for controller to come up..."
-COUNT=0
-while true; do
-    RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
-    echo "${RESP}"
-    if [[ "${RESP}" == *"200"* ]]; then
-        echo Controller is UP
-        break
-    elif (( "${COUNT}" > 600 )); then
-        echo Timeout Controller DOWN
-        echo "Dumping Karaf log..."
-        cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Listing all open ports on controller system"
-        netstat -pnatu
-        exit 1
-    else
-        COUNT=$(( ${COUNT} + 1 ))
-        sleep 1
-        if [[ $(($COUNT % 5)) == 0 ]]; then
-            echo already waited ${COUNT} seconds...
-        fi
-    fi
-done
+function dump_log_and_exit {
+    echo "Dumping first 500K bytes of karaf log..."
+    head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+    echo "Dumping last 500K bytes of karaf log..."
+    tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
+    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
+    cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
+    exit 1
+}
 
-echo "loading many features at once.  Need to allow time for problems to show up in logs.  cool down for 5 min ..."
-sleep 300
+echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..."
+if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; then
+    # Only oxygen and above have the infrautils.ready feature, so using REST API to determine if the controller is ready.
+    COUNT="0"
+    while true; do
+        COUNT=$(( ${COUNT} + 5 ))
+        sleep 5
+        echo "already waited ${COUNT} seconds..."
+        RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)"
+        echo ${RESP}
+        if [[ ${RESP} == *"200"* ]]; then
+            echo "Controller is UP"
+            break
+        elif (( "${COUNT}" > "300" )); then
+            echo "Timeout Controller DOWN"
+            dump_log_and_exit
+        fi
+    done
+else
+    COUNT="0"
+    while true; do
+        COUNT=$(( ${COUNT} + 5 ))
+        sleep 5
+        echo "already waited ${COUNT} seconds..."
+        if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
+            echo "Controller is UP"
+            break
+        elif (( "${COUNT}" > "300" )); then
+            echo "Timeout Controller DOWN"
+            dump_log_and_exit
+        fi
+    done
+fi
 
-echo "Checking OSGi bundles..."
+echo "Checking OSGi bundles..."
 # sshpass seems to fail with new karaf version
 # sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
@@ -99,25 +116,13 @@ function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf.log file"
     if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "$1"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-        exit 1
+        dump_log_and_exit
     fi
 
     echo "looking for \"$1\" in karaf_console.log file"
     if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then
         echo ABORTING: found "$1"
-        echo "Dumping first 500K bytes of karaf log..."
-        head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-        echo "Dumping last 500K bytes of karaf log..."
-        tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" .
-        cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" .
-        exit 1
+        dump_log_and_exit
     fi
 }
 
index 1ffd0ea7d9d4680920ff929e00d312b5aa9b1f91..78ba3a4b6d012c4f2dc123b42f0c296fa934b8db 100644 (file)
@@ -1,14 +1,11 @@
 ---
-- project:
-    name: distribution-jobs
-
 - job-template:
     name: 'distribution-verify-{stream}'
 
     project-type: freestyle
     node: centos7-builder-8c-8g
     concurrent: true
-    jdk: '{jre}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
-      - integration-patch-refspec:
-          branch: '$GERRIT_REFSPEC'
 
     scm:
       - gerrit-trigger-scm:
-          refspec: '$PATCHREFSPEC'
+          refspec: '$GERRIT_REFSPEC'
           choosing-strategy: 'gerrit'
 
     wrappers:
           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
               -Dstream={stream}
               -Dsft.heap.max=4g
+              -Pmanaged -Punmanaged
               {opendaylight-infra-mvn-opts}
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
           java-opts:
@@ -67,7 +63,7 @@
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
 
 - job-template:
     name: 'distribution-merge-{stream}'
@@ -79,7 +75,7 @@
 
     project-type: maven
     node: 'centos7-builder-8c-8g'
-    jdk: '{jre}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
     triggers:
       - gerrit-trigger-patch-merged:
           gerrit-server-name: '{gerrit-server-name}'
-          name: 'integration/distribution'
+          name: '{project}'
           branch: '{branch}'
 
     prebuilders:
           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
           -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
           -Dsft.heap.max=4g
           -Djenkins -Dmerge -Dstream={stream}
+          -Pmanaged -Punmanaged
       maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-      settings: 'integration-settings'
+      settings: integration-settings
       settings-type: cfp
-      global-settings: 'global-settings'
+      global-settings: global-settings
       global-settings-type: cfp
 
     postbuilders:
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: deploy-site.xml
-          condition-basedir: workspace
-
-          # The strategy here is intentional to run Maven site:deploy twice
-          # once using regular pom.xml to produce a staged-site which is
-          # then used by deploy-site.xml to push to Nexus. This is a
-          # workaround to Maven Site's default linking code which creates
-          # incorrect URLs for sites due to auto-detection assuming your
-          # project is configured in a certain way which ODL is not.
-          steps:
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: pom.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: 'integration-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
-            - maven-target:
-                maven-version: 'mvn33'
-                pom: deploy-site.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                  - '-Xmx2g'
-                settings: 'integration-settings'
-                settings-type: cfp
-                global-settings: 'global-settings'
-                global-settings-type: cfp
       - integration-compare-distributions
     # TODO: the output of the above command is not *friendly* for the reader because the most important info
     # is listed last. This is fine/best for command line output, but for keeping in a file it would be better
       - lf-infra-publish
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
 
 - job-template:
     name: 'distribution-check-{stream}'
     # Default parameters #
     ######################
 
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - integration-distribution-branch:
           branch: '{branch}'
       - integration-bundle-url:
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
-          email-prefix: '[int/dist]'
+          email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
index e7c0746e20a258cc8fb49fbdc7066239f14e8445..dc2f73aa66006f495b762a99c7ebd89488f677f3 100644 (file)
@@ -10,7 +10,7 @@
     ######################
 
     java-version: openjdk8
-    mvn-version: mvn33
+    mvn-version: mvn35
 
     #####################
     # Job Configuration #
@@ -37,6 +37,8 @@
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - distribution-karaf-version:
index ee18f254061a97139c1158faee4ee820f26b3810..f0ba1efc4129f64e729f092ddb405c296460729f 100644 (file)
@@ -69,7 +69,7 @@ echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
 echo "Adding external repositories..."
-sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
 cat ${MAVENCONF}
 
 echo "Configuring the startup features..."
@@ -81,6 +81,9 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
 fi
 
 sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
 cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
index 423420abafcc83088b3528a21f1bd92edd098610..f4d56ac2def12c4b64bbc8790608a04188dba5a2 100644 (file)
@@ -56,7 +56,7 @@ echo "Extracting the new controller..."
 unzip -q ${BUNDLE}
 
 echo "Adding external repositories..."
-sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
+sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
 cat ${MAVENCONF}
 
 if [[ "$USEFEATURESBOOT" == "True" ]]; then
@@ -70,6 +70,9 @@ if [[ "$KARAF_VERSION" == "karaf4" ]]; then
 fi
 
 sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
+if [[ ! -z "${REPO_URL}" ]]; then
+   sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF}
+fi
 cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
index 6a0e9463b27b86896206a96c6ab23ef82f3e7709..7b5f690be96621b6835d104e8a8ce824167bad3c 100644 (file)
@@ -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})
index c5c8125f66263c59a18c5721882771c42f5b38fc..3933b0cd989e42049a612d199baf83f0da891530 100644 (file)
           default: '{bundle-url}'
           description: 'URL to karaf distribution zip'
 
+- parameter:
+    name: integration-repo-url
+    parameters:
+      - string:
+          name: REPO_URL
+          default: '{repo-url}'
+          description: 'URL to feature repo artifact'
+
 - parameter:
     name: integration-jdk-version
     parameters:
index bac9e13d229c5471cff74a1a0976c5725fa44393..7bc5e1e0068c416e661a3053f09c637c71bb18f4 100644 (file)
@@ -3,10 +3,8 @@
 # FIXME: Update
 #
 # {project}-csit-1node-{functionality}-{install}-{stream}
-# {project}-csit-1node-periodic-{functionality}-{install}-{stream}
 # {project}-csit-3node-docker-{functionality}-{install}-{stream}
 # {project}-csit-3node-{functionality}-{install}-{stream}
-# {project}-csit-3node-periodic-{functionality}-{install}-{stream}
 # {project}-csit-hwvtep-{topology}-openstack-{openstack}-{functionality}-{stream}
 # {project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}
 # {project}-csit-verify-1node-{functionality}
@@ -56,6 +54,8 @@
           stream: '{verify-stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           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:
       - integration-deploy-controller-run-test
       - integration-cleanup-tmp
 
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
-            series:
-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '5400'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
-            series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - lf-infra-publish
-
-- job-template:
-    name: '{prefix}{project}-csit-1node-periodic-{functionality}-{install}-{stream}'
-    id: inttest-csit-1node-periodic
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: '{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
-      - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
-      - integration-test-suites:
-          test-suites: '{test-suites}'
-      - integration-patch-refspec:
-          branch: 'master'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '1'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-install-common-functions
-      - integration-deploy-controller-run-test
-      - integration-cleanup-tmp
-
     publishers:
       - integration-robot:
           unstable-if: 0.0
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-periodic-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
             series:
               - file: '{03-plot-data-file}'
                 inclusion-flag: '{03-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
             series:
               - file: '{04-plot-data-file}'
                 inclusion-flag: '{04-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
             series:
               - file: '{05-plot-data-file}'
                 inclusion-flag: '{05-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
             series:
               - file: '{06-plot-data-file}'
                 inclusion-flag: '{06-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
             series:
               - file: '{07-plot-data-file}'
                 inclusion-flag: '{07-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
             series:
               - file: '{08-plot-data-file}'
                 inclusion-flag: '{08-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
             series:
               - file: '{09-plot-data-file}'
                 inclusion-flag: '{09-inclusion-flag}'
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-1node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            csv-file-name: '{project}-csit-1node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
             series:
               - file: '{10-plot-data-file}'
                 inclusion-flag: '{10-inclusion-flag}'
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           stream: '{verify-stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: 'only'
       - integration-controller-features:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           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:
           - title: '{01-plot-title}'
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
-            num-builds: '5400'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
+            # yamllint disable-line rule:line-length
             csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
           - title: '{02-plot-title}'
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
-            num-builds: '5400'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
+            # yamllint disable-line rule:line-length
             csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - lf-infra-publish
-
-- job-template:
-    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
-    id: inttest-csit-3node-docker
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: '{branch}'
-      - integration-distribution-stream:
-          stream: '{stream}'
-      - integration-bundle-url:
-          bundle-url: '{bundle-url}'
-      - integration-controller-scope:
-          controller-scope: '{scope}'
-      - integration-controller-features:
-          controller-features: 'odl-jolokia,{install-features}'
-      - integration-test-options:
-          test-options: '{robot-options}'
-      - integration-stream-test-plan:
-          stream-test-plan: '{project}-{functionality}-{stream}.txt'
-      - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
-      - integration-patch-refspec:
-          branch: 'master'
-      - integration-jdk-version:
-          jdkversion: '{jre}'
-      - distribution-karaf-version:
-          karaf-version: '{karaf-version}'
-      - integration-use-features-boot:
-          use-features-boot: 'True'
-
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - integration-infra-stack:
-          stack-template: '{stack-template}'
-          vm_0_count: '3'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{docker_system_count}'
-          vm_1_flavor: '{docker_system_flavor}'
-          vm_1_image: '{docker_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-install-common-functions
-      - integration-configure-clustering
-      - integration-start-cluster-run-test
-      - integration-cleanup-tmp
-
-    publishers:
-      - integration-robot:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - plot:
-          - title: '{01-plot-title}'
-            yaxis: '{01-plot-yaxis}'
-            group: '{01-plot-group}'
-            num-builds: '5400'
+          - title: '{03-plot-title}'
+            yaxis: '{03-plot-yaxis}'
+            group: '{03-plot-group}'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
             series:
-              - file: '{01-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
+              - file: '{03-plot-data-file}'
+                inclusion-flag: '{03-inclusion-flag}'
+                exclude: '{03-exclude-value}'
                 format: csv
-          - title: '{02-plot-title}'
-            yaxis: '{02-plot-yaxis}'
-            group: '{02-plot-group}'
-            num-builds: '5400'
+          - title: '{04-plot-title}'
+            yaxis: '{04-plot-yaxis}'
+            group: '{04-plot-group}'
+            num-builds: '180'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
             series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
+              - file: '{04-plot-data-file}'
+                inclusion-flag: '{04-inclusion-flag}'
+                exclude: '{04-exclude-value}'
+                format: csv
+          - title: '{05-plot-title}'
+            yaxis: '{05-plot-yaxis}'
+            group: '{05-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
+            series:
+              - file: '{05-plot-data-file}'
+                inclusion-flag: '{05-inclusion-flag}'
+                exclude: '{05-exclude-value}'
+                format: csv
+          - title: '{06-plot-title}'
+            yaxis: '{06-plot-yaxis}'
+            group: '{06-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
+            series:
+              - file: '{06-plot-data-file}'
+                inclusion-flag: '{06-inclusion-flag}'
+                exclude: '{06-exclude-value}'
+                format: csv
+          - title: '{07-plot-title}'
+            yaxis: '{07-plot-yaxis}'
+            group: '{07-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
+            series:
+              - file: '{07-plot-data-file}'
+                inclusion-flag: '{07-inclusion-flag}'
+                exclude: '{07-exclude-value}'
+                format: csv
+          - title: '{08-plot-title}'
+            yaxis: '{08-plot-yaxis}'
+            group: '{08-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
+            series:
+              - file: '{08-plot-data-file}'
+                inclusion-flag: '{08-inclusion-flag}'
+                exclude: '{08-exclude-value}'
+                format: csv
+          - title: '{09-plot-title}'
+            yaxis: '{09-plot-yaxis}'
+            group: '{09-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
+            series:
+              - file: '{09-plot-data-file}'
+                inclusion-flag: '{09-inclusion-flag}'
+                exclude: '{09-exclude-value}'
+                format: csv
+          - title: '{10-plot-title}'
+            yaxis: '{10-plot-yaxis}'
+            group: '{10-plot-group}'
+            num-builds: '180'
+            keep-records: true
+            style: line
+            use-description: false
+            # yamllint disable-line rule:line-length
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
+            series:
+              - file: '{10-plot-data-file}'
+                inclusion-flag: '{10-inclusion-flag}'
+                exclude: '{10-exclude-value}'
                 format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
-    name: '{prefix}{project}-csit-3node-periodic-{functionality}-{install}-{stream}'
-    id: inttest-csit-3node-periodic
+    name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-docker
     disabled: false
 
     project-type: freestyle
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-scope:
           controller-scope: '{scope}'
       - integration-controller-features:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
-      - integration-test-suites:
-          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
           vm_0_count: '3'
           vm_0_flavor: '{odl_system_flavor}'
           vm_0_image: '{odl_system_image}'
-          vm_1_count: '{tools_system_count}'
-          vm_1_flavor: '{tools_system_flavor}'
-          vm_1_image: '{tools_system_image}'
+          vm_1_count: '{docker_system_count}'
+          vm_1_flavor: '{docker_system_flavor}'
+          vm_1_image: '{docker_system_image}'
       - integration-install-robotframework
       - inject:
           properties-file: 'env.properties'
           - title: '{01-plot-title}'
             yaxis: '{01-plot-yaxis}'
             group: '{01-plot-group}'
-            num-builds: '180'
+            num-builds: '5400'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{01-plot-data-file}-history.csv'
             series:
               - file: '{01-plot-data-file}'
                 inclusion-flag: 'off'
           - title: '{02-plot-title}'
             yaxis: '{02-plot-yaxis}'
             group: '{02-plot-group}'
-            num-builds: '180'
+            num-builds: '5400'
             keep-records: true
             style: line
             use-description: false
             # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
+            csv-file-name: '{project}-csit-3node-{functionality}-{install}-{stream}-{02-plot-data-file}-history.csv'
             series:
               - file: '{02-plot-data-file}'
                 inclusion-flag: 'off'
                 display-table: true
                 format: csv
-          - title: '{03-plot-title}'
-            yaxis: '{03-plot-yaxis}'
-            group: '{03-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{03-plot-data-file}-03-history.csv'
-            series:
-              - file: '{03-plot-data-file}'
-                inclusion-flag: '{03-inclusion-flag}'
-                exclude: '{03-exclude-value}'
-                format: csv
-          - title: '{04-plot-title}'
-            yaxis: '{04-plot-yaxis}'
-            group: '{04-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{04-plot-data-file}-04-history.csv'
-            series:
-              - file: '{04-plot-data-file}'
-                inclusion-flag: '{04-inclusion-flag}'
-                exclude: '{04-exclude-value}'
-                format: csv
-          - title: '{05-plot-title}'
-            yaxis: '{05-plot-yaxis}'
-            group: '{05-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{05-plot-data-file}-05-history.csv'
-            series:
-              - file: '{05-plot-data-file}'
-                inclusion-flag: '{05-inclusion-flag}'
-                exclude: '{05-exclude-value}'
-                format: csv
-          - title: '{06-plot-title}'
-            yaxis: '{06-plot-yaxis}'
-            group: '{06-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{06-plot-data-file}-06-history.csv'
-            series:
-              - file: '{06-plot-data-file}'
-                inclusion-flag: '{06-inclusion-flag}'
-                exclude: '{06-exclude-value}'
-                format: csv
-          - title: '{07-plot-title}'
-            yaxis: '{07-plot-yaxis}'
-            group: '{07-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{07-plot-data-file}-07-history.csv'
-            series:
-              - file: '{07-plot-data-file}'
-                inclusion-flag: '{07-inclusion-flag}'
-                exclude: '{07-exclude-value}'
-                format: csv
-          - title: '{08-plot-title}'
-            yaxis: '{08-plot-yaxis}'
-            group: '{08-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{08-plot-data-file}-08-history.csv'
-            series:
-              - file: '{08-plot-data-file}'
-                inclusion-flag: '{08-inclusion-flag}'
-                exclude: '{08-exclude-value}'
-                format: csv
-          - title: '{09-plot-title}'
-            yaxis: '{09-plot-yaxis}'
-            group: '{09-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{09-plot-data-file}-09-history.csv'
-            series:
-              - file: '{09-plot-data-file}'
-                inclusion-flag: '{09-inclusion-flag}'
-                exclude: '{09-exclude-value}'
-                format: csv
-          - title: '{10-plot-title}'
-            yaxis: '{10-plot-yaxis}'
-            group: '{10-plot-group}'
-            num-builds: '180'
-            keep-records: true
-            style: line
-            use-description: false
-            # yamllint disable-line rule:line-length
-            csv-file-name: '{project}-csit-3node-periodic-{functionality}-{install}-{stream}-{10-plot-data-file}-10-history.csv'
-            series:
-              - file: '{10-plot-data-file}'
-                inclusion-flag: '{10-inclusion-flag}'
-                exclude: '{10-exclude-value}'
-                format: csv
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-controller-debug-map:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 - job-template:
           stream: '{stream}'
       - integration-bundle-url:
           bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
       - integration-controller-features:
           controller-features: '{install-features}'
       - integration-controller-debug-map:
           email-prefix: '[{project}]'
       - integration-csit-archive-build
       - integration-csit-run-postscript
+      - releng-openstack-stack-delete
       - lf-infra-publish
 
 # Template: {project}-patch-test-{stream}
           default: 'all'
           description: 'Specific feature test for patch'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
       - 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
           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
index cf298ca5ae6ed7456cba141ec85f9ad892681dff..97d882d1c4939d68b4baa8e9cd32b4e65f424663 100644 (file)
@@ -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:
     name: 'integration-sanity-test-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
       - integration-distribution-git-url:
           git-url: '{git-url}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     scm:
       - integration-gerrit-scm:
           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
           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
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: mvn35
 
     wrappers:
       - opendaylight-infra-wrappers:
     name: 'integration-distribution-weekly-test-trigger-{stream}'
 
     project-type: freestyle
-    node: centos7-robot-2c-8g
+    node: queue-intque-2c-1g
 
     properties:
       - opendaylight-infra-properties:
     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:
index e9e2bdf828c28cf9075947fde2c66a9a83e2e17d..39cdbeca55cd1f1a9bf5ebf0810f3086a42cf8ca 100644 (file)
@@ -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
index 7ebc16da4c9f0e966c549dec3cdf173a9406a092..3a29a05cafa30e88b667f458a1f1dedbb20f3346 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: iotdm-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index fc55dafa03dd7970051343b35823680e79efbafd..63be624c0097db7ffe7e0a597fa62b8345630ef2 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: l2switch-csit-host-scalability-daily
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'l2switch'
index 472071b54339143d7492abb7aa7f078135a9f3b4..fd3e64984569a54c09f736cfcdc2fce44c8f9c7f 100644 (file)
@@ -22,6 +22,6 @@
     feature:
       - all:
           csit-list: >
-              l2switch-csit-1node-periodic-host-scalability-daily-only-{stream},
+              l2switch-csit-1node--host-scalability-daily-only-{stream},
               l2switch-csit-1node-scalability-all-{stream},
               l2switch-csit-1node-switch-all-{stream}
index e2955c1019f0da4693fa73af00f9fa2607c565fb..3792df73364a4a909e27c85f1bb1436048c046ab 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: l2switch-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index c089d6123237479e1a01b2e15d9f561c0f6e4426..850c4a52438f7d4c44859ec8e9e94caee319c0db 100644 (file)
@@ -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
@@ -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
+
index 01b9e23baeac5cfe2e4db75c1694e8e92eae0e4c..e9a27a52a02908e2c60efa21b82a9401412cf4bb 100644 (file)
@@ -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'
index 6e6075725bc66d2f70435c4a46ee9ffd77b30e3b..6a6cb9b2ef5bdba66c05916b4bd8abe3515fbf1e 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: mdsal-csit-bindingv1
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'mdsal'
@@ -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'
index b27a82795bc1e8cc8f233b95247b749cbe6bbb12..e9c9b085837e0ef46df0b646dc0c9bacef690ec3 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: messaging4transport-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 5bffab7480d0849e7014a99e2589fc62631d4f66..b0d5a86296c443e24db5c1d76c9ff61c39f5a17f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: natapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 49d944258f209364dd48b6d9a84811610cf8388e..61564eb05cef802a56ac681f8ffd5a36d9f642ce 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: nemo-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 46ad660fc362e6890dfddee8cec4d654d7e90e38..9b992e5760cdd4e3ac0353364ab82d619916336d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-clustering-scale
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'netconf'
index 0b5bc974e7987e789f4f50c49fe41ec36a12e846..b736bc20a33480c5c9f977417900cd0b90c54604 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netconf-csit-scale
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'netconf'
@@ -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
index 732afd3c1c5b44f700b1e917dba04bc976c1aad3..38965fcfcb73b1d211d6e968d3c305fa9a45a6aa 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: netide-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 6aff8bf1e395f776d70937a027d96aa92f2ad959..ad9aefa2c9968dd6c8bb2827e60fa1632f366763 100644 (file)
@@ -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
 
     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
 
     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
 
index d889e5838abe2809aa92cccea95f7adfef4cd9ce..02475d741d793ed0b7799d9af5b7e687d900bab4 100644 (file)
@@ -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:
     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:
     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:
 
     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:
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
@@ -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}
index b160dc6d3623499cd2966fdbaf70d29ba6878162..7303620545f5abb5ae9a8ed6f6465dc35e561965 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: next-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index bf200779bc98a87860e09ecf472cf05540f1e5c1..0502ea4a623c4c2ce943c5d9035c977f591eba43 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: nic-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index f9e55c810e20df10dc2c535d6853573105b896b6..a9e86a85b755ffbf81c4f99b047c0ac22c304f43 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: ocpplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
diff --git a/jjb/odl-openstack-cleanup-stale-volumes.sh b/jjb/odl-openstack-cleanup-stale-volumes.sh
new file mode 100644 (file)
index 0000000..09f7a52
--- /dev/null
@@ -0,0 +1,29 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Scans OpenStack for orphaned volumes
+
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
+mapfile -t os_volumes < <(openstack volume list -f value -c ID --status Available)
+deactivate
+
+# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
+source "/tmp/v/lftools/bin/activate"
+echo "---> Orphaned volumes"
+if [ ${#os_volumes[@]} -eq 0 ]; then
+    echo "No orphaned volumes found."
+else
+    for volume in "${os_volumes[@]}"; do
+        echo "Removing volume $volume"
+        lftools openstack --os-cloud vex volume remove --minutes 15 "$volume"
+    done
+fi
+deactivate
index c7a309ad8e9e4db2986732970f528c30b095e3ff..0d918badf99a051eba268eed18fcf668ee4f7c3f 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: of-config-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
similarity index 94%
rename from jjb/opflex/opflex-dependencies.yaml
rename to jjb/opflex/opflex-thirdparty-dependencies.yaml
index b772ead2e8fb6b2d6f17129aea1e0bb871423f14..516fa7195bbbafea562720f5ec85d511bac1e3d4 100644 (file)
@@ -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
       - lf-infra-publish
 
 - job-template:
-    name: 'opflex-openvswitch-{stream}'
+    name: 'opflex-thirdparty-openvswitch-{stream}'
 
     project-type: freestyle
     node: centos7-builder-2c-8g
index 90802ab7385a9fa728cac918291c36510459e038..05c04d96781b7035e862e796e7d7e25caa11e0f6 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: p4plugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 3755c7c51e9e6e199612151b005f00e02aa3e84e..56dd06a9dba802e92841ec26ed3e955957b606c8 100644 (file)
       - install-test-uninstall-rpm
 
       # Test Oxygen pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2106/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2131/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180305.133042-180.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.1-SNAPSHOT/karaf-0.8.1-20180417.030111-15.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180305.151247-2.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180408.212935-2.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.3-SNAPSHOT/karaf-0.7.3-20180305.153647-3.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.3-SNAPSHOT/karaf-0.7.3-20180408.214158-1.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2106/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2131/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180305.133042-180.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.1-SNAPSHOT/karaf-0.8.1-20180417.030111-15.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
index 14a83cd2283ed95041c31c3b7f03f4c0f477bb7f..bba23473590e8ea3bc4feedb5d0fac61b27825eb 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: packetcable-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index cc31c2a77e0a60d0194309980e1f2a4595132b11..0c37c0bb49b0f58c9bb7b6367d5518252bce164b 100644 (file)
 
     # Distribution bundle URL
     bundle-url: 'last'
+    repo-url: ''
 
     # CSIT images configuration
     openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
     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_image: ZZCI - CentOS 7 - docker - 20180109-0346
+    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
index 0dd4d44aaf6a948c43f954617ae8a301e23dc3aa..bb78183ea4891f7e561f6b0bb1b47d38111a60a9 100644 (file)
     name: builder-openstack-cron
     project-type: freestyle
     node: '{build-node}'
+    concurrent: true
 
     properties:
       - lf-infra-properties:
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
       - odl-openstack-cleanup-orphaned-nodes
+      # Volumes
+      - odl-openstack-cleanup-stale-volumes
       # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images
index 1a38abbcd43d8005d2176eeef43a14e78c951a27..f34d5aa7e19bb2e90792f4da3e2102c990f62d1f 100644 (file)
     builders:
       - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh
 
+- builder:
+    name: odl-openstack-cleanup-stale-volumes
+    builders:
+      - shell: !include-raw: odl-openstack-cleanup-stale-volumes.sh
+
 - builder:
     # Deploys a maven site to Nexus using lftools nexus-zip command
     name: opendaylight-infra-deploy-maven-site
                 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:
index 89869dccde90eadd01f22ddc581100b9154c8f4f..3f001989e03f86ceb4dfe49d45be272709dfb94e 100644 (file)
@@ -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}
       **/target/**/feature.xml
       **/target/failsafe-reports/failsafe-summary.xml
       **/target/surefire-reports/*-output.txt
+    cron: 'H H * * 0'
     mvn-opts: ''
-    mvn-version: mvn33
+    mvn-version: mvn35
     java-version: openjdk8
 
     #####################
           build-timeout: '{build-timeout}'
 
     triggers:
-      - timed: 'H H * * 0'
+      - timed: '{obj:cron}'
       - gerrit-trigger-patch-merged:
           gerrit-server-name: '{gerrit-server-name}'
           name: '{project}'
index 4a5eef8b18b0526a452a73e63e7c7b1bdea22090..d830b59a8bd9aa607117d224057c92ee49f5d3c6 100644 (file)
@@ -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
       - 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}'
           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'
 
index d14de626599d1740443b8149ac1b788265d21730..a9dd8c51fcceb8d1a76a9b6dbed0139ecaf17a2e 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: sdninterfaceapp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index f9ecd01f649f73a69225107c4cd71346fcb1171e..86c6be31cf5823c1f9386433da32a28e821ed322 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: snbi-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 4a5c47d15e91d55e2b194ad9f9ea6ff6f89d9d48..5eb654f4872f03b958b8ab8319d807fcae936f82 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: snmp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 1ad2b6a864bd6f71ff1cebb2a1798402a1fbae23..9d07ce18bc6c63d5b0ef2c6597dfb787144b210e 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: snmp4sdn-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 00cbb34b56daea39ce6cc38c371d59cc00a99a5e..32f2fea771e467af5543570f75020b2254fb4b65 100644 (file)
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 36f1dd602a2ddfa7e0863e0020230f64dccdb150..d7b95d23c39cda248e2cde1e89081e4975e27402 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-routing
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'sxp'
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index e337efc73f05463c3e3a2d374ffca3f894585aa6..7404e0b81caf58695110b1951cca966efcebf83c 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-clustering
     jobs:
-      - inttest-csit-3node-periodic
+      - inttest-csit-3node
 
     # The project name
     project: 'sxp'
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 5325dea6d6c5c53aeb302b4a89ade204fd73cfac..1c18ccd314298a46970f952e1d1b14ab65838686 100644 (file)
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 377d24949a6590c7942330462c549161c28e5c33..954ab23cab2878565f51116168a1f34d1ec141ab 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: sxp-csit-performance
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'sxp'
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 74147dfdde57e17dd1fd6f71d808c85f27e2e193..28abaf89d3d86ccf7bf4f78a1e7044cb6dc931a6 100644 (file)
@@ -16,7 +16,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 08b5b7556db68a1ae56d50399cb0de0d33ca65c4..e3bb0b8768584d1062d74d721ca9910c8fdaaf5a 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: sxp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 75a34f5a7c2e276fbceee18b67745ddbdc00b104..c28c14e24414f4effefa8e4b52cd512886132dfd 100644 (file)
@@ -3,7 +3,6 @@
     name: telemetry-fluorine
     jobs:
       - 'odl-maven-jobs'
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
 
     stream: fluorine
index 8aacb504110802c81b455ff521d4aa3eae1d480f..b2a84b5d70163a3cfef8806057939b8b9a657112 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: topoprocessing-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 04bd66db352550e77110f8d02aa185b36a1961f7..a213d46d0ae4dae8b0d66dc2b24669d724cf1cc0 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: tsdr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 323a75b8aaf19e1f4f490b7711e32bbb6b68f137..0d06e7e91d32d50246a7ec8803795295a63d4299 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: ttp-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index e53712d932f9d646d844ffff372823711a9b7aee..5a73394ed6ae8f4f3037a62c4c7965dbceb6256d 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: unimgr-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 4c418656e22e0e01777d98b44e28f8efc87be261..a43ce024c75d3beacfa16ac30e0d9b54d77e94ad 100644 (file)
@@ -17,7 +17,7 @@
           branch: 'master'
           trigger-jobs: '{project}-merge-{stream}'
           # yamllint disable-line rule:line-length
-          bundle-url: 'https://jenkins.opendaylight.org/releng/view/usc/job/usc-merge-fluorine/lastBuild/org.opendaylight.usc$usc-karaf/artifact/org.opendaylight.usc/usc-karaf/1.6.0-SNAPSHOT/usc-karaf-1.6.0-SNAPSHOT.zip'
+          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 46781e36cd802e089f67054a426ccca268e12ae3..ca04c7f2d62aa361e2280c09a8ada5a273d7b189 100644 (file)
@@ -15,6 +15,8 @@
     stream:
       - fluorine:
           branch: 'master'
+          # yamllint disable-line rule:line-length
+          repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features'
       - oxygen:
           branch: 'stable/oxygen'
       - nitrogen:
index 772a8d932797bc59816592abedd581a0be2fd931..b11b299d81546a4a19b9679df86399bcf8e23b47 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: usc-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 459dccd32c83b02055ace6717e379e6483441240..32263d804e0950efcde13677dccf806070b68c2d 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: usecplugin-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index 6fd69d8202b8c116b300a46c2ab4f1bab1dc8a6f..e82edbe73d652e5a3b6646b783c845e3bc6a1f19 100644 (file)
@@ -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'
index 9d47eaf4cd03f63aa67264410098c7601f4fc7a4..ef91bab075093f191771a6590e3932fdd6b8d9aa 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: vtn-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index da08c4bdd5dbbad411c0c0d265bc64ebd8ec86a7..8a775119ab876e765c251237c39c817bddd2a9a4 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: yang-push-fluorine
     jobs:
-      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     stream: fluorine
index f27bc5f50ddab57e60023648e13f6d8e5060da16..52320ec7e4ffae063cddd3b5bfc657a97b4123c6 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: yangtools-csit-system
     jobs:
-      - inttest-csit-1node-periodic
+      - inttest-csit-1node
 
     # The project name
     project: 'yangtools'
index f4cbb5cddf416214c37a02a1405aaae91a0b238b..6fbab522c4999d80152f0b4c18029eabb5e00496 100644 (file)
@@ -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
index 7881b130653f62b3d8018d4b16431b60b68ba43b..0e9fd5f889be88216632248f7520c156a5b7b6f0 100644 (file)
@@ -13,7 +13,7 @@
     hbase_version: 0.94.27
 
   pre_tasks:
-    - include_role: name=system-update
+    - include_role: name=lfit.system-update
 
   roles:
     - mono-install
index 919ba279a8c2414924e71d90826d908edb091bf1..0d0e1142c15058b3b09171fbc070d475e93f3f6d 100644 (file)
@@ -6,7 +6,7 @@
   become_method: sudo
 
   pre_tasks:
-    - include_role: name=system-update
+    - include_role: name=lfit.system-update
 
   post_tasks:
     - name: System Reseal
index e85baf21ef71ba49af618c11904324726ac255bf..f07daa8a1f7da9206f4fc9eb4313ef5dc7c3f267 100644 (file)
@@ -9,7 +9,7 @@
     ovs_version: 2.8.1
 
   pre_tasks:
-    - include_role: name=system-update
+    - include_role: name=lfit.system-update
 
   tasks:
     - name: 'Install OpenVSwitch {{ovs_version}}'