Merge "Update AR version bump jobs to 4c-16g"
authorSam Hague <shague@redhat.com>
Fri, 23 Feb 2018 12:25:39 +0000 (12:25 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Fri, 23 Feb 2018 12:25:39 +0000 (12:25 +0000)
138 files changed:
.coafile
docs/cloud-images.rst
docs/jenkins.rst
jenkins-config/global-vars-releng.sh [new file with mode: 0644]
jenkins-config/global-vars-sandbox.sh [new file with mode: 0644]
jenkins-scripts/jenkins-init-script.sh
jjb/aaa/aaa-csit-keystone.yaml
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/validate-autorelease-oxygen.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.yaml
jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
jjb/bgpcep/bgpcep-csit-throughpcep.yaml
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe.yaml
jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml
jjb/controller/controller-csit-periodic-dsbenchmark.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius.yaml
jjb/global-jjb
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/common-functions.sh
jjb/integration/copy-common-functions.sh
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-macros.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-get-slave-addresses.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/integration4-templates.yaml [deleted file]
jjb/integration/multipatch-distribution.sh
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal-csit-bindingv1.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-scale.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-full-integration.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-cleanup-orphaned-nodes.sh
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/opendaylight-infra-stack.sh
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
jjb/openflowplugin/openflowplugin-csit-scale.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-custom.yaml
jjb/opflex/opflex.yaml
jjb/ovil/ovil.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-patch-test.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/packaging-macros.yaml
jjb/packaging/packaging.yaml
jjb/packaging/test-karaf.expect
jjb/packaging/test-ports-nofeature.sh [new file with mode: 0644]
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-defaults.yaml
jjb/releng-jobs.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml
jjb/reservation/reservation.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/topoprocessing/topoprocessing.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.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/yangide/yangide.yaml
jjb/yangtools/yangtools-csit-system.yaml
jjb/yangtools/yangtools.yaml
lf-ansible
packer/common-packer
packer/provision/local-builder.yaml [moved from packer/provision/builder.yaml with 100% similarity]
packer/provision/local-docker.yaml [new file with mode: 0644]
packer/templates/builder.json [changed from file to symlink]
packer/templates/docker.json

index 47cf0afb0b62d28f3efad57549d4f6ee72186348..f087a8e75323cbb718dfec277f19972ec4eaa01d 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -31,6 +31,7 @@ files = **.sh
 ignore = .git/**,
     .tox/**,
     jjb/global-jjb/**,
+    jenkins-config/**,
     jenkins-scripts/*-local-env.sh
 shell = bash
 indent_size = 4
index af06a9ef9db51b4a1d4a733304c8cde7e46934d3..001b7101681305742af7bf6d179e4cca9da21cdd 100644 (file)
@@ -1,12 +1,15 @@
 Following are the list of published images available to be used with Jenkins jobs.
 
+* ZZCI - CentOS 7 - autorelease - 20180125-2240
 * ZZCI - CentOS 7 - builder - 20180109-0417
+* ZZCI - CentOS 7 - builder - 20180110-1659
 * ZZCI - CentOS 7 - builder - 20180201-2139
 * ZZCI - CentOS 7 - devstack - 20171208-1648
 * ZZCI - CentOS 7 - devstack-ocata - 20171208-1649
 * ZZCI - CentOS 7 - devstack-pike - 20171208-1649
 * ZZCI - CentOS 7 - docker - 20171209-0317
 * ZZCI - CentOS 7 - docker - 20180109-0346
+* ZZCI - CentOS 7 - docker - 20180110-1659
 * ZZCI - CentOS 7 - java-builder - 20171206-1842
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
 * ZZCI - CentOS 7 - robot - 20171207-1911
index e6f802a04e99eeb77a9e4a7bc92ecd2c9d2d6aa8..5801ad5cdcfdf5c651a9e2adef10e30e4f555c9e 100644 (file)
@@ -253,13 +253,21 @@ Pool: ODLVEX
 
     <table class="table table-bordered">
       <tr class="warning">
-        <td><b>Jenkins Labels</b><br/> centos7-builder-2c-4g,
-          centos7-builder-2c-8g, centos7-java-builder-4c-8g,
-          centos7-builder-8c-8g, centos7-java-builder-4c-16g</td>
-        <td><b>Minion Template names</b><br/> centos7-builder-2c-4g,
-          centos7-builder-2c-4g, centos7-java-builder-2c-8g,
-          centos7-builder-4c-8g, centos7-java-builder-8c-8g,
-          centos7-builder-4c-16g</td>
+        <td><b>Jenkins Labels</b><br/>
+          centos7-builder-2c-1g,<br/>
+          centos7-builder-2c-2g,<br/>
+          centos7-builder-2c-8g,<br/>
+          centos7-builder-4c-4g,<br/>
+          centos7-builder-8c-8g,<br/>
+          centos7-autorelease-4c-16g
+        </td>
+        <td><b>Minion Template names</b><br/>
+          prd-centos7-builder-2c-1g,<br/>
+          prd-centos7-builder-2c-2g,<br/>
+          prd-centos7-builder-2c-8g,<br/>
+          prd-centos7-builder-4c-4g,<br/>
+          prd-centos7-builder-8c-8g,<br/>
+          prd-centos7-autorelease-4c-16g
         <td><b>Packer Template</b><br/>
         releng/builder/packer/templates/builder.json</td>
         <td><b>Spinup Script</b><br/>
@@ -737,15 +745,6 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
         </td>
       </tr>
 
-      <tr class="warning">
-        <td><b>Job Template</b><br/>integration-patch-test-{stream}</td>
-        <td><b>Gerrit Trigger</b><br/>test-integration</td>
-      </tr>
-      <tr>
-        <td colspan="2">
-        </td>
-      </tr>
-
       <tr class="warning">
         <td><b>Job Template</b><br/>integration-patch-test-{stream}</td>
         <td><b>Gerrit Trigger</b><br/>test-integration</td>
@@ -777,6 +776,27 @@ TODO: Document test-{project}-{feature} and test-{project}-all.
             </li>
         </td>
       </tr>
+
+      <tr class="warning">
+        <td><b>Job Template</b><br/>integration-multipatch-test-{stream}</td>
+        <td><b>Gerrit Trigger</b><br/>multipatch-build</td>
+      </tr>
+      <tr>
+        <td colspan="2">
+          This job builds a list of patches provided in an specific order, and finally builds
+          a distribution from either provided patch or latest code in branch.
+          For example if someone leaves the following comment in a patch:
+          multipatch-build:controller=61/29761/5:45/29645/6,neutron=51/65551/4,netvirt:59/60259/17
+          the job will checkout controller patch 61/29761/5, cherry-pick 45/29645/6 and build controller,
+          checkout neutron patch 51/65551/4 and build neutron, checkout latest netvirt code,
+          cherry-pick 59/60259/17 and build netvirt, finally it will checkout latest distribution
+          code and build a distribution. The resulting distribution is stored in Nexus and the URL
+          is stored in a variable called BUNDLE_URL visible in the job console.
+          This job should not alter Gerrit votes for a given patch, nor will do anything with the
+          given patch unless the patch is added to the build list.
+        </td>
+      </tr>
+
     </table>
 
 Maven Properties
diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh
new file mode 100644 (file)
index 0000000..83b3cb5
--- /dev/null
@@ -0,0 +1,9 @@
+GERRIT_URL=https://git.opendaylight.org/gerrit
+GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
+GIT_URL=git://devvexx.opendaylight.org/mirror
+JENKINS_HOSTNAME=vex-yul-odl-jenkins-1
+LOGS_SERVER=https://logs.opendaylight.org
+NEXUS_URL=https://nexus.opendaylight.org
+ODLNEXUSPROXY=https://nexus.opendaylight.org
+SILO=releng
+SONAR_URL=https://sonar.opendaylight.org
diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
new file mode 100644 (file)
index 0000000..62de193
--- /dev/null
@@ -0,0 +1,9 @@
+GERRIT_URL=https://git.opendaylight.org/gerrit
+GIT_BASE=git://devvexx.opendaylight.org/mirror/$PROJECT
+GIT_URL=git://devvexx.opendaylight.org/mirror
+JENKINS_HOSTNAME=vex-yul-odl-jenkins-2
+LOGS_SERVER=https://logs.opendaylight.org
+NEXUS_URL=https://nexus.opendaylight.org
+ODLNEXUSPROXY=https://nexus.opendaylight.org
+SILO=sandbox
+SONAR_URL=https://sonar.opendaylight.org
index e79228f336442c5164aded132bf7455a0bf7e21b..3309b00ab11322912a3e9d0c924f74ef84091f44 100755 (executable)
@@ -24,3 +24,9 @@ source /tmp/system_type.sh
 
 ## add local environment changes post scripts
 ./jenkins-init-script-local-env.sh
+
+# Create a swap file
+dd if=/dev/zero of=/swap count=1024 bs=1MiB
+chmod 600 /swap
+mkswap /swap
+swapon /swap
index 5f898174fb622677be960b459b7967cae9384882..67d646f67b6d8af36a6ef5bc9f353b2863e78440 100644 (file)
@@ -29,7 +29,7 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v1-performance-1'
+    tools_system_flavor: 'v2-highcpu-2'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
 
     # Robot custom options
index 0d307f7abf9c46f1fcfd15b8aceba1af929d349b..9ce1c94c556ec7f35e318211788d2a22131b6020 100644 (file)
@@ -3,7 +3,6 @@
     name: aaa-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
@@ -23,7 +21,6 @@
     name: aaa-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
@@ -43,7 +39,6 @@
     name: aaa-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[aaa] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9318cf3c82c33
index da8f9b4432baf51ceb2f8abcbd5f185bd060d90a..d1085a28f329ea47b0f5dd0394545862b009bb5a 100644 (file)
@@ -3,18 +3,17 @@
     name: alto-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
     name: alto-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
     name: alto-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'alto'
     project-name: 'alto'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'l2switch-merge-{stream}'
     email-upstream: '[alto] [l2switch]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 931eabae9693c
@@ -68,5 +65,6 @@
     project: 'alto'
     project-name: 'alto'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 24207d711819c04c03d664b5f503d205567e4444..447d851608348231e9a0fed150fc77fdeeb2b4b7 100644 (file)
@@ -3,7 +3,6 @@
     name: atrium-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -23,7 +21,6 @@
     name: atrium-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
@@ -43,7 +39,6 @@
     name: atrium-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[atrium]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9324f12310e6a
index e8d9cae84d79ca9df2a1cade8b7b30806c1e12fa..06daa22d2d138890afba844aa2ddbca2d81f6531 100644 (file)
 - builder:
     name: autorelease-update-validate-projects
     builders:
-      - shell: !include-raw-escape: update-validate-autorelease-projects.sh
+      - shell: !include-raw: update-validate-autorelease-projects.sh
 
 - publisher:
     # Search console log for failures and email status to the release mailing list.
index bf56baa918d62a799969bb47936a9d48a54daea0..8d0e4bbe14ac067b0347f84ee24119c807671aa1 100644 (file)
 - job-template:
     name: autorelease-update-validate-jobs-{stream}
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - lf-infra-properties:
 
     disabled: false
     project-type: freestyle
-    node: '{build-node}'
+    node: centos7-builder-2c-8g
     concurrent: true
     jdk: '{java-version}'
 
index 475780867d8404e9174e13c7fd294a2a070f13c0..4a4f99a49edf5caa74e33b6a4938c15aeb1f0168 100644 (file)
           project: dlux
       - dluxapps:
           project: dluxapps
-      - eman:
-          project: eman
-      - faas:
-          project: faas
       - genius:
           project: genius
       - groupbasedpolicy:
@@ -39,6 +35,8 @@
           project: infrautils
       - integration-distribution:
           project: integration/distribution
+      - jsonrpc:
+          project: jsonrpc
       - l2switch:
           project: l2switch
       - lispflowmapping:
@@ -53,8 +51,6 @@
           project: netvirt
       - neutron:
           project: neutron
-      - nic:
-          project: nic
       - of-config:
           project: of-config
       - openflowplugin:
@@ -73,9 +69,7 @@
           project: snmp4sdn
       - sxp:
           project: sxp
-      - unimgr:
-          project: unimgr
+      - tsdr:
+          project: tsdr
       - usc:
           project: usc
-      - vtn:
-          project: vtn
index 2f5cbf60ba85c630e4d9defe136d668aa9bbfe4e..c0441af51a0d0a401d5e656be0754f4b09a488ee 100644 (file)
@@ -29,8 +29,7 @@
         odl-restconf,
         odl-bgpcep-bgp,
         odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
@@ -45,7 +44,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Plot Info
     01-plot-title: 'Number of generated updates'
index dc8bd41a11521d94cf4c54a99f19995d4de0559f..37137285cea644d49f2d470f89b62a4d18250025 100644 (file)
@@ -30,8 +30,7 @@
         odl-restconf,
         odl-bgpcep-bgp,
         odl-bgpcep-bgp-config-example,
-        odl-bgpcep-data-change-counter,
-        odl-netconf-topology
+        odl-bgpcep-data-change-counter
 
     # Robot custom options
     # Increase the TEST_DURATION_MULTIPLIER if the test runs in slower test
@@ -46,7 +45,7 @@
         -v TEST_DURATION_MULTIPLIER:4
 
     # Controller configuration
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-2
 
     # Plot Info
     01-plot-title: 'Number of generated updates'
index f835ad75778a19ba174eae39de615a9d0e7481cb..a078abb9fe0e050e1dcb4a2b13484699bb4b2268 100644 (file)
@@ -31,8 +31,7 @@
         odl-jolokia,
         odl-bgpcep-data-change-counter,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-netconf-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: >
@@ -46,5 +45,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
index 43a1ef1881f92e401b6605acf28cc0485a917528..96ae34914ee058bb956b1c554994f80aedd761e1 100644 (file)
     install-features: >
         odl-restconf-noauth,
         odl-bgpcep-bgp,
-        odl-bgpcep-bgp-config-example,
-        odl-netconf-clustered-topology
+        odl-bgpcep-bgp-config-example
 
     # Robot custom options:
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
index c8566b3bfe4a5d7d1aa5d29f3aaafc813aa5cc90..3264311325adca2addacac1422cfd84065aaf50a 100644 (file)
@@ -38,4 +38,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
index 5ea5cc3dcde318993b62cf858a04f246c5133280..c0fc3a7a886c18f2a9e8e02955b76cd3b0abf9c1 100644 (file)
@@ -39,4 +39,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
index 2a4168e93da453ec41a6c7c7abb446b2f3ee64df..5c8ee1da206d3a5a111f85a64f7abbe6c868d4fe 100644 (file)
@@ -3,7 +3,6 @@
     name: bgpcep-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -22,7 +21,6 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9427a05049030
@@ -31,7 +29,6 @@
     name: bgpcep-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -50,7 +47,6 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9427a05049030
@@ -59,7 +55,6 @@
     name: bgpcep-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -79,7 +74,6 @@
         mdsal-merge-{stream},
         tcpmd5-merge-{stream}
     email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 9427a05049030
index 3a54e71373756d6ff2e9becf1e5a8d803d8b429d..3dd2638f4d46849b28310e865e566c9fe30c2ea6 100644 (file)
@@ -3,19 +3,18 @@
     name: bier-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     build-timeout: 90
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
     name: bier-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
     name: bier-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
     project-name: 'bier'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[bier]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 942a8075b1f2a
@@ -69,5 +66,6 @@
     project: 'bier'
     project-name: 'bier'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index bf5f301d19f497694affeaf01edb8fc066bda9fb..e6fdae19957941865b802af7bbd649d7d28b6746 100644 (file)
@@ -3,7 +3,6 @@
     name: capwap-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
@@ -23,7 +21,6 @@
     name: capwap-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
@@ -43,7 +39,6 @@
     name: capwap-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[capwap]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bd6b5bf86e3
index 8962ee4826ac05eff8329d57cbfba8736b8926cf..71b99503d6c45c9ac1a209642fd89686c69b6a5c 100644 (file)
@@ -3,7 +3,6 @@
     name: cardinal-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
@@ -23,7 +21,6 @@
     name: cardinal-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
@@ -43,7 +39,6 @@
     name: cardinal-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}'
     email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96be20348f0f2
index b96d01da85a96fae69059d4acaedcb7bd9d9d89c..a9beae82d26f204743b6decd3caae5211f420e04 100644 (file)
@@ -3,7 +3,6 @@
     name: centinel-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
@@ -23,7 +21,6 @@
     name: centinel-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
@@ -43,7 +39,6 @@
     name: centinel-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[centinel]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96bf9b3fefd8a
index 4740ba10f4c910c75190b0e15e9bfdc9f9331ba9..290f29cf8758c730a96feee1601ca978cbf6454a 100644 (file)
@@ -3,7 +3,6 @@
     name: coe-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'coe'
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
@@ -23,7 +21,6 @@
     name: coe-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'coe'
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
@@ -42,7 +38,6 @@
 - project:
     name: coe-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'coe'
@@ -54,7 +49,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[coe] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c0be46aac33
index f308a1632ec982b5da0a0277a70b0f65da719be0..2d4b62a8e5a5824f722e8a0534f0257ddd39c289 100644 (file)
@@ -34,7 +34,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
 
     build-timeout: '480'
 
index 65c593e3f74a68e2dbe6fb65c9ef2b6e066f12d3..eebe58a380c1f1d96a0c1ba72bca8660b8e027a1 100644 (file)
@@ -35,7 +35,7 @@
 
     # ODL system image to use
     # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough.
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Plot Info
     01-plot-title: 'Performance by structure'
index 79d595d87eca99dd25b832a5378fa9db61621144..8683803c404711ea897d2b00bc4261481ed585e5 100644 (file)
@@ -3,7 +3,6 @@
     name: controller-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -18,7 +17,6 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -27,7 +25,6 @@
     name: controller-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -41,7 +38,6 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
@@ -50,7 +46,6 @@
     name: controller-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -65,7 +60,6 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[controller] [odlparent] [yangtools] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96c1c9177efdd
index dfd6205f1cfdd52d8992845cab6686dc035290bb..8ffa7a99d1c3d23db23e0e0f4d3de906f7a2931b 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: coretutorials-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
     build-timeout: 120
 
     # Used by the release job
@@ -22,7 +20,6 @@
 - project:
     name: coretutorials-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -33,7 +30,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
     build-timeout: 120
 
     # Used by the release job
@@ -42,7 +38,6 @@
 - project:
     name: coretutorials-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -54,7 +49,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[coretutorials]'
-    archive-artifacts: ''
     build-timeout: 120
 
     # Used by the release job
index 49b7f40517ee5617b7fc8e86c7de679e2d1fbafa..25f05ee88758b54dae4c152fef0b84c896b75878 100644 (file)
@@ -3,7 +3,6 @@
     name: daexim-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'daexim'
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
@@ -23,7 +21,6 @@
     name: daexim-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'daexim'
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[daexim] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e4dade34bd7
index c54a7e8bf86876698b0fd9c8a414335b5e67169f..037ebc6bebd2e6219ec8a19d74b50c2ccf33435d 100644 (file)
@@ -3,7 +3,6 @@
     name: didm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
@@ -23,7 +21,6 @@
     name: didm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
@@ -43,7 +39,6 @@
     name: didm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[didm]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6338c870f5
index fbd47780c894731805a66dc77c61d746601ecd06..d090eebea62b27a5ef91ce80a2e98b48c44362d1 100644 (file)
@@ -3,7 +3,6 @@
     name: dlux-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -23,7 +21,6 @@
     name: dlux-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
@@ -43,7 +39,6 @@
     name: dlux-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6a0327484f
index 2eea9a58ab409927529347b3e091822ad85361fd..d87fdb4c7e3be2d087d2f7d9427b163ca770e900 100644 (file)
@@ -3,18 +3,17 @@
     name: dluxapps-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: oxygen
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
     name: dluxapps-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: nitrogen
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
     name: dluxapps-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
     stream: carbon
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96e6fb1e65bf9
@@ -68,5 +65,6 @@
     project: 'dluxapps'
     project-name: 'dluxapps'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 6a1c96748b92131fd843be958aacf0f903379bde..e6461e14c06cd34e547f5d929eccca9456ce1bda 100644 (file)
@@ -18,4 +18,3 @@
     build-node: centos7-builder-2c-8g
     build-timeout: 30
     rtd-project: opendaylight
-    archive-artifacts: ''
index e2c75d2e18a66b45b2dffb8274a3a611c11e4023..d36e97ec238cbb0ba58d3d2bcce1bf68d3c599a3 100644 (file)
@@ -3,7 +3,6 @@
     name: eman-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -25,7 +23,6 @@
     name: eman-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -37,7 +34,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -47,7 +43,6 @@
     name: eman-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -60,7 +55,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[eman]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
index cd16b5827ff7bc98dce24e8208ed2f471d1f1633..c3e95b8132f7849eb1de4cee0f11ad2384d69829 100644 (file)
@@ -3,7 +3,6 @@
     name: faas-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
@@ -23,7 +21,6 @@
     name: faas-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
@@ -43,7 +39,6 @@
     name: faas-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[faas]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f5ac591d858
index d680b128fd042eea71019e7f3254429a700deb9b..37d11172b169f04ec4dff84b2bbc83a0f1cf158e 100644 (file)
@@ -3,7 +3,6 @@
     name: federation-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
@@ -24,7 +22,6 @@
     name: federation-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -36,7 +33,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
@@ -45,7 +41,6 @@
     name: federation-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -58,7 +53,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[federation] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96f78c7a40a24
index fea7ca0358dc170ed3f8c880b8b274343d3a105f..1d64f2e5d8273dc22ed285fec147bcc1a0c348b0 100644 (file)
@@ -1,12 +1,9 @@
 ---
 - project:
-    name: genius-csit-genius
+    name: genius-csit-genius-oxygen
     jobs:
       - inttest-csit-1node
       - inttest-csit-3node
-      - inttest-csit-verify-1node
-      - inttest-csit-verify-3node
-
 
     # The project name
     project: 'genius'
     stream:
       - oxygen:
           branch: 'master'
+    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}
+    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'
       - carbon:
index 32690ccf80dd4c09a1c8fe15877a476eb40ad5d9..2bd0758bf99c28c92cf4037d638660ded13732f3 100644 (file)
@@ -3,7 +3,6 @@
     name: genius-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -11,6 +10,7 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 90
@@ -21,7 +21,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
     name: genius-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: >
@@ -46,7 +45,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
     name: genius-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'genius'
     project-name: 'genius'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -72,7 +70,6 @@
         openflowplugin-merge-{stream},
         neutron-merge-{stream}
     email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fb4b6d9d1ee
@@ -84,5 +81,6 @@
     project: 'genius'
     project-name: 'genius'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584..8e33e6ab798cd57a383cb8871d973de3fce6340c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584
+Subproject commit 8e33e6ab798cd57a383cb8871d973de3fce6340c
index b60c2efdfb4e23dafd111c9aba84a5a63ef3dd67..70c32643c7881612f1b1064db2abf462f72954f2 100644 (file)
@@ -3,13 +3,13 @@
     name: groupbasedpolicy-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -21,7 +21,6 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
     name: groupbasedpolicy-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -47,7 +46,6 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
     name: groupbasedpolicy-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
@@ -74,7 +72,6 @@
         sfc-merge-{stream},
         ovsdb-merge-{stream}
     email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fbb93f95a76
@@ -86,6 +83,7 @@
     project: 'groupbasedpolicy'
     project-name: 'groupbasedpolicy'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'groupbasedpolicy-settings'
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 4d3c545a3b7f2dde74f864d5cd545d9bf138e51e..f2e35f98a1793d155b8efb02c4f8fa4e272236d0 100644 (file)
@@ -3,7 +3,6 @@
     name: vbd-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
@@ -23,7 +21,6 @@
     name: vbd-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
@@ -43,7 +39,6 @@
     name: vbd-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[vbd]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fc362c36862
index 77dfce7398fb89c2909e57870aa63bea6afff9d5..8ebb6299014f62855c9c3d34e6697d0f107d0721 100644 (file)
@@ -3,7 +3,6 @@
     name: infrautils-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
@@ -24,7 +22,6 @@
     name: infrautils-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -35,7 +32,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
@@ -44,7 +40,6 @@
     name: infrautils-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -56,7 +51,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[infrautils] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fca0367756c
index 0d71841878e10c3c1bffabc56eec1595aa4150c1..3c083c5e51a09a5dde3dad5a88616f0ef632a925 100644 (file)
@@ -37,6 +37,7 @@ print_common_env
 # Setup JAVA_HOME and MAX_MEM Value in ODL startup config file
 function set_java_vars() {
     local JAVA_HOME=$1
+    local CONTROLLERMEM=$2
 
     echo "Configure java home and max memory..."
     sed -ie 's%^# export JAVA_HOME%export JAVA_HOME=${JAVA_HOME:-'"${JAVA_HOME}"'}%g' ${MEMCONF}
@@ -64,9 +65,14 @@ function configure_karaf_log() {
     local -r controllerdebugmap=$2
     local logapi=log4j
 
-    echo "Configuring the karaf log... karaf_version: ${karaf_version}"
-    if [[ "${karaf_version}" == "karaf4" ]]; then
+    # Check what the logging.cfg file is using for the logging api: log4j or log4j2
+    grep "log4j2" ${LOGCONF}
+    if [ $? -eq 0 ]; then
         logapi=log4j2
+    fi
+
+    echo "Configuring the karaf log... karaf_version: ${karaf_version}, logapi: ${logapi}"
+    if [ "${logapi}" == "log4j2" ]; then
         # FIXME: Make log size limit configurable from build parameter.
         sed -ie 's/log4j2.appender.rolling.policies.size.size = 16MB/log4j2.appender.rolling.policies.size.size = 1GB/g' ${LOGCONF}
         orgmodule="org.opendaylight.yangtools.yang.parser.repo.YangTextSchemaContextResolver"
@@ -93,7 +99,7 @@ function configure_karaf_log() {
             # shellcheck disable=SC2157
             if [ -n "${module}" ] && [ -n "${level}" ]; then
                 orgmodule="org.opendaylight.${module}"
-                if [[ "${karaf_version}" == "karaf4" ]]; then
+                if [ "${logapi}" == "log4j2" ]; then
                     orgmodule_="${orgmodule//./_}"
                     echo "${logapi}.logger.${orgmodule_}.name = ${orgmodule}" >> ${LOGCONF}
                     echo "${logapi}.logger.${orgmodule_}.level = ${level}" >> ${LOGCONF}
@@ -104,5 +110,6 @@ function configure_karaf_log() {
         done
     fi
 
+    echo "cat ${LOGCONF}"
     cat ${LOGCONF}
 } # function configure_karaf_log()
index 8d3e85d73e3754e0b9b649e8d715fd352e9e4a23..e0eacdf0c1bb5dfba298f0790a1684e3f963a2ba 100644 (file)
@@ -12,9 +12,7 @@ if [ "${BASH_SOURCE[0]}" == "${0}" ]; then
     cp "${0}" /tmp/common-functions.sh
 
     source /tmp/v/openstack/bin/activate
-    # shellcheck disable=SC2207
-    ips=($(openstack stack show -f json -c outputs "$STACK_NAME" | \
-               jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]'))
+    mapfile -t ips <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
     for ip in "${ips[@]}"; do
         echo "Copying common-functions.sh to ${ip}:/tmp"
         scp /tmp/common-functions.sh ${ip}:/tmp
index faf15249a3dfcb691db17a048da43d4a136d766a..1ffd0ea7d9d4680920ff929e00d312b5aa9b1f91 100644 (file)
@@ -6,7 +6,7 @@
     name: 'distribution-verify-{stream}'
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-8c-8g
     concurrent: true
     jdk: '{jre}'
 
@@ -78,7 +78,7 @@
     #     https://issues.apache.org/jira/browse/MNG-5666
 
     project-type: maven
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     jdk: '{jre}'
 
     properties:
 
 - job-template:
     name: 'distribution-check-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    mvn-version: mvn33
+
+    #####################
+    # Job Configuration #
+    #####################
+
     # Like a {project}-distribution-check, but few steps less as there is no upstream project involved.
     disabled: false
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
       - distribution-check-build-project:
           pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
           # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           gerrit-project: 'integration'
       - distribution-check-repeat-project-build:
           pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
           # '{opendaylight-infra-parallel-mvn-opts}' is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties:
     # FIXME: List required variables.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     concurrent: false
 
     properties:
index d8625c6cb0aa9e3630590fe853f9f25244b3b8b4..bd835f21f8dc53933f1b6d5131a66f888a898b6c 100644 (file)
@@ -43,7 +43,7 @@
     #   pom: Relative path to pom file to use. Typically '$GERRIT_PROJECT/pom.xml'.
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{pom}'
           goals: |
               clean deploy
@@ -83,7 +83,7 @@
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{dist-pom}'
           goals: |
               clean install
       - shell: |
           cp -r /tmp/r /tmp/t
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{pom}'
           goals: |
               clean install
     #   dist-pom: Relative path to pom file to use. 'distribution/pom.xml' is recommended.
     builders:
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: '{mvn-version}'
           pom: '{dist-pom}'
           goals: |
               clean install
index b8fb9ec2dc18d92ba8bdb44cc318238b96dcb55f..e7c0746e20a258cc8fb49fbdc7066239f14e8445 100644 (file)
@@ -4,15 +4,27 @@
 
 - job-template:
     name: '{project-name}-distribution-check-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    java-version: openjdk8
+    mvn-version: mvn33
+
+    #####################
+    # Job Configuration #
+    #####################
+
     # Operation: This job template builds a patch, creates a distribution containing
     #            the patch (making sure dependencies are specified),
     #            and performs the distribution deploy test.
     disabled: false
 
     project-type: freestyle
-    node: '{build-node}'
+    node: 'centos7-builder-8c-8g'
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -30,7 +42,7 @@
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - maven-exec:
-          maven-version: mvn33
+          maven-version: '{mvn-version}'
 
     scm:
       - integration-gerrit-scm:
       - distribution-check-build-project:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-verify-groupid:
           gerrit-project: '$GERRIT_PROJECT'
       - distribution-check-download-deps:
           dist-pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-delete-snapshots
       - distribution-check-configure-remotes
       - distribution-check-repeat-project-build:
           pom: '$GERRIT_PROJECT/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - distribution-check-repeat-distro-build:
           dist-pom: 'distribution/pom.xml'
           mvn-opts: '{opendaylight-infra-mvn-opts}'
+          mvn-version: '{mvn-version}'
           # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT.
       - integration-set-variables
       - distribution-check-warn-9191
index ecc941a5b16ca3eff5d4e84687e4e9a3268f164e..9e0d0662f443cee29cd5d965a0daca85386e3bb2 100644 (file)
@@ -91,7 +91,7 @@ fi
 
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
-set_java_vars "${JAVA_HOME}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}"
 
 # Copy shard file if exists
 if [ -f /tmp/custom_shard_config.txt ]; then
index 84fb75517c20ba366f4f5dc172305269af3f85e2..c222ed2fc184b6680090b5103ee3b0fd6de050cc 100644 (file)
@@ -82,7 +82,7 @@ cat ${CUSTOMPROP}
 
 configure_karaf_log "${KARAF_VERSION}" "${CONTROLLERDEBUGMAP}"
 
-set_java_vars "${JAVA_HOME}"
+set_java_vars "${JAVA_HOME}" "${CONTROLLERMEM}"
 
 echo "Listing all open ports on controller system..."
 netstat -pnatu
index 4dc2ce255daa7a049984e499c1d9b0439bd96087..27b89549778ed1b8bee56f80d5bef5908c191db4 100644 (file)
@@ -126,7 +126,7 @@ function install_openstack_clients_in_robot_vm() {
 
     if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then
         #networking-l2gw is not officially available in any release yet. Gettting the latest stable version.
-        $PYTHON -m pip install networking-l2gw
+        $PYTHON -m pip install networking-l2gw==11.0.0
     fi
 }
 
@@ -496,20 +496,23 @@ EOF
 } # configure_haproxy_for_neutron_requests()
 
 # Collect the list of files on the hosts
-function list_files () {
-    local ip=$1
-    local folder=$2
-    ${SSH} ${ip} "sudo find /etc > /tmp/find.etc.txt"
-    ${SSH} ${ip} "sudo find /opt/stack > /tmp/find.opt.stack.txt"
-    ${SSH} ${ip} "sudo find /var > /tmp/find2.txt"
-    ${SSH} ${ip} "sudo find /var > /tmp/find.var.txt"
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${folder}/rsync.etc.txt
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${folder}/rsync.opt.stack.txt
-    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${folder}/rsync.var.txt
-    scp ${ip}:/tmp/find.etc.txt ${folder}
-    scp ${ip}:/tmp/find.opt.stack.txt ${folder}
-    scp ${ip}:/tmp/find2.txt ${folder}
-    scp ${ip}:/tmp/find.var.txt ${folder}
+function collect_files () {
+    local -r ip=$1
+    local -r folder=$2
+    finddir=/tmp/finder
+    ${SSH} ${ip} "mkdir -p ${finddir}"
+    ${SSH} ${ip} "sudo find /etc > ${finddir}/find.etc.txt"
+    ${SSH} ${ip} "sudo find /opt/stack > ${finddir}/find.opt.stack.txt"
+    ${SSH} ${ip} "sudo find /var > ${finddir}/find2.txt"
+    ${SSH} ${ip} "sudo find /var > ${finddir}/find.var.txt"
+    ${SSH} ${ip} "sudo tar -cf - -C /tmp finder | xz -T 0 > /tmp/find.tar.xz"
+    scp ${ip}:/tmp/find.tar.xz ${folder}
+    mkdir -p ${finddir}
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/etc/ > ${finddir}/rsync.etc.txt
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/opt/stack/ > ${finddir}/rsync.opt.stack.txt
+    rsync --rsync-path="sudo rsync" --list-only -arvhe ssh ${ip}:/var/ > ${finddir}/rsync.var.txt
+    tar -cf - -C /tmp finder | xz -T 0 > /tmp/rsync.tar.xz
+    cp /tmp/rsync.tar.xz ${folder}
 }
 
 function collect_logs () {
@@ -568,7 +571,8 @@ EOF
         scp ${!CONTROLLERIP}:/tmp/journalctl.log ${NODE_FOLDER}
         ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
         scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
-        rsync -avhe ssh ${!CONTROLLERIP}:/tmp/${BUNDLEFOLDER}/etc ${NODE_FOLDER}
+        ${SSH} ${!CONTROLLERIP} "tar -cf - -C /tmp/${BUNDLEFOLDER} etc | xz -T 0 > /tmp/etc.tar.xz"
+        scp ${!CONTROLLERIP}:/tmp/etc.tar.xz ${NODE_FOLDER}
         ${SSH} ${!CONTROLLERIP} "cp -r /tmp/${BUNDLEFOLDER}/data/log /tmp/odl_log"
         ${SSH} ${!CONTROLLERIP} "tar -cf /tmp/odl${i}_karaf.log.tar /tmp/odl_log/*"
         scp ${!CONTROLLERIP}:/tmp/odl${i}_karaf.log.tar ${NODE_FOLDER}
@@ -626,18 +630,20 @@ EOF
         scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
-        list_files "${!OSIP}" "${NODE_FOLDER}"
+        collect_files "${!OSIP}" "${NODE_FOLDER}"
+        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log rabbitmq | xz -T 0 > /tmp/rabbitmq.tar.xz "
+        scp ${!OSIP}:/tmp/rabbitmq.tar.xz ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/usr/lib/systemd/system/haproxy.service ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone_access.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/httpd/keystone.log ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/rabbitmq ${NODE_FOLDER}
         rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links
         mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
-        # qdhcp files are created by robot tests
-        mv /tmp/qdhcp ${NODE_FOLDER}
+        # qdhcp files are created by robot tests and copied into /tmp/qdhcp during the test
+        tar -cf - -C /tmp qdhcp | xz -T 0 > /tmp/qdhcp.tar.xz
+        mv /tmp/qdhcp.tar.xz ${NODE_FOLDER}
         mv ${NODE_FOLDER} ${WORKSPACE}/archives/
     done
 
@@ -664,10 +670,11 @@ EOF
         scp ${!OSIP}:/tmp/ovsdb-tool.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovs-vswitchd.log ${NODE_FOLDER}
         scp ${!OSIP}:/var/log/openvswitch/ovsdb-server.log ${NODE_FOLDER}
-        list_files "${!OSIP}" "${NODE_FOLDER}"
+        collect_files "${!OSIP}" "${NODE_FOLDER}"
+        ${SSH} ${!OSIP} "sudo tar -cf - -C /var/log libvirt | xz -T 0 > /tmp/libvirt.tar.xz "
+        scp ${!OSIP}:/tmp/libvirt.tar.xz ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/etc/hosts ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/audit/audit.log ${NODE_FOLDER}
-        rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/libvirt ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/messages ${NODE_FOLDER}
         rsync --rsync-path="sudo rsync" -avhe ssh ${!OSIP}:/var/log/nova-agent.log ${NODE_FOLDER}
         rsync -avhe ssh ${!OSIP}:/opt/stack/logs/* ${NODE_FOLDER} # rsync to prevent copying of symbolic links
@@ -839,8 +846,10 @@ CORE_OS_CONTROL_SERVICES+=",odl-compute,odl-neutron"
 # Additional services
 CORE_OS_CONTROL_SERVICES+=",mysql,rabbit"
 
+# collect performance stats
+CORE_OS_COMPUTE_SERVICES="dstat"
 # computes only need nova and odl
-CORE_OS_COMPUTE_SERVICES="n-cpu,odl-compute"
+CORE_OS_COMPUTE_SERVICES+=",n-cpu,odl-compute"
 
 cat > ${WORKSPACE}/disable_firewall.sh << EOF
 sudo systemctl stop firewalld
@@ -1181,10 +1190,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
         sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
         sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
     "
-    # Control Node - set VXLAN TEP IP for Genius Auto TZ
-    ${SSH} ${!CONTROLIP} "
-        sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
-    "
 
     # Control Node - external net internet address simulation
     ${SSH} ${!CONTROLIP} "
@@ -1289,14 +1294,19 @@ echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
 suite_num=0
 for suite in ${SUITES}; do
-    # prepend a incrmental counter to the suite name so that the full robot log combining all the suites as is done
-    # in the rebot step below will list all the suites in chronological order as rebot seems to alphabatize them
+    # prepend an incremental counter to the suite name so that the full robot log combining all the suites as is done
+    # in the rebot step below will list all the suites in chronological order as rebot seems to alphabetize them
     let "suite_num = suite_num + 1"
     suite_index="$(printf %02d ${suite_num})"
     suite_name="$(basename ${suite} | cut -d. -f1)"
     log_name="${suite_index}_${suite_name}"
-    pybot -N ${log_name} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+    pybot -N ${log_name} \
+    -c critical -e exclude -e skip_if_${DISTROSTREAM} \
     --log log_${log_name}.html --report None --output output_${log_name}.xml \
+    --removekeywords wuks \
+    --removekeywords name:SetupUtils.Setup_Utils_For_Setup_And_Teardown \
+    --removekeywords name:SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing \
+    --removekeywords name:OpenStackOperations.Add_OVS_Logging_On_All_OpenStack_Nodes \
     -v BUNDLEFOLDER:${BUNDLEFOLDER} \
     -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
     -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \
index 4356f5721c84d8625b5ba55cdadf3733a209ac0a..816dcf80a72515593df804d1510abcee0bdac5a8 100644 (file)
@@ -12,9 +12,7 @@ OPENSTACK_CONTROLLERS=()
 OPENSTACK_VENV="/tmp/v/openstack"
 # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
 source $OPENSTACK_VENV/bin/activate
-# shellcheck disable=SC2207
-ADDR=($(openstack stack show -f json -c outputs "$STACK_NAME" | \
-       jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]'))
+mapfile -t ADDR <<< "$(openstack stack show -f json -c outputs "$STACK_NAME" | jq -r '.outputs[] | select(.output_key | match("^vm_[0-9]+_ips$")) | .output_value | .[]')"
 
 # The next two blocks of code will parse the list of vm IP's hostnames to determine which type of node
 # the vm is: odl, devstack controller or compute, ha_proxy or tools. For the odl node's the hsotname will contain
index 7f01c570ea7ecdb7dab1e7d64a1b3674be5b81c5..77e92a4cc80c0ef8cbe8faaa50ff8b5a74cc3117 100644 (file)
                 mkdir -p ./archives
                 curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                 unzip -d ./archives robot-plugin.zip
-                mv *log* *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
+                mv *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
                 # TODO: Can the following line ever fail?
                 find . -type f -name *.hprof -print0 | tar -cvf - --null -T - | xz -9 > ./archives/hprof.tar.xz
                 # TODO: Tweak the compression level if better ratio (or speed) is needed.
index da9c33863a06243b844c5c2001dd35c30dee8112..1ce162a0f2628a83785ff43a88583885b0528abd 100644 (file)
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
       - inject:
           properties-file: 'slave_addresses.txt'
       - integration-detect-variables
+      - integration-install-common-functions
       - integration-configure-clustering
       - integration-start-cluster-run-test
       - integration-cleanup-tmp
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
index add368112f8daf4bb5f526147681557e8aa09ae2..b5c23f5aed742c8221622a691fe85a4d28a76cbc 100644 (file)
 
     project-type: freestyle
     node: centos7-builder-4c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
diff --git a/jjb/integration/integration4-templates.yaml b/jjb/integration/integration4-templates.yaml
deleted file mode 100644 (file)
index fab8aa6..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
----
-
-# TODO: This is only potentionally useful for Carbon. Remove this when Carbon is not supported anymore.
-
-- job-template:
-    name: '{project}-csit4-1node-{functionality}-{install}-nitrogen'
-    # Keep synchronized with *-csit-* please.
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
-
-    parameters:
-      # Removing {kafka-version} will force this job to run in k4.
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: 'integration/test'
-          branch: 'master'
-          refspec: 'refs/heads/master'
-          artifacts: '{archive-artifacts}'
-      - integration-distribution-branch:
-          branch: 'master'
-      - integration-distribution-stream:
-          stream: 'nitrogen'
-      - 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}-nitrogen.txt'
-      - integration-test-plan:
-          test-plan: '{project}-{functionality}.txt'
-      - integration-patch-refspec:
-          branch: 'master'
-      - integration-jdk-version:
-          jdkversion: 'openjdk8'
-
-    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
-          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}-csit4-1node-{functionality}-{install}-nitrogen-{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}-csit4-1node-{functionality}-{install}-nitrogen-{02-plot-data-file}-history.csv'
-            series:
-              - file: '{02-plot-data-file}'
-                inclusion-flag: 'off'
-                display-table: true
-                format: csv
-      - integration-csit-archive-build
-      - lf-infra-publish
index 16cc153ad0589db1ac826459b980b5dc6e191edc..0a0e355aa312db2719ea5154cfd748a082672670 100644 (file)
@@ -99,7 +99,7 @@ do
     "$MVN" clean install \
     -e -Pq \
     -Dstream=oxygen \
-    -DskipTests=true \
+    -Dgitid.skip=false \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_OPTIONS
@@ -116,7 +116,6 @@ if [ "${distribution_status}" == "not_included" ]; then
     "$MVN" clean install \
     -e -Pq \
     -Dstream="$DISTROSTREAM" \
-    -DskipTests=true \
     --global-settings "$GLOBAL_SETTINGS_FILE" \
     --settings "$SETTINGS_FILE" \
     $MAVEN_OPTIONS
index bcb999f0012249760092dc07369c3ade07afa052..ed5b2d0aacee537127549ac1ef4c90249ed843a0 100644 (file)
@@ -3,18 +3,17 @@
     name: iotdm-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
     name: iotdm-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
     name: iotdm-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'aaa-merge-{stream}'
     email-upstream: '[iotdm] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fd6e9453970
@@ -67,5 +64,6 @@
     project: 'iotdm'
     project-name: 'iotdm'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index aa9d59210ec726b9e8924a36603b2a1f2cf05bab..033d8978dafe2e6f975de16223610757b660e4c4 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: jsonrpc-fluorine
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
 - project:
     name: jsonrpc-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
+      - '{project-name}-distribution-check-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
     stream: oxygen
-    branch: 'stable/oxygen'
+    branch: 'master'
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
@@ -40,7 +37,6 @@
 - project:
     name: jsonrpc-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -51,7 +47,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
@@ -59,7 +54,6 @@
 - project:
     name: jsonrpc-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'jsonrpc'
@@ -71,7 +65,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream},mdsal-merge-{stream}'
     email-upstream: '[jsonrpc] [odlparent] [yangtools] [controller] [mdsal]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fdf4408765d
index 3cb1e9378bf555543c2d329b30747bcd4d9875b3..6e1af41fbbd15b7e77229a1d918dfee560365dd3 100644 (file)
@@ -3,7 +3,6 @@
     name: l2switch-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -19,7 +18,6 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -28,7 +26,6 @@
     name: l2switch-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -44,7 +41,6 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
@@ -53,7 +49,6 @@
     name: l2switch-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -70,7 +65,6 @@
         openflowjava-merge-{stream},
         openflowplugin-merge-{stream}
     email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96fee85953ca0
index 194a76145edafe80761174f997aab1f368c21abb..49d043cb73830ad38a500660000ee90c567a0cf5 100644 (file)
@@ -3,7 +3,6 @@
     name: lacp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
@@ -23,7 +21,6 @@
     name: lacp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
@@ -43,7 +39,6 @@
     name: lacp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}'
     email-upstream: '[lacp] [openflowjava] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 96ff6c0ff6ab1
index c94f79b3e9fab177ee9e8e54f652fe56a7df57b8..3d83608ced9741817c398c4540afec9d483e5009 100644 (file)
@@ -1,4 +1,19 @@
 ---
+- project:
+    name: lf-infra-ansible-roles-system-update
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-ansible-roles
+    project: ansible/roles/*
+    build-node: ubuntu1604-docker-2c-2g
+    build-timeout: 60
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
+
 - project:
     name: lf-infra-ci-workshop
     jobs:
 
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: LinuxFoundation
+
+- project:
+    name: lf-infra-license-checker
+    jobs:
+      - gerrit-tox-verify
+
+    project-name: lf-infra-license-checker
+    project: releng/license-checker
+    build-node: centos7-builder-2c-2g
+    stream: any
+    branch: '*'
+
+    git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
+    gerrit-server-name: LinuxFoundation
index ef1596ae99cb3c2c6da6bd328e3dcdb1ee506835..4e7518c27e60ea834e232a264434354020f66ed0 100644 (file)
@@ -3,7 +3,6 @@
     name: lispflowmapping-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -29,7 +28,6 @@
     name: lispflowmapping-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -55,7 +53,6 @@
     name: lispflowmapping-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -69,7 +66,6 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
     dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}'
     email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]'
-    archive-artifacts: ''
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
index 9cfbaaff2b05fc5f884c81dfd9e45b83c7dae1b2..e52cdb70b4e9a72b023c71102eec570949894fa2 100644 (file)
@@ -26,7 +26,7 @@
 
     # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs.
     tools_system_count: 0
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 
     # Features to install
     install-features: 'odl-restconf'
index 12100b8a8a98b568535969a92cd561a126e199d0..7490dd565acf4fc90c189710a21e05fcdd9edf8b 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: mdsal-oxygen
     jobs:
-      - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
+      - '{project-name}-distribution-check-{stream}':
+          mvn-version: 'mvn35'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -18,7 +18,6 @@
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -27,7 +26,6 @@
     name: mdsal-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -41,7 +39,6 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
@@ -50,7 +47,6 @@
     name: mdsal-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -65,7 +61,6 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a674173c7b29d
index 4c928c39bfa90852a3e0c40e357175958fe243d7..14c273883d839a75c1c8671ee8a531ad5c11927c 100644 (file)
@@ -3,7 +3,6 @@
     name: messaging4transport-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a677283157db4
@@ -24,7 +22,6 @@
     name: messaging4transport-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -36,7 +33,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a677283157db4
@@ -45,7 +41,6 @@
     name: messaging4transport-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -58,7 +53,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[messaging4transport]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a677283157db4
index b40529213b487f29ccf266b67718476a1b667c60..3b948fca67365044d1e597d51608b6405b75f584 100644 (file)
@@ -3,7 +3,6 @@
     name: natapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
@@ -24,7 +22,6 @@
     name: natapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -36,7 +33,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
@@ -45,7 +41,6 @@
     name: natapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -58,7 +53,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[natapp] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a679c0f4f08a8
index 3a9c047e25cf1d88aa6d9acecb46f07624db53d1..af23ab6fdde2c847bd189578b7dc2e9407124749 100644 (file)
@@ -3,7 +3,6 @@
     name: nemo-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -23,7 +21,6 @@
     name: nemo-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
@@ -43,7 +39,6 @@
     name: nemo-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[nemo]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67a9890f6202
index e18b10083b6aa6d5be378dbddbea5e40675af406..a35cda99810032ce1d31648c43651cf27ab759f2 100644 (file)
@@ -35,4 +35,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # ODL system configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
index 026cebb91088ccba7fb703ff233f8f7ee979500f..e12d7bb25d7d8ffb3144afe2551d4f45390b5efe 100644 (file)
@@ -3,20 +3,19 @@
     name: netconf-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     build-timeout: 90
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
     name: netconf-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
     name: netconf-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
     project-name: 'netconf'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
     dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67b22fc3663f
@@ -71,6 +68,7 @@
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
index 9952388a736a9708ceb5af6f3f47c53a40ca9459..abc54479c3d6e75dcd40f4b5f96ac42e11ee0c3b 100644 (file)
@@ -3,7 +3,6 @@
     name: netide-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
     email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67bab3755815
@@ -23,7 +21,6 @@
     name: netide-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
     email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67bab3755815
@@ -43,7 +39,6 @@
     name: netide-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowjava-merge-{stream}'
     email-upstream: '[netide] [openflowjava]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67bab3755815
index a4143f9aadb75bd3cb74871bda3039fb0ff3b411..88d6a4a42c16308ab5470d94b29a77319d9122b0 100644 (file)
@@ -7,28 +7,35 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    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
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          sg-mode: 'stateful'
-      - gate-stateful:
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-nitrogen
     jobs:
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    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
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
 
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
-
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-carbon
     jobs:
       - inttest-csit-hwvtep-openstack
 
     project: 'netvirt'
-
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
+    testplan: '{project}-{topology}-l2gw-openstack.txt'
+    odl-ml2-driver-version: 'v2'
+    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
+    tools_system_count: 2
+    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
+
+    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
+    enable-networking-l2gw: 'yes'
 
     topology:
       - 1node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 1
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack'
       - 3node:
-          openstack_system1_count: 1
           openstack_system2_count: 1
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack'
 
-    testplan: '{project}-{topology}-l2gw-openstack.txt'
-
     functionality:
-      - upstream-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
-      - gate-stateful:
-          schedule: ''
-          sg-mode: 'stateful'
+      - upstream-stateful
+      - gate-stateful
 
     openstack:
       - ocata:
           openstack_system_image: '{openstack_system_image_pike}'
           openstack_system2_image: '{openstack_system_image_pike}'
           enable-openstack-network-services: '{openstack_legacy_default_network_services}'
-
-    odl-ml2-driver-version: 'v2'
-    enable-openstack-services: 'placement-api,l2gw-plugin'
-    enable-openstack-compute-services: 'placement-client'
-    security-group-mode: '{sg-mode}'
-    tools_system_count: 2
-    tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847
-
-    # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled
-    enable-networking-l2gw: 'yes'
index 93b94f15c5021763c7347c94f864932dc7deafa9..61b562eb07de271b0970bc4e524cd50e3c343ebe 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: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -38,7 +38,7 @@
       - gate-minimal-cluster:
           testplan: '{project}-{topology}-minimal-openstack.txt'
       # Job for Test Driven Development with it's own testplan to run new/non-passing suites. scheduled manually.
-      - tdd-wip:
+      - gate-tdd-wip:
           testplan: '{project}-{topology}-tdd-wip-openstack.txt'
           schedule: ''
 
@@ -76,9 +76,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-4
-    openstack_system2_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-4
+    openstack_system2_flavor: v2-standard-2
 
     topology:
       - 1node:
index 043b62f1231ec341418a5727f557e5ac43098902..74bd6b25c4baadf2ddd3b73ad357022985f57789 100644 (file)
     project-type: freestyle
     node: centos7-docker-1c-4g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the Netvirt project against different versions of
         OVS and branches. This job runs nightly.
index 0d6c3e239d9798118ca390606a1066ebb192990b..dd876aed207854d2b40d8bc6c12d8be949f7332b 100644 (file)
@@ -49,4 +49,4 @@
               netvirt-csit-hwvtep-1node-openstack-{os-branch}-gate-stateful-{stream}
       - tdd-wip:
           csit-list: >
-              netvirt-csit-1node-openstack-{os-branch}-tdd-wip-{stream}
+              netvirt-csit-1node-openstack-{os-branch}-gate-tdd-wip-{stream}
index 22867d5f7c9385d032294e004011a9314633776a..f172ba17f5c7875607f28d6eb21e8a839de76fcc 100644 (file)
@@ -3,7 +3,6 @@
     name: netvirt
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - gerrit-tox-verify
       - odl-maven-jobs
@@ -30,7 +29,6 @@
         ovsdb-merge-{stream},
         sfc-merge-{stream}
     email-upstream: '[genius] [netvirt] [neutron] [openflowjava] [openflowplugin] [ovsdb] [sfc]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67da0ffbb1ba
@@ -50,7 +48,6 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
     dependencies:
     email-upstream: '[netvirt]'
-    archive-artifacts: ''
 
 - project:
     name: netvirt-sonar
index b569802268e5304904aca90d1384ac89e8bb8252..9c1c89196138302b00d58a19600223b0c941408c 100644 (file)
@@ -3,7 +3,6 @@
     name: neutron-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -16,7 +15,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -25,7 +23,6 @@
     name: neutron-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -38,7 +35,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
@@ -47,7 +43,6 @@
     name: neutron-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -61,7 +56,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}'
     email-upstream: '[neutron] [odlparent] [aaa]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e1b40d7419
index 338f2b0379077b6653530292f5045968b53b0b86..e4c4a495a4a391c541865a66aa0eb3d34f0f6921 100644 (file)
@@ -3,7 +3,6 @@
     name: next-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
@@ -23,7 +21,6 @@
     name: next-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
@@ -43,7 +39,6 @@
     name: next-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[next]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67e7c516f385
index 5ee9a485000c866b2b254d0a331752291dd43068..5d0dd476fc3e7f83bfc162b39927302c4615b65b 100644 (file)
@@ -3,18 +3,17 @@
     name: nic-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
     name: nic-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
     name: nic-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'nic'
     project-name: 'nic'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}'
     email-upstream: '[nic] [vtn] [groupbasedpolicy]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a67ef386204aa
@@ -67,5 +64,6 @@
     project: 'nic'
     project-name: 'nic'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 239fdc64cbf753f87bf9e6edcf75f75d126274f7..eb99c400c7a4c0944a5943839a3d6be869bd13b7 100644 (file)
@@ -3,7 +3,6 @@
     name: ocpplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a687673279f9c
@@ -23,7 +21,6 @@
     name: ocpplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a687673279f9c
@@ -43,7 +39,6 @@
     name: ocpplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a687673279f9c
index 953dadc81cded07e11715ce8beb1f77d54e9fa56..1b7f0c68e47389c6ab0d7cd2f2d63f12bf48b0f2 100644 (file)
@@ -10,9 +10,6 @@
 ##############################################################################
 echo "---> Cleanup orphaned servers"
 
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-
 minion_in_jenkins() {
     # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
     # Returns: 0 If stack is in Jenkins and 1 if stack is not in Jenkins.
@@ -46,13 +43,22 @@ minion_in_jenkins() {
 # Fetch server list before fetching active minions to minimize race condition
 # where we might be trying to delete servers while jobs are trying to start
 
+# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
+source "/tmp/v/openstack/bin/activate"
+
 # We purposely need word splitting here to create the OS_SERVERS array.
 # shellcheck disable=SC2207
-OS_SERVERS=($(openstack server list -f value -c "Name" | grep -E 'prd|snd'))
+mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd')
+
+deactivate
 
 #############################
 ## DELETE ORPHANED SERVERS ##
 #############################
+
+# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
+source "/tmp/v/lftools/bin/activate"
+
 # Search for servers that are not in use by either releng or sandbox silos and
 # delete them.
 for server in "${OS_SERVERS[@]}"; do
@@ -64,6 +70,9 @@ for server in "${OS_SERVERS[@]}"; do
         continue
     else
         echo "Deleting $server"
-        openstack server delete "$server"
+        lftools openstack --os-cloud vex \
+            server remove --minutes 15 "$server"
     fi
 done
+
+deactivate
index 46a237a5ce295af0568415698ba102ba92e63f2e..24da0238326a059a50b5c16bbb1d5da260b7563a 100644 (file)
     name: odlparent-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
       - gerrit-tox-verify
index b119ff3b2d7f81f4430f072f81e45635799fe584..5892334b09941f9f91e05fdfbbd367d95adfc6fd 100644 (file)
@@ -3,7 +3,6 @@
     name: of-config-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -23,7 +21,6 @@
     name: of-config-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
@@ -43,7 +39,6 @@
     name: of-config-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: netconf-merge-{stream}'
     email-upstream: '[of-config] [netconf]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6880455efe67
index ab4d336fea6f5a46f649925a928f65d123b61fc8..0d55c674560ae7a313e5018fd39ea0c073a6f1b1 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: circuitsw-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -21,7 +19,6 @@
 - project:
     name: circuitsw-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -32,7 +29,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
@@ -40,7 +36,6 @@
 - project:
     name: circuitsw-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -51,7 +46,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[circuitsw]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68970cf5b25c
index 0659504abc0fd2b416357dafd047d71e83c93cb9..b3afb0481f55f737e338a0c78e8dba94b989a7c9 100644 (file)
@@ -48,6 +48,7 @@ for try in $(seq $STACK_RETRIES); do
             CREATE_FAILED)
                 reason=$(openstack stack show "$STACK_NAME" -f value -c stack_status_reason)
                 echo "ERROR: Failed to initialize infrastructure. Reason: $reason"
+                openstack stack resource list -n 25 "$STACK_NAME"
 
                 echo "Deleting stack and possibly retrying to create..."
                 openstack stack delete --yes "$STACK_NAME"
index 66561f090af202896281a3cdc1a4645d008667e4..5a921c0cbca9301643ab6f57e4d7abceb72717e8 100644 (file)
@@ -3,7 +3,6 @@
     name: openflowjava-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68a1507dae22
@@ -24,7 +22,6 @@
     name: openflowjava-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -37,7 +34,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68a1507dae22
index be9eb62d82da3e3b0c9508fbb2b6a4ace45e2c0a..e7b25e8d044d4206d52185cb06a30884bef19bb2 100644 (file)
@@ -25,9 +25,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
index a6bd1362ba678aaf0f37e6d8bc386765be4cbde4..7513bf7132c6558e7bec2ea3582a15b28d53a58d 100644 (file)
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index 416592a8d75d6ef2050e3bd6440d459d3d267d16..339ffa6a2c70f73b8ee382ed1996bd24755f10c0 100644 (file)
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index 006c4406cddfd294df2ad82e491542c7901aec80..9445d68e6b273f8e82603cd35e860591cf8d7be0 100644 (file)
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index f1162b8ccddd896d21aa07a60deb097e1bf83b25..c8fa2132874492c5f672ea59b2ecda4375e8ceb9 100644 (file)
@@ -25,9 +25,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: >
index 0e5a7e20fbb0cddeb9e2a156427685153bea4206..27724beb27850d0547a3a6eb817fd4bc15dbf0c7 100644 (file)
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install
index f3236868905dfeb732795cacbaad999e650b4d7c..5e1531903e3b6c33ab3c87f6403f2dd79b72eee6 100644 (file)
@@ -3,7 +3,6 @@
     name: openflowplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    build-timeout: 90
     dependencies: >
         odlparent-merge-{stream},
         yangtools-merge-{stream},
@@ -30,7 +30,6 @@
     name: openflowplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -38,6 +37,8 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
@@ -56,7 +57,6 @@
     name: openflowplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -64,6 +64,8 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     karaf-version: 'karaf3'
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
@@ -86,6 +88,8 @@
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
+    build-timeout: 90
     mvn-settings: 'openflowplugin-settings'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index 94b69ef54d7f36fbbcc0bd492a954b8c419fca99..68b7292da8dbb8c70feec3c8fe47e4c76b7daa02 100644 (file)
@@ -32,7 +32,7 @@
     project-type: freestyle
     node: centos7-builder-2c-8g
     concurrent: true
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -92,7 +92,7 @@
     name: 'opflex-merge-{stream}'
 
     node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
index 1272d6bfadc879c3832f9ce20cf4e317509bb2f1..3f85b082450275faec2416115d08bd9c38b19115 100644 (file)
@@ -39,7 +39,7 @@
     name: 'opflex-release-{stream}'
 
     node: centos7-builder-2c-8g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     ######################
     # Default parameters #
index 870839d265d6a05cfe305f28892234c53ada9f30..66790de442add13192dfcf42096c38419c56d554 100644 (file)
@@ -15,7 +15,6 @@
 
     dependencies: ''
     email-upstream: '[ovil]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: 7b48866c207d8
index 60473bb322df49fcb79db4fc03befb1cd51b85c1..7b86adad7975c614556c00eca64e1a79309dddf5 100644 (file)
@@ -95,7 +95,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
     description: >
         Integration tests for the OVSDB project against different versions of
         OVS and branches. This job runs nightly.
index 108fe5c431c2754f8a5dc0d7a7e19e85df777557..247ec8c2c65bf07f546ec18b10897e3bf309d36c 100644 (file)
@@ -10,7 +10,9 @@
     stream:
       - oxygen:
           branch: 'master'
-          os-branch: 'pike'
+          # os-branch: 'pike'
+          # issues with pike right now (esp l2gw), lets stick with ocata
+          os-branch: 'ocata'
       - nitrogen:
           branch: 'stable/nitrogen'
           os-branch: 'ocata'
index 53392a17193e4fd9848cb1de29000a2c7fb73dc9..47413b7095846a3f9e4259633334d64c0b266b6b 100644 (file)
@@ -12,7 +12,7 @@
 
     project-type: freestyle
     node: centos7-docker-1c-4g
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
index c9118a47d681c414fcc4af21eb320e487a93ba3b..652820f2622322e4dc6ab22c63101377011a3d2f 100644 (file)
@@ -3,7 +3,6 @@
     name: ovsdb-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
@@ -24,7 +23,6 @@
     name: ovsdb-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
@@ -45,7 +43,6 @@
     name: ovsdb-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
     project: 'ovsdb'
     project-name: 'ovsdb'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'ovsdb-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68b188166958
index 1fd08e53b1033511e31e25273d06cc6b2598e9ac..7ead8dd891291b7f28d10e61e155243863f7dc95 100644 (file)
@@ -3,7 +3,6 @@
     name: p4plugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[p4plugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68bf26e208d4
index 96cee5a78847f2ba26e94acd5726d61a4fce4ce0..ea8df73b66d082084200f72ac4a52ba686777fbe 100644 (file)
@@ -5,16 +5,18 @@
     builders:
       - inject:
           properties-content: 'URL=/home/$USER/rpmbuild/RPMS/noarch/*.rpm'
-      - shell: !include-raw: test-rpm-deps.sh
-      - shell: !include-raw-escape: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
       # Install deps needed interactive Karaf shell tests
       - shell: |
           # Install expect to interact with Karaf shell
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y expect nmap
+      - shell: !include-raw: test-rpm-deps.sh
+      - shell: !include-raw-escape: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw: test-ports-nofeature.sh
       - shell: !include-raw: test-karaf.expect
-      - shell: !include-raw: test-rest-ok.sh
+      # Disable this test until ODLPARENT-139 is fixed
+      # - shell: !include-raw: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: uninstall-rpm.sh
       - shell: |
index a465ac8c5d7310d5457af728cdedff9278411090..23b54285600ebac9507d41b9bc3116ea76ff1d7f 100644 (file)
 
       # Test Oxygen pre-release autorelease tarball
       # FIXME: There aren't any available Oxygen autorelease builds, add one once possible
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
       # - inject:
       # yamllint disable-line rule:line-length
       #    properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
       # - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
-      - 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-20180126.083749-120.zip'
-      - shell: !include-raw-escape: build-rpm.sh
-      - install-test-uninstall-rpm
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
+      # - 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-20180204.191936-134.zip'
+      # - shell: !include-raw-escape: build-rpm.sh
+      # - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
-      - inject:
-          properties-content: 'STREAM=oxygen'
-      - shell: !include-raw: build-rpm-snap.sh
-      - install-test-uninstall-rpm
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
+      # - inject:
+      #     properties-content: 'STREAM=oxygen'
+      # - shell: !include-raw: build-rpm-snap.sh
+      # - install-test-uninstall-rpm
 
     triggers:
       - gerrit:
       - install-test-uninstall-rpm
 
       # Test Oxygen pre-release autorelease tarball
-      # NB: This will need to be updated as old builds expire
       # FIXME: There aren't any available Oxygen autorelease builds, add one once possible
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
+      # 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-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
       # - install-test-uninstall-rpm
 
       # Test Oxygen multipatch zip (no parallel tarball available)
-      # FIXME: Something is wrong with current Oxygen multipatch builds
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
       # 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-20180111.030942-90.zip'
+      #     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-20180204.191936-134.zip'
       # - shell: !include-raw: build-rpm.sh
       # - install-test-uninstall-rpm
 
       # Test latest Oxygen snapshot
+      # FIXME: Oxygen tests fail due to jira.opendaylight.org/browse/ODLPARENT-139
+      # NB: Leaving this one known-failing Oxygen test running so can watch for fix
       - inject:
           properties-content: 'STREAM=oxygen'
       - shell: !include-raw: build-rpm-snap.sh
           build-timeout: '{build-timeout}'
 
     builders:
-      - shell: !include-raw-escape: install-rpm.sh
-      - shell: !include-raw: start-odl.sh
       - shell: |
           # Install expect to interact with Karaf shell
           # Install nmap to check status of ODL's SSH port
           sudo yum install -y expect nmap
+      - shell: !include-raw-escape: install-rpm.sh
+      - shell: !include-raw: start-odl.sh
+      - shell: !include-raw-escape: test-ports-nofeature.sh
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw-escape: test-rest-ok.sh
       - shell: !include-raw: stop-odl.sh
index 5368e208ba57916312e1457b357b91a742185b68..8b5fbcd67e1651992b74c6aa27f6e9c39e2caebe 100644 (file)
@@ -42,26 +42,27 @@ expect {{
   }}
 }}
 
+# Disable this test until ODLPARENT-139 is fixed
 # Install feature
-expect "$prompt"
-send "feature:install odl-netvirt-openstack\r"
-expect {{
-  "Error executing command: Can't install feature" {{
-    send_user "\nFailed to install test feature\n"
-    exit 1
-  }}
-}}
+expect "$prompt"
+send "feature:install odl-netvirt-openstack\r"
+expect {{
+  "Error executing command: Can't install feature" {{
+    send_user "\nFailed to install test feature\n"
+    exit 1
+  }}
+}}
 
 # Verify installed feature is actually installed
-expect "$prompt"
+expect "$prompt"
 # The -i flag will only show installed features
-send "feature:list -i | grep odl-netvirt-openstack\r"
-expect {{
-  timeout {{
-    send_user "\nTest feature not installed\n"
-    exit 1
-  }}
-  "OpenDaylight :: NetVirt :: OpenStack" {{
-    send_user "\nTest feature installed successfully\n"
-  }}
-}}
+send "feature:list -i | grep odl-netvirt-openstack\r"
+expect {{
+  timeout {{
+    send_user "\nTest feature not installed\n"
+    exit 1
+  }}
+  "OpenDaylight :: NetVirt :: OpenStack" {{
+    send_user "\nTest feature installed successfully\n"
+  }}
+}}
diff --git a/jjb/packaging/test-ports-nofeature.sh b/jjb/packaging/test-ports-nofeature.sh
new file mode 100644 (file)
index 0000000..9cdc6e2
--- /dev/null
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+# Options:
+#   -x: Echo commands
+#   -e: Fail on errors
+#   -o pipefail: Fail on errors in scripts this calls, give stacktrace
+set -ex -o pipefail
+
+# Ports that should be open after ODL is started with default features
+# Port 1099: Karaf rmiRegistryPort
+# Port 8101: Karaf SSH Shell port
+# Port 44444: Karaf rmiServerPort
+declare -a expected_ports=("1099" "8101" "44444")
+
+# Ports that should only be open after odl-nevirt-openstack is installed
+# 8080 is Nitrogen and Carbon only, not Oxygen
+declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185")
+
+# Make sure expected ports open
+COUNT="0"
+while true; do
+    open_ports=()
+    closed_ports=()
+    for port in "${expected_ports[@]}"
+    do
+        if nmap -Pn -p$port localhost | grep -q open; then
+            echo "Port $port is open"
+            open_ports+=("$port")
+        else
+            echo "Port $port is not yet open"
+            closed_ports+=("$port")
+        fi
+    done
+    if [[ ${#open_ports[@]} -eq ${#expected_ports[@]} && ${#closed_ports[@]} -eq 0 ]]; then
+        echo "All expected ports are open"
+        echo "Open ports:"
+        printf '%s\n' "${open_ports[@]}"
+        echo "Closed ports:"
+        printf '%s\n' "${closed_ports[@]}"
+        break
+    elif [ $COUNT -gt 120 ]; then
+        echo "Timeout waiting ports to open"
+        echo "Open ports:"
+        printf '%s\n' "${open_ports[@]}"
+        echo "Closed ports:"
+        printf '%s\n' "${closed_ports[@]}"
+        exit 1
+    else
+        ((COUNT+=5))
+        sleep 5
+    fi
+done
+
+# Make sure unexpected ports are not open
+open_ports=()
+closed_ports=()
+for port in "${unexpected_ports[@]}"
+do
+    if nmap -Pn -p$port localhost | grep -q open; then
+        echo "Port $port is open"
+        open_ports+=("$port")
+    else
+        echo "Port $port is not open"
+        closed_ports+=("$port")
+    fi
+done
+if [[ ${#closed_ports[@]} -eq ${#unexpected_ports[@]} && ${#open_ports[@]} -eq 0 ]]; then
+    echo "No unexpected ports are open"
+    echo "Open ports:"
+    printf '%s\n' "${open_ports[@]}"
+    echo "Closed ports:"
+    printf '%s\n' "${closed_ports[@]}"
+fi
index 893de90b903eb590f186a36944a6e854917635e7..2fe013e803f211e895e3885ca295f4db938e5483 100644 (file)
@@ -3,7 +3,6 @@
     name: packetcable-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -23,7 +21,6 @@
     name: packetcable-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
@@ -43,7 +39,6 @@
     name: packetcable-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[packetcable]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68ca4a24655c
index 1b7254c9c0ae471b73d8d6a6870aa416d1228240..8d00a247da47406b5242d097fddb64cbbb5f158e 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: persistence-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -22,7 +20,6 @@
 - project:
     name: persistence-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
@@ -42,7 +38,6 @@
 - project:
     name: persistence-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[persistence]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d3c2bb44d1
index 51b9bc8a154d3668257c83b192cdb9b2d288dc9b..839171392d4c6e3aafd6d74621483c6b688abd56 100644 (file)
     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: v1-performance-1
+    docker_system_flavor: v2-standard-1
     docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346
     odl_system_count: 1
-    odl_system_flavor: v1-performance-2
+    odl_system_flavor: v2-highcpu-4
     odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139
     openstack_system_count: 1
-    openstack_system_flavor: v1-performance-4
+    openstack_system_flavor: v2-standard-4
     openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     openstack_system2_count: 0
-    openstack_system2_flavor: v1-performance-1
+    openstack_system2_flavor: v2-standard-1
     openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648
     tools_system_count: 1
-    tools_system_flavor: v1-performance-1
+    tools_system_flavor: v2-highcpu-2
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 
     # Default Robot framework options
     # Maven / Java
     java-version: 'openjdk8'
     jre: 'openjdk8'
-    jdk: 'openjdk8'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
index 73c5ab5c33c20def31be10407108a00129447e99..c1f41b551893eb4f417825a15077a9884d40de90 100644 (file)
@@ -5,6 +5,7 @@
       - '{project-name}-ci-jobs':
           build-node: centos7-builder-2c-2g
           build-timeout: 60
+          jenkins-silos: releng sandbox
       - builder-check-poms
       - builder-copy-sandbox-logs
       - builder-openstack-cron
index 259ef196073b5628c9bce72103980f8ce92dfcfe..ed88f5101aafd1b5b8a7209e74fb44fe8f66d865 100644 (file)
@@ -5,12 +5,16 @@
     jobs:
       - gerrit-maven-clm
 
-      - gerrit-maven-merge:
-          post_build_trigger:
-            - project:
-                - 'distribution-merge-{stream}'
-              condition: SUCCESS
-              trigger-with-no-params: true
+      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
+      # - gerrit-maven-merge:
+      #     post_build_trigger:
+      #       - project:
+      #           - 'distribution-merge-{stream}'
+      #         condition: SUCCESS
+      #         trigger-with-no-params: true
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
       - gerrit-maven-release
       - gerrit-maven-verify
     # Default parameters #
     ######################
 
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
     mvn-goals: clean install
 
     #####################
@@ -32,7 +42,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-merge-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    archive-artifacts: >
+      **/*.log
+      **/hs_err_*.log
+      **/target/**/feature.xml
+      **/target/failsafe-reports/failsafe-summary.xml
+      **/target/surefire-reports/*-output.txt
+    mvn-version: mvn33
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
+    project-type: maven
+    node: '{build-node}'
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: STREAM
+          default: '{stream}'
+          description: "String representing release name"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: 'H H * * 0'
+      - gerrit-trigger-patch-merged:
+          gerrit-server-name: '{gerrit-server-name}'
+          name: '{project}'
+          branch: '{branch}'
+
+    prebuilders:
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
+
+    # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
+    maven:
+      maven-name: '{mvn-version}'
+      goals: >
+          {mvn-goals}
+          -Dmerge
+          -Dstream={stream}
+          {opendaylight-infra-mvn-opts}
+      maven-opts: '{mvn-opts}'
+      settings: '{mvn-settings}'
+      settings-type: cfp
+      global-settings: 'global-settings'
+      global-settings-type: cfp
+      post-step-run-condition: UNSTABLE
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - lf-jacoco-report
+      - lf-infra-publish
+      - trigger:
+          project: 'distribution-merge-{stream}'
+          threshold: SUCCESS
index 9bdbd51d26f36d2910b080c886952f32999dd3fa..4a5eef8b18b0526a452a73e63e7c7b1bdea22090 100644 (file)
@@ -7,7 +7,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -75,7 +75,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     parameters:
       - opendaylight-infra-parameters:
index 47ae0223cb1147cce4fd4d46fd6c7ba559b0dd78..9af582ca7329fb4c776314c37588a0e01e1cf94c 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: reservation-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
@@ -21,7 +19,6 @@
 - project:
     name: reservation-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -32,7 +29,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
@@ -40,7 +36,6 @@
 - project:
     name: reservation-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -52,7 +47,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[reservation]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68d9bc504037
index a970d3bafa477228684d00a2d460660ced6c6f51..99c856bf9a84638e2bc6027963e45b1a941a1258 100644 (file)
@@ -3,18 +3,17 @@
     name: sdninterfaceapp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
     name: sdninterfaceapp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/nitrogen'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
     name: sdninterfaceapp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'stable/carbon'
+    build-node: centos7-builder-2c-8g
     karaf-version: karaf3
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'bgpcep-merge-{stream}'
     email-upstream: '[sdninterfaceapp] [bgpcep]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68e3d1ff55e3
@@ -67,5 +64,6 @@
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
+    build-node: centos7-builder-2c-8g
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
index d1f34cc64950f5377908e7a09aa6796c278c44de..a38ec9b221c62265fbcc48d4e6c5d13433704c9a 100644 (file)
@@ -3,7 +3,6 @@
     name: sfc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -15,7 +14,6 @@
     build-timeout: 120
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
@@ -25,7 +23,6 @@
     name: sfc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -36,7 +33,6 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
@@ -46,7 +42,6 @@
     name: sfc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -58,7 +53,6 @@
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
     dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}'
     email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]'
-    archive-artifacts: ''
     build-node: centos7-builder-8c-8g
 
     # Used by the release job
index b580353fa3573a8ae54daab23b106dcb24b87643..53a61ecd040996805e71c4d97a606dc8190df22b 100644 (file)
@@ -3,7 +3,6 @@
     name: snbi-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
@@ -23,7 +21,6 @@
     name: snbi-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
@@ -43,7 +39,6 @@
     name: snbi-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[snbi]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68f328cefed6
index 0797d5820f738f03ed8b0e1b448d8c2c6d7c41a8..55ee922330d7e69e493f73c22219fa9d9c0c6b68 100644 (file)
@@ -3,7 +3,6 @@
     name: snmp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
@@ -23,7 +21,6 @@
     name: snmp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
@@ -43,7 +39,6 @@
     name: snmp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[snmp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a68fb236b93a6
index 6bf8e0fec2f2cd0c54d5d7c48a58242afb1a0aef..ecb20af3360619749ab13dc7343b52a32ccf4204 100644 (file)
@@ -3,7 +3,6 @@
     name: snmp4sdn-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
@@ -23,7 +21,6 @@
     name: snmp4sdn-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
@@ -43,7 +39,6 @@
     name: snmp4sdn-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69034a4b6ef5
index bbc06bd2ed36f7a8dc152a72eccc1fca24b27bd0..351fb888100645d36ffaa7b651ec259d91207fb7 100644 (file)
@@ -3,7 +3,6 @@
     name: sxp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -23,7 +21,6 @@
     name: sxp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
@@ -43,7 +39,6 @@
     name: sxp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[sxp] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6909c75719b7
index e90c54398aa1cb555419c1e894e4196d3b8dfbed..e75892ea79ede8761194731cd10107b87bc2f68d 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: systemmetrics-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
@@ -21,7 +19,6 @@
 - project:
     name: systemmetrics-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
@@ -32,7 +29,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
@@ -40,7 +36,6 @@
 - project:
     name: systemmetrics-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'systemmetrics'
@@ -52,7 +47,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69113575458e
index 95a78bf243d8259939101681ce1b7508630b0e22..c8147cf119209261e9d26f2ddf34d19f37aebf20 100644 (file)
@@ -3,7 +3,6 @@
     name: topoprocessing-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
@@ -23,7 +21,6 @@
     name: topoprocessing-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
@@ -43,7 +39,6 @@
     name: topoprocessing-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a691bbe2328cb
index c1602ba26f538243bee4eaadc8c8dceb3970a84b..3f5c8fa127c0b55f5442be7ae44f3b343a4d7033 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: transportpce-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'transportpce'
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
@@ -21,7 +19,6 @@
 - project:
     name: transportpce-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'transportpce'
@@ -32,7 +29,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
@@ -40,7 +36,6 @@
 - project:
     name: transportpce-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     project: 'transportpce'
@@ -52,7 +47,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}'
     email-upstream: '[transportpce] [odlparent] [yangtools] [controller]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a6927323fa3d4
index 8b26f5df0cf3d5af6bc35f9cd1b1f37eeaf1a563..830ddc77ac04820953155bad2ff790871d7eb50c 100644 (file)
@@ -3,7 +3,6 @@
     name: tsdr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
@@ -23,7 +21,6 @@
     name: tsdr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
@@ -43,7 +39,6 @@
     name: tsdr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[tsdr]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69373036303c
index 61b06172461e5ab32b21b9f1694ca8318afba875..b92ebd1c78e7c4d218918a4730dc0e2b9aaace48 100644 (file)
@@ -3,7 +3,6 @@
     name: ttp-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a693f948563d5
@@ -23,7 +21,6 @@
     name: ttp-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a693f948563d5
@@ -43,7 +39,6 @@
     name: ttp-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[ttp] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a693f948563d5
index 10e12ff2e0a62c998c3f30149613167d6e4be4c5..65e659cbc3d90b8cedd8f51624fba5a06e53c8f3 100644 (file)
@@ -3,7 +3,6 @@
     name: unimgr-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -24,7 +22,6 @@
     name: unimgr-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -35,7 +32,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -45,7 +41,6 @@
     name: unimgr-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -57,7 +52,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'ovsdb-merge-{stream}'
     email-upstream: '[unimgr] [ovsdb]'
-    archive-artifacts: ''
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
index 16a9e10e24ca12ca8f89e86c5ea4766e3729579e..fab6c6277f19c6677b7604dec716aaa309ba1ead 100644 (file)
@@ -3,7 +3,6 @@
     name: usc-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -15,7 +14,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
@@ -24,7 +22,6 @@
     name: usc-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -36,7 +33,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
@@ -45,7 +41,6 @@
     name: usc-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -58,7 +53,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
     email-upstream: '[usc] [controller] [yangtools] [odlparent]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a697b633b3ffe
index 4d0ee2843f4774a5c2c8fd09e6137b43bd30c0e0..f4fd0fa480cd60a7f5415e9ef68472ff8e6051c3 100644 (file)
@@ -3,7 +3,6 @@
     name: usecplugin-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69902281e037
@@ -23,7 +21,6 @@
     name: usecplugin-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69902281e037
@@ -43,7 +39,6 @@
     name: usecplugin-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'openflowplugin-merge-{stream}'
     email-upstream: '[usecplugin] [openflowplugin]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69902281e037
index 197a5b653b996bf417e03f2056f8942c3e7a491a..512ac50c28cc6e564e8f1ae5194ccfb6f1e18f0a 100644 (file)
@@ -42,6 +42,6 @@
     public-bridge: 'br-ex'
     disable-openstack-services: 'n-net,q-l3'
     tenant-network-type: 'local'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
     odl-ml2-driver-version: 'v2'
index e0c973e458c3724d0f4eefaac76dbc716dd51520..d5a7386eb03c0eedb44cedfb7ddefa0e6c64dae9 100644 (file)
@@ -3,7 +3,6 @@
     name: vtn-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -29,7 +28,6 @@
     name: vtn-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -55,7 +53,6 @@
     name: vtn-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index bc312bc658c4199cc8d88f5dfbfddcb8374dfecf..c533c444c3e66453f0444e02665163f7ace98dc2 100644 (file)
@@ -3,7 +3,6 @@
     name: yang-push-oxygen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -14,7 +13,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[yang-push]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69aae2832869
@@ -23,7 +21,6 @@
     name: yang-push-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -34,7 +31,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[yang-push]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69aae2832869
@@ -43,7 +39,6 @@
     name: yang-push-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -55,7 +50,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: ''
     email-upstream: '[yang-push]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: a69aae2832869
index 98e63de308e2f2687f7e6cda7f98009ca9d1db8c..1358a5e88d4f39de6fc2160589c00f900db9ca6a 100644 (file)
@@ -2,7 +2,6 @@
 - project:
     name: yangide-oxygen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: oxygen
@@ -13,7 +12,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
@@ -21,7 +19,6 @@
 - project:
     name: yangide-nitrogen
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: nitrogen
@@ -32,7 +29,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
@@ -40,7 +36,6 @@
 - project:
     name: yangide-carbon
     jobs:
-      - '{project-name}-integration-{stream}'
       - odl-maven-jobs
 
     stream: carbon
@@ -52,7 +47,6 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[yangide] [odlparent] [yangtools]'
-    archive-artifacts: ''
 
     # Used by the release job
     staging-profile-id: fba306956f98
index c2d51a1c7726edac2466c349703823fbb8e1e795..19644cfc49396ab75f1f23678707165111e5262b 100644 (file)
@@ -35,5 +35,4 @@
     robot-options: ''
 
     # Additional patterns to archive
-    archive-artifacts: ''
     # FIXME: Delete if no patterns.
index 5dbfb07b9afe078965e736a543d0d15d1c511cc5..2812b50aafd289c43a1023287d2b8dd08aa3e0f9 100644 (file)
@@ -30,7 +30,6 @@
     name: yangtools-nitrogen
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
@@ -59,7 +58,6 @@
     name: yangtools-carbon
     jobs:
       - '{project-name}-distribution-check-{stream}'
-      - '{project-name}-integration-{stream}'
       - '{project-name}-maven-javadoc-jobs'
       - odl-maven-jobs
 
index 0b9b6addb738ea7c483c8cdf75b9ae173480f9cd..45fe40b674c0f2d2cfed080848ddeb2775b7d402 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 0b9b6addb738ea7c483c8cdf75b9ae173480f9cd
+Subproject commit 45fe40b674c0f2d2cfed080848ddeb2775b7d402
index ee1810e763425480edd032f9dd2aae0c2b289b8c..4332818a2ae9fc366bace64f459f4e44d1f8a86e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ee1810e763425480edd032f9dd2aae0c2b289b8c
+Subproject commit 4332818a2ae9fc366bace64f459f4e44d1f8a86e
diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml
new file mode 100644 (file)
index 0000000..919ba27
--- /dev/null
@@ -0,0 +1,14 @@
+---
+- import_playbook: ../common-packer/provision/docker.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+
+  pre_tasks:
+    - include_role: name=system-update
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
deleted file mode 100644 (file)
index 54b5aa75c10620dd70e9a1c52ad2bfd707f1f786..0000000000000000000000000000000000000000
+++ /dev/null
@@ -1,59 +0,0 @@
-{
-  "variables": {
-    "base_image": null,
-    "distro": null,
-    "cloud_auth_url": null,
-    "cloud_user": null,
-    "cloud_pass": null,
-    "cloud_network": null,
-    "cloud_tenant": null,
-    "cloud_user_data": null,
-    "ssh_user": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "name": "vexxhost",
-      "image_name": "ZZCI - {{user `distro`}} - builder - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `base_image`}}",
-      "type": "openstack",
-      "identity_endpoint": "{{user `cloud_auth_url`}}",
-      "username": "{{user `cloud_user`}}",
-      "password": "{{user `cloud_pass`}}",
-      "tenant_name": "{{user `cloud_tenant`}}",
-      "domain_name": "Default",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "networks": [
-        "{{user `cloud_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "ssh_username": "{{user `ssh_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "flavor": "v1-standard-1",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "common-packer/provision/install-python.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    },
-    {
-      "type": "ansible",
-      "playbook_file": "provision/builder.yaml",
-      "ansible_env_vars": [
-        "ANSIBLE_NOCOWS=1",
-        "ANSIBLE_PIPELINING=True",
-        "ANSIBLE_ROLES_PATH=../lf-ansible/roles",
-        "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
-        "ANSIBLE_STDOUT_CALLBACK=debug"
-      ]
-    }
-  ]
-}
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..bd227be506197b62f37dcd7037a31763d97606f7
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/builder.json
\ No newline at end of file
index 4f33327fb1cdf37e1d0cf5c7fda14923be58489d..edea6d28521d3bd753054f0a7c636efb53f7aa0e 120000 (symlink)
@@ -1 +1 @@
-../common-packer/templates/docker.json.example
\ No newline at end of file
+../common-packer/templates/docker.json
\ No newline at end of file