Merge "Increase ocata packer timeout from 60m to 75m"
authorSam Hague <shague@redhat.com>
Sat, 20 Jan 2018 14:54:08 +0000 (14:54 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Sat, 20 Jan 2018 14:54:08 +0000 (14:54 +0000)
119 files changed:
.coafile
docs/cloud-images.rst
docs/jenkins.rst
jenkins-scripts/basic_settings.sh
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/atrium/atrium.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/notify-build-failure.sh
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe-csit-openstack.yaml [deleted file]
jjb/coe/coe.yaml
jjb/controller/controller.yaml
jjb/copy-sandbox-logs.sh [new file with mode: 0644]
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/genius/genius-patch-test.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 [new file with mode: 0644]
jjb/integration/distribution/distribution-check-bootup.sh
jjb/integration/distribution/distribution-deploy-offline.sh
jjb/integration/distribution/distribution-deploy-verify.sh
jjb/integration/distribution/distribution.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-install-robotframework.sh
jjb/integration/integration-macros.yaml
jjb/integration/integration-start-cluster-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/integration/multipatch-distribution.sh
jjb/integration/update-csit-tests.sh
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/messaging4transport/messaging4transport.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.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.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odlparent/odlparent.yaml
jjb/of-config/of-config.yaml
jjb/ofextensions/circuitsw/circuitsw.yaml
jjb/openflowjava/openflowjava.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/ovil/ovil.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/packaging.yaml
jjb/packaging/uninstall-rpm.sh [new file with mode: 0644]
jjb/packetcable/packetcable.yaml
jjb/persistence/persistence.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-packer-jobs.yaml
jjb/releng-templates-java.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.yaml
jjb/yang-push/yang-push.yaml
jjb/yangide/yangide.yaml
jjb/yangtools/yangtools.yaml
lf-ansible
packer/provision/builder.yaml
packer/provision/mininet-ovs-2.8.yaml [new file with mode: 0644]
packer/provision/mininet.sh [deleted file]
packer/templates/baseline.json [deleted file]
packer/templates/devstack-pre-pip-newton.json
packer/templates/devstack-pre-pip-ocata.json
packer/templates/devstack-pre-pip-pike.json
packer/templates/devstack.json
packer/templates/gbp.json
packer/templates/mininet-ovs-2.5.json
packer/templates/mininet-ovs-2.6.json
packer/templates/mininet-ovs-2.8.json [new file with mode: 0644]
packer/templates/mininet.json [deleted file]
packer/vars/centos.json
packer/vars/ubuntu-14.04.json
packer/vars/ubuntu-16.04.json

index 60e83070f29ef42c5050e595d732c8608e4a3afa..47cf0afb0b62d28f3efad57549d4f6ee72186348 100644 (file)
--- a/.coafile
+++ b/.coafile
@@ -31,7 +31,6 @@ files = **.sh
 ignore = .git/**,
     .tox/**,
     jjb/global-jjb/**,
-    jjb/integration/**,
     jenkins-scripts/*-local-env.sh
 shell = bash
 indent_size = 4
index f528fbbebee2a491a20bddcdcd8cf1a30f930516..e24ebbbb2c24449f31b134e52a16d689d4085fd7 100644 (file)
@@ -1,9 +1,11 @@
 Following are the list of published images available to be used with Jenkins jobs.
 
+* ZZCI - CentOS 7 - builder - 20180109-0417
 * 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 - java-builder - 20171206-1842
 * ZZCI - CentOS 7 - java-builder - 20171209-0032
 * ZZCI - CentOS 7 - robot - 20171207-1911
index 6b07f6c069e0c8f6bdbb348309d846c27e353c03..e6f802a04e99eeb77a9e4a7bc92ecd2c9d2d6aa8 100644 (file)
@@ -202,26 +202,50 @@ accounts in the cloud so should ensure consistent performance.
      - CPUs
      - Memory
 
-   * - v1-performance-1
+   * - v2-standard-1
      - 1
      - 4
 
-   * - v1-performance-2
+   * - v2-standard-2
      - 2
      - 8
 
-   * - v1-performance-4
+   * - v2-standard-4
      - 4
      - 16
 
-   * - v1-performance-8
+   * - v2-standard-8
      - 8
      - 32
 
-   * - v1-performance-16
+   * - v2-standard-16
      - 16
      - 64
 
+   * - v2-highcpu-1
+     - 1
+     - 1
+
+   * - v2-highcpu-2
+     - 2
+     - 2
+
+   * - v2-highcpu-4
+     - 4
+     - 4
+
+   * - v2-highcpu-8
+     - 8
+     - 8
+
+   * - v2-highcpu-16
+     - 16
+     - 16
+
+   * - v2-highcpu-32
+     - 32
+     - 32
+
 Pool: ODLVEX
 ^^^^^^^^^^^^
 
index 11514d38278d1911109fa1e7541f6f902c3b1132..a80b9ffeb2b03a3009c98cfd1d9334006e56975e 100755 (executable)
@@ -31,4 +31,10 @@ cat <<EOKNOWN >  /etc/ssh/ssh_known_hosts
 [140.211.169.26]:29418,[git.opendaylight.org]:29418 ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAyRXyHEw/P1iZr/fFFzbodT5orVV/ftnNRW59Zh9rnSY5Rmbc9aygsZHdtiWBERVVv8atrJSdZool75AglPDDYtPICUGWLR91YBSDcZwReh5S9es1dlQ6fyWTnv9QggSZ98KTQEuE3t/b5SfH0T6tXWmrNydv4J2/mejKRRLU2+oumbeVN1yB+8Uau/3w9/K5F5LgsDDzLkW35djLhPV8r0OfmxV/cAnLl7AaZlaqcJMA+2rGKqM3m3Yu+pQw4pxOfCSpejlAwL6c8tA9naOvBkuJk+hYpg5tDEq2QFGRX5y1F9xQpwpdzZROc5hdGYntM79VMMXTj+95dwVv/8yTsw==
 EOKNOWN
 
+# To handle the prompt style that is expected all over the environment
+# with how use use robotframework we need to make sure that it is
+# consistent for any of the users that are created during dynamic spin
+# ups
+echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
+
 # vim: sw=2 ts=2 sts=2 et :
index 08cfbdfbbe3d92b388621ff2e2fa9a1b11fd2f68..e6816390ec3e77384a6656ffb362df5fa6143588 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'aaa'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'aaa'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: carbon
     project: 'aaa'
index 13c60f745c51aa4cb6b3f63f3068c81bbb3b32de..4527fd8e82a46a8e34f6c76e145911827a669e64 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'alto'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'alto'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'alto'
index aa3c6139d6ec1e6ff4733e3566014c08a87d180d..7a9dad82bd555df5753aaff8492340c7e464c295 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'atrium'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'atrium'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'atrium'
index b53a437ec462b49ab6f3faca6099ee6aa7b77332..a9b0a373feba04013c82ff6ca58986bfd7d861b3 100644 (file)
@@ -3,11 +3,11 @@
     name: autorelease-projects
     jobs:
       - 'autorelease-generate-release-notes-{stream}'
-      - 'autorelease-release-{stream}'
+      - 'autorelease-release-{stream}':
+          build-node: centos7-autorelease-8c-16g
       - 'autorelease-update-validate-jobs-{stream}'
       - 'autorelease-version-bump-{stream}'
-      - '{project-name}-validate-autorelease-{stream}':
-          build-node: centos7-builder-2c-8g
+      - '{project-name}-validate-autorelease-{stream}'
       - gerrit-tox-verify
 
     # todo: After Carbon EOL remove next-release-tag and directy pass
index d868d9e1e79ad706073ba7eea6f0e503d2048c0d..3dfe884835470c2a48da3a18dcbc9745cbbf665f 100644 (file)
@@ -7,6 +7,7 @@
     # Defaults #
     ############
 
+    build-node: centos7-autorelease-8c-16g
     java-version: openjdk8
     mvn-version: mvn33
     extra-mvn-opts: ''
@@ -16,7 +17,7 @@
     #####################
 
     project-type: freestyle
-    node: centos7-builder-4c-16g
+    node: '{build-node}'
     jdk: '{java-version}'
     cron: 'H 0 * * *'
 
           settings-type: cfp
           global-settings: global-settings
           global-settings-type: cfp
+      # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease
+      - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom
       - maven-target:
           maven-version: mvn33
           pom: pom.xml
index 5128c97bbe3a68138838833f8432367a6ffe2203..0e3fe29b4f3fed4d86795a2716cbe4bea83cae62 100644 (file)
@@ -11,6 +11,8 @@
 # This script parses the console log to discover which project has caused a
 # build failure and notify the project as appropriate.
 
+echo "---> notify-build-failure.sh"
+
 NEWLINE=$'\n'
 RELEASE_EMAIL="release@lists.opendaylight.org"
 ARCHIVES_DIR="$JENKINS_HOSTNAME/$JOB_NAME/$BUILD_NUMBER"
index 445e73576bbaf5d777a3e05b47dc2e939a5a2c35..da8da068b937e397a337f8161d561bb3ec7c7e52 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bgpcep'
@@ -39,9 +38,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bgpcep'
@@ -74,9 +72,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bgpcep'
index 4b9c3b86fcc1d51a59cd7be00655a519348554b6..4cbf059274e28b3495d170af1bd669e6be8ba839 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'bier'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'bier'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'bier'
index 9c87714fb8fbf8d59302f172a1b1a913fccd8954..eb31447c670b1ca62a3f5b9f00af3d9de7363c24 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'capwap'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'capwap'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'capwap'
index 3880e23be198d844ec3cf8231b4e34bb7a61c762..ffc3baa5cd8ad4983250d6c5d41210b36f879ae9 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'cardinal'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'cardinal'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'cardinal'
index 14b9db0e9f1f1e403c1f8169d829f68a06117da2..bd045cbf8c55a84962180a7b4474e5868d95349e 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'centinel'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'centinel'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'centinel'
diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml
deleted file mode 100644 (file)
index abef3f7..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- project:
-    name: coe-csit-openstack-integration
-    jobs:
-      - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}'
-
-    project: 'coe'
-
-    topology:
-      - 1node:
-          openstack_system_count: 3
-          odl_system_count: 1
-          enable-haproxy: 'no'
-          install-features: 'odl-netvirt-openstack'
-      - 3node:
-          openstack_system_count: 4
-          odl_system_count: 3
-          enable-haproxy: 'yes'
-          install-features: 'odl-jolokia,odl-netvirt-openstack'
-
-    testplan: '{project}-{topology}-openstack.txt'
-
-    functionality: 'kubernetes'
-
-    stream:
-      - oxygen:
-          branch: 'master'
-      - nitrogen:
-          branch: 'stable/nitrogen'
-
-    openstack:
-      - ocata:
-          openstack-branch: 'stable/ocata'
-          odl-ml2-branch: 'stable/ocata'
-          odl-ml2-driver-version: 'v2'
-          openstack_system_image: '{openstack_system_image_ocata}'
-
-    create-initial-networks: 'True'
-
-    enable-openstack-plugins: 'networking-odl,kuryr-kubernetes,neutron-lbaas'
-
-    enable-openstack-services: >
-        legacy_etcd,docker,q-lbaasv2,kubernetes-api,
-        kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes
-
-    disable-openstack-services: 'etcd3'
-
-    lbaas-service-provider: >
-        'LOADBALANCERV2:opendaylight:networking_odl.lbaas.driver_v2.OpenDaylightLbaasDriverV2:default'
index c83c050c38c414a417cc3e4411f4b70afdbba687..bda82a85650d2838fb5792f38106569005c47381 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
@@ -57,8 +55,7 @@
     name: coe-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'coe'
     project-name: 'coe'
index dc7bc56e31bcc1e8a8f36496c7f40934b1a5e7b3..78631d214483fa96dcb6bc78a0f827e95912b9ba 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'controller'
@@ -33,8 +32,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'controller'
@@ -60,8 +58,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: carbon
     project: 'controller'
diff --git a/jjb/copy-sandbox-logs.sh b/jjb/copy-sandbox-logs.sh
new file mode 100644 (file)
index 0000000..2cc2c82
--- /dev/null
@@ -0,0 +1,47 @@
+#!/bin/bash
+# SPDX-License-Identifier: EPL-1.0
+##############################################################################
+# Copyright (c) 2017 The Linux Foundation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+##############################################################################
+# Allows folks to copy sandbox logs over to releng for longer storage
+#
+# In some cases folks would like to save sandbox logs for a longer period of
+# time in order to troubleshoot difficult tasks. This script can be used to
+# trigger Jenkins production to copy specific logs over for longer storage.
+#
+# This is triggered via Gerrit comment.
+# Usage: copy-logs: JOB_NAME/BUILD_NUMBER
+echo "---> copy-sandbox-logs.sh"
+
+build_path="$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep 'copy-logs:' | awk -F: '{print $2}' | tr -d '[:space:]')"
+fetch_url="https://logs.opendaylight.org/sandbox/vex-yul-odl-jenkins-2/$build_path"
+
+COPY_DIR="$WORKSPACE/archives"
+mkdir -p "$COPY_DIR"
+pushd "$COPY_DIR" || exit
+
+# Ensure that the repo_url has a trailing slash as wget needs it to work
+case "$fetch_url" in
+    */)
+        ;;
+    *)
+        fetch_url="$fetch_url/"
+        ;;
+esac
+
+echo "Fetching artifacts from $fetch_url..."
+wget -nv --recursive --execute robots=off --no-parent \
+    --no-host-directories --cut-dirs=2 --level=15 \
+    "$fetch_url"
+
+echo "Removing files that do not need to be cloned..."
+mapfile -t remove_files < <(find . -type f -name "*index.html*")
+for f in "${remove_files[@]}"; do
+    rm "$f"
+done
+popd || exit
index 5a300fe311f5dabcab5c4f197f72b86d3933edaf..ae09f245f37c302bc9b671ee58ef95fc3154f17c 100644 (file)
@@ -3,8 +3,7 @@
     name: coretutorials-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'coretutorials'
@@ -21,6 +20,7 @@
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -29,8 +29,7 @@
     name: coretutorials-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'coretutorials'
@@ -47,6 +46,7 @@
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -55,8 +55,7 @@
     name: coretutorials-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'coretutorials'
@@ -74,6 +73,7 @@
     dependencies: ''
     email-upstream: '[coretutorials]'
     archive-artifacts: ''
+    build-timeout: 120
 
     # Used by the release job
     staging-profile-id: 96cd299563ec6
@@ -89,3 +89,4 @@
     mvn-settings: 'coretutorials-settings'
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    build-timeout: 120
index 2bd15c025b8434fb026c0148556c6587efcadd5c..96ad5278112ede7a88938e7cd14d7c5f13836d9e 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'daexim'
     project-name: 'daexim'
index 88a2f40c905037aad993ce43946bb46db27c34c2..de560eea33235465d9ff932912ee0401e9e7d013 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'didm'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'didm'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'didm'
index 4bc0cff7457d42d7fb83fd31000d1daae7477c19..e6ab39ea958f252bd7f08926f074028b235c7baf 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'dlux'
@@ -17,7 +16,7 @@
       - mvn33:
           mvn-version: 'mvn33'
     mvn-settings: 'dlux-settings'
-    mvn-goals: 'clean install'
+    mvn-goals: 'clean install -e'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     dependencies: 'odlparent-merge-{stream}'
     email-upstream: '[dlux] [odlparent]'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'dlux'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'dlux'
index 486b12b1d40e658c005665e96b47a6e3fe3a2e98..0b479d155aa46de9129f3895dee5c511f3b16238 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'dluxapps'
     project-name: 'dluxapps'
index 8591893647898ead50816ed85d1f89232224447b..df4f24a342ad23696368115c88cb080152ee1029 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'eman'
@@ -33,9 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'eman'
@@ -62,9 +60,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'eman'
index 73a5ef4693acc310dbf6607c601bd736b47cc985..af7804f42dde5da812191bbcffa6b5567c155ebf 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'faas'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'faas'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'faas'
index 50ce1bdf8c6d1170978dc2ee2614cb9be5678abe..b4180e1b32ee93012aef3dfab9a5cd582fc1a4b7 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
@@ -60,9 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'federation'
     project-name: 'federation'
index 2074fe8c27e868b67fe124a99dad7e3141b54a5a..0bd622eb465c490a7703425921e94ccbf60cdd8c 100644 (file)
@@ -34,3 +34,7 @@
       - genius:
           csit-list: >
               genius-csit-1node-gate-all-{stream}
+
+      - cluster:
+          csit-list: >
+              genius-csit-3node-gate-all-{stream}
index ab752c2108b9f3af678b19c45fcb0950280203c3..a11bd16a71d4b15245a6709c7a227a893f6a3f16 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'genius'
@@ -38,8 +37,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'genius'
@@ -70,8 +68,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'genius'
index 562c3373545caf7c69524adfec4d3cba7e38c0c5..a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 562c3373545caf7c69524adfec4d3cba7e38c0c5
+Subproject commit a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e
index e3b1443dd5418da69f189c8de19534d5b533fe33..dcf6c8ccc73d56e50ac831308f084c95a24c3d0d 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'groupbasedpolicy'
@@ -37,8 +36,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'groupbasedpolicy'
@@ -69,8 +67,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'groupbasedpolicy'
index 43e0f2deffdc310c42b40917c99e4478e463e93c..157660f36491897981b938f7c899925b4f0d7bdf 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'honeycomb/vbd'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'honeycomb/vbd'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'honeycomb/vbd'
index 6c743bc372bf2059ca6ad66fa5f78ee3717dfe53..77fe7e4b34a7da9ddc35aacf5b0ccba4672fa4f9 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'infrautils'
@@ -32,8 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'infrautils'
@@ -59,8 +57,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'infrautils'
diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
new file mode 100644 (file)
index 0000000..7e3b3b6
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+# Basic controller configuration settings
+export MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
+export FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
+export CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
+export LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
+export MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
+export CONTROLLERMEM="2048m"
+
+# Cluster specific configuration settings
+export AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
+export MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
+export MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
+
+# Setup JAVA_HOME and MAX_MEM Value in ODL startup config file
+function set_java_vars() {
+
+    echo "Configure java home and max memory..."
+    sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF}
+    sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
+    cat ${MEMCONF}
+
+    echo "Set Java version"
+    sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
+    sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
+    echo "JDK default version ..."
+    java -version
+
+    echo "Set JAVA_HOME"
+    export JAVA_HOME="${JAVA_HOME}"
+    # shellcheck disable=SC2037
+    JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
+    echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
+} # set_java_vars()
index d4ffea9cdd3bcff8939ddbbbdddb799aa92269f9..2a333dea772f553e762e41d85cdced555f814f81 100644 (file)
@@ -20,10 +20,13 @@ unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-# Add test feature repo if Karaf 4.
-sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Add actual boot features.
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
@@ -43,6 +46,7 @@ netstat -pnatu
 
 echo "redirected karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 if [ "${JDKVERSION}" == 'openjdk8' ]; then
     echo "Setting the JRE Version to 8"
@@ -61,6 +65,7 @@ java -version
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
@@ -151,9 +156,9 @@ echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
 echo "Bug 4628: Detecting misplaced config files"
-pushd "${WORKSPACE}/${BUNDLEFOLDER}"
+pushd "${WORKSPACE}/${BUNDLEFOLDER}" || exit
 XMLS_FOUND="$(echo *.xml)"
-popd
+popd || exit
 if [ "$XMLS_FOUND" != "*.xml" ]; then
     echo "Bug 4628 confirmed."
     ## TODO: Uncomment the following when ODL is fixed, to guard against regression.
index f6c83c2ad8e78a882e4d003784698a80ffe84708..e7920b5346b066c5d16ad8e8696a73ac72f4ccad 100644 (file)
@@ -15,10 +15,13 @@ unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
 FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
-# Add test feature repo if Karaf 4.
-sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Feature is instaled later.
 cat "${FEATURESCONF}"
 
@@ -57,6 +60,7 @@ java -version
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
index e3e60a5a90a9fdd3ce5049dbc216fdfd89079e32..c81ac6db6734fd7472c28236fe801a4ead40a633 100644 (file)
@@ -14,11 +14,14 @@ echo "Extracting the new controller..."
 unzip -q "${BUNDLE}"
 
 echo "Configuring the startup features..."
-FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-# Add test feature repo if Karaf 4.
-sed -ie "s%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
-# Add test feature repo if Karaf 3.
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features%g" "${FEATURESCONF}"
+FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg"
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF}
+
 # Add actual boot features.
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}"
 cat "${FEATURESCONF}"
@@ -53,6 +56,7 @@ java -version
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
@@ -129,9 +133,9 @@ echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
 echo "Bug 4628: Detecting misplaced config files"
-pushd "${WORKSPACE}/${BUNDLEFOLDER}"
+pushd "${WORKSPACE}/${BUNDLEFOLDER}" || exit
 XMLS_FOUND=`echo *.xml`
-popd
+popd || exit
 if [ "$XMLS_FOUND" != "*.xml" ]; then
     echo "Bug 4628 confirmed."
     ## TODO: Uncomment the following when ODL is fixed, to guard against regression.
index 53d72fc8b9caf37880af39291ee140524dda0f57..b5e48fd91845d3110fbba6004498ae1294bd51e0 100644 (file)
@@ -10,6 +10,7 @@
       - 'distribution-offline-{stream}'
       - 'distribution-check-{stream}'
       - gerrit-maven-clm
+      - gerrit-maven-verify-dependencies
       - gerrit-tox-verify
 
     project: integration/distribution
index 27a9d2447c103762d2e640d1e942378f0d665ffb..5b1db13ec908f13a2ccd58676d2918d611fe6c38 100644 (file)
@@ -9,20 +9,9 @@ echo "#################################################"
 echo "##         Configure Cluster and Start         ##"
 echo "#################################################"
 
-AKKACONF=/tmp/${BUNDLEFOLDER}/configuration/initial/akka.conf
-MODULESCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/modules.conf
-MODULESHARDSCONF=/tmp/${BUNDLEFOLDER}/configuration/initial/module-shards.conf
-MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
-FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
-LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
-CONTROLLERMEM="2048m"
-
-
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    CONTROLLERMEM="3072m"
+    export CONTROLLERMEM="3072m"
 else
     ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
 fi
@@ -82,7 +71,13 @@ cat ${MAVENCONF}
 
 echo "Configuring the startup features..."
 sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
-sed -ie "s%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/features-integration-index/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" ${FEATURESCONF}
+
+FEATURE_TEST_STRING="features-integration-test"
+if [[ "$KARAF_VERSION" == "karaf4" ]]; then
+    FEATURE_TEST_STRING="features-test"
+fi
+
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
 cat ${FEATURESCONF}
 
 echo "Configuring the log..."
@@ -110,22 +105,7 @@ if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
   cat ${CUSTOMPROP}
 fi
 
-echo "Configure java home and max memory..."
-sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF}
-sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
-cat ${MEMCONF}
-
-echo "Set Java version"
-sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
-sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
-echo "JDK default version ..."
-java -version
-
-echo "Set JAVA_HOME"
-export JAVA_HOME="${JAVA_HOME}"
-# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
-JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
-echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
+set_java_vars
 
 # Copy shard file if exists
 if [ -f /tmp/custom_shard_config.txt ]; then
@@ -153,6 +133,7 @@ cat > ${WORKSPACE}/startup-script.sh <<EOF
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p /tmp/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
index b8bbd135b298d3c27adebd89aecf95c0826bfeb7..c6beeed410da498e9cccb2a5dc1db1b0ee6ab7fd 100644 (file)
@@ -5,12 +5,6 @@
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
 
-MAVENCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg
-FEATURESCONF=/tmp/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
-CUSTOMPROP=/tmp/${BUNDLEFOLDER}/etc/custom.properties
-LOGCONF=/tmp/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg
-MEMCONF=/tmp/${BUNDLEFOLDER}/bin/setenv
-CONTROLLERMEM="2048m"
 
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
     echo "Configure cluster"
@@ -21,7 +15,7 @@ fi
 
 if [ ${CONTROLLERSCOPE} == 'all' ]; then
     ACTUALFEATURES="odl-integration-compatible-with-all,${CONTROLLERFEATURES}"
-    CONTROLLERMEM="3072m"
+    export CONTROLLERMEM="3072m"
     COOLDOWN_PERIOD="180"
 else
     ACTUALFEATURES="odl-infrautils-ready,${CONTROLLERFEATURES}"
@@ -31,6 +25,12 @@ fi
 # Some versions of jenkins job builder result in feature list containing spaces
 # and ending in newline. Remove all that.
 ACTUALFEATURES=`echo "${ACTUALFEATURES}" | tr -d '\n \r'`
+echo "ACTUALFEATURES: ${ACTUALFEATURES}"
+
+# In the case that we want to install features via karaf shell, a space separated list of
+# ACTUALFEATURES IS NEEDED
+SPACE_SEPARATED_FEATURES=$(echo "${ACTUALFEATURES}" | tr ',' ' ')
+echo "SPACE_SEPARATED_FEATURES: ${SPACE_SEPARATED_FEATURES}"
 
 if [ -f "${WORKSPACE}/test/csit/scriptplans/${TESTPLAN}" ]; then
     echo "scriptplan exists!!!"
@@ -59,17 +59,17 @@ echo "Adding external repositories..."
 sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF}
 cat ${MAVENCONF}
 
-echo "Configuring the startup features..."
-sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
+if [[ "$USEFEATURESBOOT" == "True" ]]; then
+    echo "Configuring the startup features..."
+    sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF}
+fi
 
-FEATURE_INDEX_STRING="features-integration-index"
 FEATURE_TEST_STRING="features-integration-test"
 if [[ "$KARAF_VERSION" == "karaf4" ]]; then
-    FEATURE_INDEX_STRING="features-index"
     FEATURE_TEST_STRING="features-test"
 fi
 
-sed -ie "s%mvn:org.opendaylight.integration/\${FEATURE_INDEX_STRING}/${BUNDLEVERSION}/xml/features%mvn:org.opendaylight.integration/\${FEATURE_INDEX_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features%g" ${FEATURESCONF}
+sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF}
 cat ${FEATURESCONF}
 
 if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then
@@ -98,26 +98,11 @@ if [ -n "${CONTROLLERDEBUGMAP}" ]; then
 fi
 cat ${LOGCONF}
 
-echo "Configure java home and max memory..."
-sed -ie 's%^# export JAVA_HOME%export JAVA_HOME="\${JAVA_HOME:-${JAVA_HOME}}"%g' ${MEMCONF}
-sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' ${MEMCONF}
-cat ${MEMCONF}
+set_java_vars
 
 echo "Listing all open ports on controller system..."
 netstat -pnatu
 
-echo "Set Java version"
-sudo /usr/sbin/alternatives --install /usr/bin/java java ${JAVA_HOME}/bin/java 1
-sudo /usr/sbin/alternatives --set java ${JAVA_HOME}/bin/java
-echo "JDK default version..."
-java -version
-
-echo "Set JAVA_HOME"
-export JAVA_HOME="${JAVA_HOME}"
-# Did you know that in HERE documents, single quote is an ordinary character, but backticks are still executing?
-JAVA_RESOLVED=\`readlink -e "\${JAVA_HOME}/bin/java"\`
-echo "Java binary pointed at by JAVA_HOME: \${JAVA_RESOLVED}"
-
 if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then
 
     # Copy shard file if exists
@@ -147,6 +132,7 @@ cat > ${WORKSPACE}/startup-script.sh <<EOF
 
 echo "Redirecting karaf console output to karaf_console.log"
 export KARAF_REDIRECT="/tmp/${BUNDLEFOLDER}/data/log/karaf_console.log"
+mkdir -p /tmp/${BUNDLEFOLDER}/data/log
 
 echo "Starting controller..."
 /tmp/${BUNDLEFOLDER}/bin/start
@@ -155,6 +141,33 @@ EOF
 
 cat > ${WORKSPACE}/post-startup-script.sh <<EOF
 
+if [[ "$USEFEATURESBOOT" != "True" ]]; then
+
+    # wait up to 60s for karaf port 8101 to be opened, polling every 5s
+    loop_count=0;
+    until [[ \$loop_count -ge 12 ]]; do
+        netstat -na | grep 8101 && break;
+        loop_count=\$[\$loop_count+1];
+        sleep 5;
+    done
+
+    echo "going to feature:install --no-auto-refresh ${SPACE_SEPARATED_FEATURES} one at a time"
+    for feature in ${SPACE_SEPARATED_FEATURES}; do
+        sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                             -o UserKnownHostsFile=/dev/null \
+                             -o LogLevel=error \
+                             -p 8101 karaf@localhost \
+                             feature:install --no-auto-refresh \$feature;
+    done
+
+    echo "ssh to karaf console to list -i installed features"
+    sshpass -p karaf ssh -o StrictHostKeyChecking=no \
+                         -o UserKnownHostsFile=/dev/null \
+                         -o LogLevel=error \
+                         -p 8101 karaf@localhost \
+                         feature:list -i
+fi
+
 echo "Waiting for controller to come up..."
 COUNT="0"
 while true; do
@@ -302,7 +315,23 @@ fi
 echo "Changing the testplan path..."
 cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
 cat testplan.txt
-SUITES=$( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' ' )
+
+# Use the testplan if specific SUITES are not defined.
+if [ -z "${SUITES}" ]; then
+    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+else
+    newsuites=""
+    workpath="${WORKSPACE}/test/csit/suites"
+    for suite in ${SUITES}; do
+        fullsuite="${workpath}/${suite}"
+        if [ -z "${newsuites}" ]; then
+            newsuites+=${fullsuite}
+        else
+            newsuites+=" "${fullsuite}
+        fi
+    done
+    SUITES=${newsuites}
+fi
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} -v WORKSPACE:/tmp \
index a91acfaad4d0d76ffe341551d2c7947e65d51866..8fa57c7f36df81cf6b1525c048b653441e988b5b 100644 (file)
@@ -6,7 +6,7 @@
 source ${ROBOT_VENV}/bin/activate
 PYTHON="${ROBOT_VENV}/bin/python"
 SSH="ssh -t -t"
-ADMIN_PASSWORD=admin
+ADMIN_PASSWORD="admin"
 
 # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level
 echo "showing recent changes that made it in to the distribution used by this job"
@@ -264,6 +264,7 @@ enable_isolated_metadata = True
 [[post-config|/etc/nova/nova.conf]]
 [DEFAULT]
 force_config_drive = False
+force_raw_images = False
 
 [scheduler]
 discover_hosts_in_cells_interval = 30
@@ -344,6 +345,7 @@ EOF
 auth_strategy = keystone
 [DEFAULT]
 use_neutron = True
+force_raw_images = False
 EOF
 
     echo "Compute local.conf created:"
@@ -352,6 +354,7 @@ EOF
 
 function configure_haproxy_for_neutron_requests() {
     MGRIP=$1
+    # shellcheck disable=SC2206
     ODL_IPS=(${2//,/ })
 
     cat > ${WORKSPACE}/install_ha_proxy.sh<< EOF
@@ -452,15 +455,11 @@ function collect_logs () {
 echo -e "/usr/sbin/lsmod | /usr/bin/grep openvswitch\n"
 /usr/sbin/lsmod | /usr/bin/grep openvswitch
 echo -e "\ngrep ct_ /var/log/openvswitch/ovs-vswitchd.log\n"
-grep ct_ /var/log/openvswitch/ovs-vswitchd.log
-echo -e "\novsdb-tool -mm show-log\n"
-ovsdb-tool -mm show-log
+grep "Datapath supports" /var/log/openvswitch/ovs-vswitchd.log
 echo -e "\nsudo netstat -punta\n"
 sudo netstat -punta
 echo -e "\nsudo getenforce\n"
 sudo getenforce
-echo -e "\njournalctl > /tmp/journalctl.log\n"
-sudo journalctl > /tmp/journalctl.log
 echo -e "\nsudo systemctl status httpd\n"
 sudo systemctl status httpd
 echo -e "\nenv\n"
@@ -468,10 +467,16 @@ env
 source /opt/stack/devstack/openrc admin admin
 echo -e "\nenv after openrc\n"
 env
-echo "\nsudo du -hs /opt/stack"
+echo -e "\nsudo du -hs /opt/stack"
 sudo du -hs /opt/stack
-echo "\nsudo mount"
+echo -e "\nsudo mount"
 sudo mount
+echo -e "\ndmesg -T > /tmp/dmesg.log"
+dmesg -T > /tmp/dmesg.log
+echo -e "\njournalctl > /tmp/journalctl.log\n"
+sudo journalctl > /tmp/journalctl.log
+echo -e "\novsdb-tool -mm show-log > /tmp/ovsdb-tool.log"
+ovsdb-tool -mm show-log > /tmp/ovsdb-tool.log
 EOF
 
     # Since this log collection work is happening before the archive build macro which also
@@ -522,6 +527,8 @@ EOF
         echo "collect_logs: for openstack control node ip: ${!OSIP}"
         NODE_FOLDER="control_${i}"
         mkdir -p ${NODE_FOLDER}
+        scp extra_debug.sh ${!OSIP}:/tmp
+        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
         scp ${!OSIP}:/etc/dnsmasq.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/keystone/keystone.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/keystone/keystone-uwsgi-admin.ini ${NODE_FOLDER}
@@ -544,7 +551,12 @@ EOF
         scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/tempest/etc/tempest.conf ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        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}"
@@ -556,14 +568,8 @@ EOF
         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
-        scp extra_debug.sh ${!OSIP}:/tmp
-        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
-        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}
-        ${SSH} ${!CONTROLLERIP} "dmesg -T > /tmp/dmesg.log"
-        scp ${!CONTROLLERIP}:/tmp/dmesg.log ${NODE_FOLDER}
         mv local.conf_control_${!OSIP} ${NODE_FOLDER}/local.conf
+        # qdhcp files are created by robot tests
         mv /tmp/qdhcp ${NODE_FOLDER}
         mv ${NODE_FOLDER} ${WORKSPACE}/archives/
     done
@@ -574,6 +580,8 @@ EOF
         echo "collect_logs: for openstack compute node ip: ${!OSIP}"
         NODE_FOLDER="compute_${i}"
         mkdir -p ${NODE_FOLDER}
+        scp extra_debug.sh ${!OSIP}:/tmp
+        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
         scp ${!OSIP}:/etc/nova/nova.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/nova/nova-cpu.conf ${NODE_FOLDER}
         scp ${!OSIP}:/etc/openstack/clouds.yaml ${NODE_FOLDER}
@@ -581,7 +589,12 @@ EOF
         scp ${!OSIP}:/opt/stack/devstack/nohup.out ${NODE_FOLDER}/stack.log
         scp ${!OSIP}:/opt/stack/devstack/openrc ${NODE_FOLDER}
         scp ${!OSIP}:/opt/stack/requirements/upper-constraints.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
+        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
         scp ${!OSIP}:/tmp/get_devstack.sh.txt ${NODE_FOLDER}
+        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
+        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}"
@@ -591,13 +604,6 @@ EOF
         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
-        scp extra_debug.sh ${!OSIP}:/tmp
-        ${SSH} ${!OSIP} "bash /tmp/extra_debug.sh > /tmp/extra_debug.log"
-        scp ${!OSIP}:/tmp/extra_debug.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/journalctl.log ${NODE_FOLDER}
-        scp ${!OSIP}:/tmp/*.xz ${NODE_FOLDER}/
-        ${SSH} ${!OSIP} "dmesg -T > /tmp/dmesg.log"
-        scp ${!OSIP}:/tmp/dmesg.log ${NODE_FOLDER}
         mv local.conf_compute_${!OSIP} ${NODE_FOLDER}/local.conf
         mv ${NODE_FOLDER} ${WORKSPACE}/archives/
     done
@@ -813,6 +819,10 @@ echo "workaround: adjust wait from 60s to 1800s (30m)"
 sed -i 's/wait_for_compute 60/wait_for_compute 1800/g' /opt/stack/devstack/lib/nova
 # TODO: modify sleep 1 to sleep 60, search wait_for_compute, then first sleep 1
 # that would just reduce the number of logs in the compute stack.log
+
+#Install qemu-img command in Control Node for Pike
+echo "Install qemu-img application"
+sudo yum install -y qemu-img
 EOF
 
 cat > "${WORKSPACE}/setup_host_cell_mapping.sh" << EOF
@@ -865,7 +875,7 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do
     ssh ${!CONTROLIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!CONTROLIP} "ps -ef | grep stack.sh"
     ssh ${!CONTROLIP} "ls -lrt /opt/stack/devstack/nohup.out"
-    os_node_list+=(${!CONTROLIP})
+    os_node_list+=("${!CONTROLIP}")
     # Workaround for stable/newton jobs
     # TODO: can this be removed now?
     if [ "${ODL_ML2_BRANCH}" == "stable/newton" ]; then
@@ -926,7 +936,7 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do
     echo "Stack the compute node ${i} of ${NUM_OPENSTACK_COMPUTE_NODES}: ${COMPUTEIP}"
     ssh ${!COMPUTEIP} "cd /opt/stack/devstack; nohup ./stack.sh > /opt/stack/devstack/nohup.out 2>&1 &"
     ssh ${!COMPUTEIP} "ps -ef | grep stack.sh"
-    os_node_list+=(${!COMPUTEIP})
+    os_node_list+=("${!COMPUTEIP}")
 done
 
 echo "nodelist: ${os_node_list[*]}"
@@ -1054,6 +1064,7 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do
 
     # ipsec support
     if [ "${IPSEC_VXLAN_TUNNELS_ENABLED}" == "yes" ]; then
+        # shellcheck disable=SC2206
         ALL_NODES=(${!CONTROLIP} ${COMPUTE_IPS[*]})
         for ((inx_ip1=0; inx_ip1<$((${#ALL_NODES[@]} - 1)); inx_ip1++)); do
             for ((inx_ip2=$((inx_ip1 + 1)); inx_ip2<${#ALL_NODES[@]}; inx_ip2++)); do
@@ -1201,7 +1212,7 @@ for suite in ${SUITES}; do
     --log log_${log_name}.html --report None --output output_${log_name}.xml \
     -v BUNDLEFOLDER:${BUNDLEFOLDER} \
     -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
-    -v CONTROLLERFEATURES:${CONTROLLERFEATURES} \
+    -v CONTROLLERFEATURES:"${CONTROLLERFEATURES}" \
     -v CONTROLLER_USER:${USER} \
     -v DEVSTACK_DEPLOY_PATH:/opt/stack/devstack \
     -v HA_PROXY_IP:${HA_PROXY_IP} \
index 22b7e624baf24b8a672e2d916f0d767fa433249a..4356f5721c84d8625b5ba55cdadf3733a209ac0a 100644 (file)
@@ -12,7 +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 | .[]'))
 
@@ -34,7 +34,7 @@ for i in "${ADDR[@]}"
 do
     REMHOST=$(ssh "${i}" hostname -s)
     case ${REMHOST} in
-    *java*)
+    *builder*)
        ODL_SYSTEM=( "${ODL_SYSTEM[@]}" "${i}" )
        ;;
     *devstack*)
@@ -103,6 +103,15 @@ done
 # The rest of the openstack nodes until NUM_OPENSTACK_SYSTEM are computes
 NUM_OPENSTACK_COMPUTE_NODES=$(( NUM_OPENSTACK_SYSTEM - NUM_OPENSTACK_CONTROL_NODES ))
 echo "NUM_OPENSTACK_COMPUTE_NODES=${NUM_OPENSTACK_COMPUTE_NODES}" >> slave_addresses.txt
+
+# Order the computes in the list so that the devstack-0 is index 1 and devstack-1 is index 2. Currently they are
+# backwards because of the controller swap earlier.
+if [ ${NUM_OPENSTACK_COMPUTE_NODES} -ge 2 ]; then
+    tmp_addr=${OPENSTACK_SYSTEM[1]}
+    OPENSTACK_SYSTEM[1]=${OPENSTACK_SYSTEM[2]}
+    OPENSTACK_SYSTEM[2]=${tmp_addr}
+fi
+
 for i in $(seq 0 $((NUM_OPENSTACK_COMPUTE_NODES - 1)))
 do
     echo "OPENSTACK_COMPUTE_NODE_$((i+1))_IP=${OPENSTACK_SYSTEM[$((openstack_index++))]}" >> slave_addresses.txt
index bee0b3638b9444462bf4941701afed3db2a9a699..d43f2d32b0e0c7dc81f2a15c64e7e9a178b6bc3d 100644 (file)
@@ -59,10 +59,14 @@ pip install --upgrade jsonpatch
 # Module networking-l2gw is required for using l2gw commands with neutron client
 # Module python-neutronclient is needed for certain tests run with Openstack Newton
 #  that does not work with Openstack Client
-pip install python-openstackclient==3.11.0
+# Module pyhon-novaclient is installed as a dependency of openstackclient, but the
+#  latest version (v10.0.0) has some problem with "server add floating ip" that is
+#  not there with v9.0.0, so pinning it to that for now
+pip install python-openstackclient
 pip install networking-l2gw==11.0.0
 pip install python-neutronclient==6.1.0
 pip install networking-sfc
+pip install --upgrade python-novaclient==9.0.0
 
 # Print installed versions.
 pip install --upgrade pipdeptree
index 7fa75f3c2237bc3ea33786be0c4d7db235754c1b..4e2ccf0de917121a68700a164963f25d0c4ba7d0 100644 (file)
 - builder:
     name: integration-deploy-controller-run-test
     builders:
-      - shell: !include-raw: integration-deploy-controller-run-test.sh
+      - shell: !include-raw:
+          - common-functions.sh
+          - integration-deploy-controller-run-test.sh
 
 # Macro: integration-configure-clustering
 # Operation: this macro configures the clustering
 - builder:
     name: integration-configure-clustering
     builders:
-      - shell: !include-raw: integration-configure-clustering.sh
+      - shell: !include-raw:
+          - common-functions.sh
+          - integration-configure-clustering.sh
 
 # Macro: integration-start-cluster-run-test
 # Operation: this macro starts the 3-node cluster and runs test
index 9b756e14aa1a8da43119f703dda21595fac61cfe..4ce0682170e8090514dd09e8a31506b231b22180 100644 (file)
@@ -112,7 +112,22 @@ echo "Changing the testplan path..."
 cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
 cat testplan.txt
 
-SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+# Use the testplan if specific SUITES are not defined.
+if [ -z "${SUITES}" ]; then
+    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+else
+    newsuites=""
+    workpath="${WORKSPACE}/test/csit/suites"
+    for suite in ${SUITES}; do
+        fullsuite="${workpath}/${suite}"
+        if [ -z "${newsuites}" ]; then
+            newsuites+=${fullsuite}
+        else
+            newsuites+=" "${fullsuite}
+        fi
+    done
+    SUITES=${newsuites}
+fi
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} -v BUNDLEFOLDER:${BUNDLEFOLDER} \
index 851648d12ac951da4ada9e430b52d499dc75421a..a17507327ca66bbdbf6e62d83516bc031805bef8 100644 (file)
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-jdk-version:
           jdkversion: '{verify-jdkversion}'
       - distribution-karaf-version:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
           test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
       - integration-patch-refspec:
           branch: 'master'
       - integration-jdk-version:
index 5b7637193dc4ce925e0130b138cf973a7a42c039..9317ee400eabe6f0444012fe552dbf54307f19ea 100644 (file)
@@ -25,6 +25,7 @@
           csit-sanity-list: '{csit-sanity-list-oxygen}'
           csit-weekly-list: '{csit-weekly-list-oxygen}'
           csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
+          mvn-version: 'mvn33'
 
       - nitrogen:
           branch: 'stable/nitrogen'
@@ -33,6 +34,7 @@
           csit-sanity-list: '{csit-sanity-list-nitrogen}'
           csit-weekly-list: '{csit-weekly-list-nitrogen}'
           csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}'
+          mvn-version: 'mvn33'
 
       - carbon:
           branch: 'stable/carbon'
@@ -42,6 +44,7 @@
           csit-sanity-list: '{csit-sanity-list-carbon}'
           csit-weekly-list: '{csit-weekly-list-carbon}'
           csit-high-frequency-list: '{csit-high-frequency-list-carbon}'
+          mvn-version: 'mvn33'
 
     # tools system image
     tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847
 - job-template:
     name: 'integration-multipatch-test-{stream}'
     # Goal: Build one or more patches and run all available system test on a distribution containing the change.
-    # Operation: This job template checks out and builds each patch provided in job parameters, creates a distribution
-    # containing these patches, and triggers the distribution test job which includes most (if not all) available
-    # CSIT jobs
-    # TODO: Move the following to appropriate readthedocs document.
-    # Recommended Sandbox usage:
-    # 0. Create this job and a CSIT job you want to run on the new .zip in Sandbox (disable timed triggers).
-    # 1. Copy the csit job name to clipboard.
-    # 2. Navigate to Sandbox page of this job.
-    # 3. Click "Configure".
-    # 4. Locate "Trigger/call builds on other projects" (under "Post Steps" tab).
-    # 5. Delete the long value of "Projects to build" field and paste the job name from clipboard (ctrl+a, ctrl+v).
-    # 6. Click "Save" button.
-    # 7. Click "Build with Parameters".
-    # yamllint disable-line rule:line-length
-    # 8. Start the job with your parameters, see https://wiki.opendaylight.org/view/Integration/Test/Running_System_Tests#Running_System_Tests_Using_Custom_Distribution_Built_From_Multiple_Patches
-    # 9. The multipatch job waits for the csit job to finish, so abort csit if you see something went wrong.
-    # 10. Navigate to Sandbox page of the csit job, click the run triggered from multipatch.
-    # 11. Click Parameters and copy the long value of BUNDLE_URL field to clipboard.
-    # 12. Run the same csit job woth different patchset or test options, or other csit jobs, with this BUNDLE_URL value
-    #     so you do not have to wait for multipatch build. Repeat step 12.
-    # 13. Currently, the .zip lasts 24 hours (?) so you may need to jump to step 2 (or 0) after some time.
+    # Operation: This job template checks out and builds in order each patch provided in job parameters, finally
+    # it creates a distribution containing all patches and triggers the distribution test job which includes most
+    # (if not all) available CSIT jobs.
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-4c-4g
     jdk: '{jdk}'
 
     properties:
           run-test: 'false'
       - integration-distribution-branch:
           branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
       - opendaylight-infra-parameters:
 
     builders:
       - wipe-org-opendaylight-repo
-      - integration-multipatch-builder
+      - lf-maven-install:
+          mvn-version: '{mvn-version}'
       - provide-maven-settings:
           global-settings-file: 'global-settings'
-          settings-file: 'yangtools-settings'
-      - maven-target:
-          maven-version: mvn33
-          pom: patch_tester/pom.xml
-          # TODO: Make Maven options configurable. Currently tests are not skipped, everything else is.
-          goals: |
-              clean install dependency:tree -DoutputFile=dependency_tree.txt
-              -Pq
-              -Dstream={stream}
-              -Dsft.heap.max=4g
-              {opendaylight-infra-mvn-opts}
-          # TODO: {opendaylight-infra-parallel-mvn-opts}?
-          java-opts:
-            - '-Xmx3072m -Dmaven.compile.fork=true'
-          settings: integration-settings
-          settings-type: cfp
-          global-settings: global-settings
-          global-settings-type: cfp
+          settings-file: 'integration-distribution-settings'
+      - integration-multipatch-builder
       - integration-upload-distribution:
           dist-pom: patch_tester/distribution/pom.xml
       - conditional-step:
index f5711aedd1090be38e1b8c63f3cef553ad9e8c58..16cc153ad0589db1ac826459b980b5dc6e191edc 100644 (file)
@@ -8,22 +8,18 @@
 
 # create a fresh empty place to build this custom distribution
 BUILD_DIR=${WORKSPACE}/patch_tester
-POM_FILE=${WORKSPACE}/patch_tester/pom.xml
 DISTRIBUTION_BRANCH_TO_BUILD=$DISTROBRANCH  #renaming variable for clarity
+MAVEN_OPTIONS="$(echo --show-version \
+    --batch-mode \
+    -Djenkins \
+    -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+    -Dmaven.repo.local=/tmp/r \
+    -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
 
 rm -rf $BUILD_DIR
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR || exit 1
 
-# create a root pom that will contain a module for each project we have a patch for
-echo "<project>" >> $POM_FILE
-echo "<groupId>org.opendaylight.test</groupId>" >> $POM_FILE
-echo "<artifactId>test</artifactId>" >> $POM_FILE
-echo "<version>0.1</version>" >> $POM_FILE
-echo "<modelVersion>4.0.0</modelVersion>" >> $POM_FILE
-echo "<packaging>pom</packaging>" >> $POM_FILE
-echo "<modules>" >> $POM_FILE
-
 # Set up git committer name and email, needed for commit creation when cherry-picking.
 export EMAIL="sandbox@jenkins.opendaylight.org"
 # TODO: Is there a more appropriate e-mail?
@@ -69,7 +65,6 @@ do
     PROJECT_SHORTNAME="${PROJECT##*/}"  # http://stackoverflow.com/a/3162500
     echo "cloning project ${PROJECT}"
     git clone "https://git.opendaylight.org/gerrit/p/${PROJECT}"
-    echo "<module>${PROJECT_SHORTNAME}</module>" >> ${POM_FILE}
     cd ${PROJECT_SHORTNAME} || exit 1
     if [ "$(echo -n ${proto_patch} | tail -c 1)" == 'r' ]; then
         pure_patch="$(echo -n $proto_patch | head -c -1)"
@@ -100,6 +95,14 @@ do
         # Here 'r' means release. Useful for testing Nitrogen Odlparent changes.
         find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//g'
     fi
+    # Build project
+    "$MVN" clean install \
+    -e -Pq \
+    -Dstream=oxygen \
+    -DskipTests=true \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    $MAVEN_OPTIONS
     cd "${BUILD_DIR}" || exit 1
 done
 
@@ -109,10 +112,14 @@ if [ "${distribution_status}" == "not_included" ]; then
     git clone "https://git.opendaylight.org/gerrit/p/integration/distribution"
     cd distribution || exit 1
     git checkout "${DISTRIBUTION_BRANCH_TO_BUILD}"
+    # Build project
+    "$MVN" clean install \
+    -e -Pq \
+    -Dstream="$DISTROSTREAM" \
+    -DskipTests=true \
+    --global-settings "$GLOBAL_SETTINGS_FILE" \
+    --settings "$SETTINGS_FILE" \
+    $MAVEN_OPTIONS
     cd "${BUILD_DIR}" || exit 1
-    echo "<module>distribution</module>" >> ${POM_FILE}
 fi
 
-# finish pom file
-echo "</modules>" >> "${POM_FILE}"
-echo "</project>" >> "${POM_FILE}"
index 6522677076f60e63b4162822efc158e93bb63991..a56fd02a5ea8fcbd1958554154b211c91b914526 100644 (file)
@@ -14,6 +14,7 @@ jobs_file=$(mktemp)
 search_string="csit"
 
 wget --quiet -O "$jobs_file" https://jenkins.opendaylight.org/$SILO/api/xml
+# shellcheck disable=SC2207
 jobs=($(xmlstarlet sel -t -m '//hudson/job' \
     -n -v 'name' "$jobs_file" | grep $search_string | grep $STREAM))
 
index 088ec87578099b7a1f78cd87fa4c7bb4f59e97ee..c2c135ab62735e5858a2e3ffeb331880229e6ad1 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'iotdm'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'iotdm'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'iotdm'
index 387b10b4a35b3645cfa75937a99ca65552cb4f90..48cb51f350bfbebd0924e95a8b9872eb1ea91411 100644 (file)
@@ -3,8 +3,7 @@
     name: jsonrpc-fluorine
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -29,8 +28,7 @@
     name: jsonrpc-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -55,8 +53,7 @@
     name: jsonrpc-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
@@ -81,8 +78,7 @@
     name: jsonrpc-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'jsonrpc'
     project-name: 'jsonrpc'
index 0b6745a59e4d197760367da0358525736359517d..f203d89595c71d0d66c102419fe58cad0e222e52 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'l2switch'
@@ -36,8 +35,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'l2switch'
@@ -68,8 +66,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'l2switch'
index bb78959543172bc573bcabc6abd98aac0dc40494..72c8ca70bf451829a1792bb49decbf754aa65a03 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lacp'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lacp'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lacp'
index fef86deaa46148af046f0acf75647512f3f445c5..582621eeca1d1209d84b9b5fa1673bbfbab1fe71 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'lispflowmapping'
@@ -36,9 +35,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'lispflowmapping'
     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: ''
+    archive-artifacts: >
+        **/*.log
+        **/target/surefire-reports/*-output.txt
+
     build-node: centos7-builder-4c-16g
 
     # Used by the release job
@@ -65,9 +66,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'lispflowmapping'
index 4df31f8b7a79d31255de9d1bbb42687b63fbb96f..79e498ce1cbdfdbed60c5d9960480f61917722c4 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'mdsal'
@@ -33,9 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'mdsal'
@@ -61,9 +59,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
 
     stream: carbon
     project: 'mdsal'
index c758d82ecad8ea312e815984c85c0510e65b143d..5c6f81e309ca3975d3a75881cdd1b079b4aaac7a 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'messaging4transport'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'messaging4transport'
@@ -60,9 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'messaging4transport'
index 956eea3d5d13bccee8ed78e0d7942f8743ae8e98..0232969673e10dfa7a017d1429eeee561a0c1211 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'natapp'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'natapp'
@@ -60,9 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'natapp'
index 0874bb36dd651fbb0996ac4f01dca4d396cc8a10..0b37f358eb655b91b30a79b1323b63ca00ea6f31 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'nemo'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'nemo'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'nemo'
index e557f823789b5df9527c1db7f42bd539b7fa1168..806cd5ee7ec880ddcfbd9106ee89a3f734bf785e 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netconf'
@@ -32,8 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netconf'
@@ -59,8 +57,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netconf'
index 372efdf93a53b3873e20a8a5232566f6dcca2ae6..318b15c508a821d628ff48df3ed650a429931876 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'netide'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'netide'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'netide'
index da0c1e428b24ff3e22468b8508af5d6472202ddc..8e3a4ac18c06d4b4cedd3c457961b334d95d0ae2 100644 (file)
@@ -7,7 +7,6 @@
     project: 'netvirt'
     stream: 'oxygen'
     branch: 'master'
-    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -68,7 +67,6 @@
     project: 'netvirt'
     stream: 'nitrogen'
     branch: 'stable/nitrogen'
-    use-features-boot: 'False'
 
     topology:
       - 1node:
     stream: 'carbon'
     branch: 'stable/carbon'
     karaf-version: karaf3
-    use-features-boot: 'False'
 
     topology:
       - 1node:
index b685c17f2eaee0ab6506abf12da943b87e4ae3f7..74eb730a2fcca9ed0bebe4888209c1de4936d563 100644 (file)
@@ -15,7 +15,6 @@
     odl_system_flavor: v1-performance-8
     openstack_system_flavor: v1-performance-8
     openstack_system2_flavor: v1-performance-4
-    use-features-boot: 'False'
 
     topology:
       - 1node:
@@ -74,7 +73,6 @@
     odl_system_flavor: v1-performance-8
     openstack_system_flavor: v1-performance-8
     openstack_system2_flavor: v1-performance-4
-    use-features-boot: 'False'
 
     topology:
       - 1node:
     odl_system_flavor: v1-performance-8
     openstack_system_flavor: v1-performance-8
     openstack_system2_flavor: v1-performance-4
-    use-features-boot: 'False'
 
     topology:
       - 1node:
     security-group-mode: 'stateful'
     odl_system_flavor: v1-performance-4
     openstack_system2_flavor: v1-performance-2
-    use-features-boot: 'False'
 
     topology:
       - 1node:
index 84360509eed02d36cb9a5b54a5be05a060db2782..846501688c4bcbe947a96b765cbd2b7803039be5 100644 (file)
@@ -4,10 +4,9 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
       - gerrit-tox-verify
+      - odl-maven-jobs
 
     stream:
       - oxygen:
index 53aa3ef72da233143c98eb7c1059a9a91a657590..3f3de316aeb5e33e23946ae2411fe65dda34206f 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'neutron'
@@ -33,9 +32,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'neutron'
@@ -62,9 +60,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'neutron'
index f41693c9f171f8b5a66133e2f8528c0f6c17d52c..36c1d21e9fe2fa84b043052d120f0015ca00be81 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'next'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'next'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'next'
index 593f72cb917b4d51ce1a7754516c6fe4030d9322..0af5510cd60367752d30d7f0b128eaf3f251f169 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'nic'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'nic'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'nic'
index 56e4e296999c4469c846959239c39c5555e21b41..9865f61af49e341334171b1d3d040362fe61bdc3 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ocpplugin'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ocpplugin'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ocpplugin'
index 840280f6477ddaf8d8b8b02275dd74a8957a54f1..b9fc80aa5879a20fe81f707677fb50d7c8f777c7 100644 (file)
@@ -2,9 +2,8 @@
 - project:
     name: odlparent-master
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -39,9 +38,8 @@
 - project:
     name: odlparent-2.0.x
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: odlparent
@@ -79,9 +77,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - gerrit-maven-merge
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     stream: carbon
index cce3332fc99ffb78a3ec48dbd5946545df4c2d4a..7677ec6762530cb9abab13e68763cec4d9fe48f8 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'of-config'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'of-config'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'of-config'
index 68b6c8c1aba36c37f02cea055bed449addb33194..66bfcae955ae94def68574b7a918a826500f8ae1 100644 (file)
@@ -3,8 +3,7 @@
     name: circuitsw-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ofextensions/circuitsw'
@@ -29,8 +28,7 @@
     name: circuitsw-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ofextensions/circuitsw'
@@ -55,8 +53,7 @@
     name: circuitsw-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ofextensions/circuitsw'
index 77165377681e2d20d0004db4946a826fd37528e6..c2a080e1d8072cd51b7bad095a4bd3ad2bb2d5e6 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowjava'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowjava'
index 166a55f31c90d61758d7b46ae62f993b6cd5b916..fcb6ef944e3745d8116e74491be55eb6b22121e6 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'openflowplugin'
@@ -37,9 +36,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'openflowplugin'
@@ -69,9 +67,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'openflowplugin'
index 57b3457a5a7ff56478188de70fa2ee75f4a0d047..2e5d81414dfaba3474c0e028eb2ce54f13ad0568 100644 (file)
@@ -2,8 +2,7 @@
 - project:
     name: ovil
     jobs:
-      - '{project-name}-merge-{stream}'
-      - '{project-name}-maven-jobs'
+      - odl-maven-jobs
       - gerrit-tox-verify
 
     project: ovil
index 79c14e3504ec321644e25a14cac8bfc57b6cd2fe..a87a43b988d7f070f42fdac32520fe331cb48867 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ovsdb'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ovsdb'
@@ -60,9 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ovsdb'
index e7e89ea6a75dfc307bbe7058893a031525be0604..985d6b25e0f08a26c310b15b6662fc21374d1d46 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'p4plugin'
index c51975138c695791c7db4a69ac08273cdfb4311f..5012648af14e3bbd8f383377db19c2fd7c8efb47 100644 (file)
@@ -92,6 +92,7 @@
           sudo yum install -y nmap
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
       - lf-infra-deploy-maven-file:
           global-settings-file: 'global-settings'
           settings-file: 'packaging-settings'
       - shell: !include-raw: build-rpm.sh
 
       # Test Carbon multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20171128.221258-1.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.3-SNAPSHOT/distribution-karaf-0.6.3-20180115.181738-1.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Carbon snapshot
       - shell: !include-raw: build-rpm.sh
 
       # Test Nitrogen multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20171128.223150-2.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.2-SNAPSHOT/karaf-0.7.2-20180115.183312-2.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Nitrogen snapshot
       - shell: !include-raw: build-rpm-snap.sh
 
       # Test Oxygen pre-release autorelease tarball
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
           properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2052/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz'
       - shell: !include-raw: build-rpm.sh
 
       # Test Oxygen multipatch zip (no parallel tarball available)
+      # NB: This will need to be updated as old builds expire
       - inject:
           # yamllint disable-line rule:line-length
-          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20171128.175421-68.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-20180111.030942-90.zip'
       - shell: !include-raw: build-rpm.sh
 
       # Test latest Oxygen snapshot
           sudo yum install -y nmap
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
 
     publishers:
       # TODO: Remove the archive publisher
       - shell: !include-raw: start-odl.sh
       - shell: !include-raw: test-karaf.expect
       - shell: !include-raw: stop-odl.sh
+      - shell: !include-raw: uninstall-rpm.sh
 
     publishers:
       - lf-infra-publish
diff --git a/jjb/packaging/uninstall-rpm.sh b/jjb/packaging/uninstall-rpm.sh
new file mode 100644 (file)
index 0000000..1d62ede
--- /dev/null
@@ -0,0 +1,19 @@
+#!/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
+
+# Uninstall ODL
+sudo yum remove -y opendaylight
+
+# Verify ODL not installed
+if yum list installed opendaylight; then
+  # Fail if exit code 0, ie ODL is still installed
+  echo "OpenDaylight unexpectedly still installed"
+  exit 1
+else
+  echo "OpenDaylight not installed, as expected"
+fi
index 9022c073abbf6ff1bfbc8cc8c15da2c5591c7ec4..afdf9373d5461740474a1bffac1923d8551076f5 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'packetcable'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'packetcable'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'packetcable'
index 55411c36c67be86b1a264f9fe7315b144ce983db..d89c48f5b92f4ace7b69b46fda089d38c3f0a05b 100644 (file)
@@ -3,8 +3,7 @@
     name: persistence-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'persistence'
@@ -31,8 +30,7 @@
     name: persistence-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'persistence'
@@ -59,8 +57,7 @@
     name: persistence-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'persistence'
index d3597a20c560b6ea80de52f17fa6aa6eb4aa8d79..f54557e262e5554515b2f0b9d0badff7f50ec633 100644 (file)
@@ -2,8 +2,10 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs'
+      - '{project-name}-ci-jobs':
+          build-node: centos7-builder-2c-2g
       - builder-check-poms
+      - builder-copy-sandbox-logs
       - gerrit-tox-verify
       # OpenStack Related
       - 'builder-verify-image-protection'
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     archive-artifacts: '**/*.log'
     build-timeout: 30
+    jjb-version: 2.0.0
 
 - project:
     name: packer-jobs
@@ -33,7 +36,7 @@
     project-name: builder
     branch: master
     archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
     platforms:
       - centos
@@ -49,7 +52,6 @@
       - devstack-pre-pip-pike:
           build-timeout: 75
       - gbp
-      - mininet
       - mininet-ovs-2.5:
           build-timeout: 60
       - mininet-ovs-2.6:
@@ -58,8 +60,6 @@
     exclude:
       - platforms: centos
         templates: gbp
-      - platforms: centos
-        templates: mininet
       - platforms: centos
         templates: mininet-ovs-2.5
       - platforms: centos
         templates: devstack-pre-pip-pike
       - platforms: ubuntu-16.04
         templates: devstack
-      - platforms: ubuntu-16.04
-        templates: mininet
-      - platforms: ubuntu-16.04
-        templates: baseline
-      - platforms: centos
-        templates: baseline
 
 - job-template:
     name: builder-check-poms
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     project-type: freestyle
 
           email-prefix: '[releng]'
       - lf-infra-publish
 
+- job-template:
+    name: builder-copy-sandbox-logs
+    node: centos7-builder-2c-1g
+
+    project-type: freestyle
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 1
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: ''
+          project: ''
+          branch: ''
+          refspec: ''
+          artifacts: ''
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: 10
+
+    triggers:
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'copy-logs:'
+          projects:
+            - project-compare-type: ANT
+              project-pattern: '**'
+              branches:
+                - branch-compare-type: ANT
+                  branch-pattern: '**'
+
+    builders:
+      - shell: !include-raw-escape: copy-sandbox-logs.sh
+
+    publishers:
+      - lf-infra-publish
+
 
 - job-template:
     name: 'builder-verify-image-protection'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 - job-template:
     name: 'builder-cleanup-old-images'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 - job-template:
     name: builder-delete-orphaned-nodes
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 - job-template:
     name: 'builder-delete-stale-nodes'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 - job-template:
     name: 'builder-delete-stale-stacks'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-builder-2c-1g
 
     properties:
       - opendaylight-infra-properties:
index bc9ebb8f96b7a7c302bc0f5f876853c3b2163411..1a69611b45a805154832ed23c8440ddf53a3677d 100644 (file)
@@ -82,7 +82,8 @@
           name: PATCHES_TO_BUILD
           default: ''
           description: |
-            Patches to add to distro in CSV project:changeset format (genius:32/53632/9,netvirt:59/50259/47)
+              Ordered list of patches to build in the format of project=changeset (checkout) or
+              project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47
 
 - parameter:
     name: run-test-parameter
index f2d7f0f83e001260a50db64b9e8c90e5354b26b0..99b39487dcc905abebe8956cb6b9920e3c6dd37b 100644 (file)
@@ -9,8 +9,8 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
-    build-timeout: 75
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
 
     platforms: centos
     templates: builder
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
     build-timeout: 60
 
     platforms: centos
     templates: docker
 
+- project:
+    name: packer-mininet-jobs
+    jobs:
+      - gerrit-packer-merge
+
+    project: releng/builder
+    project-name: builder
+    branch: master
+    archive-artifacts: '**/*.log'
+
+    build-node: centos7-builder-2c-1g
+    build-timeout: 90
+
+    platforms: ubuntu-16.04
+    templates: mininet-ovs-2.8
+
 - project:
     name: packer-robot-jobs
     jobs:
@@ -41,7 +57,7 @@
     branch: master
     archive-artifacts: '**/*.log'
 
-    build-node: centos7-builder-2c-8g
+    build-node: centos7-builder-2c-1g
 
     platforms: centos
     templates: robot
index f64aa99f3329622874585309262f15ca8336cb03..d697e548facaddf53fbe58f9d1859669181a7b09 100644 (file)
@@ -1,4 +1,21 @@
 ---
+- job-group:
+    name: odl-maven-jobs
+
+    jobs:
+      - gerrit-maven-clm
+
+      - gerrit-maven-merge:
+          post_build_trigger:
+            - project:
+                - 'distribution-merge-{stream}'
+              condition: SUCCESS
+              trigger-with-no-params: true
+
+      - gerrit-maven-release
+      - gerrit-maven-verify
+      - gerrit-maven-verify-dependencies
+
 - job-template:
     name: '{project-name}-integration-{stream}'
 
index 2269a92f0254a3e6b9f8ead615f9333baae7d5b2..1e32c5d215fb6df24902daf122591b8518a2d3cd 100644 (file)
@@ -3,8 +3,7 @@
     name: reservation-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'reservation'
@@ -29,8 +28,7 @@
     name: reservation-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'reservation'
@@ -55,8 +53,7 @@
     name: reservation-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'reservation'
index 72cada2990e99474615f19f41e12f02eb51fc5f8..90d2d5aa51c2cd2e39b9d2a686b0e36259de03d6 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sdninterfaceapp'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sdninterfaceapp'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sdninterfaceapp'
index b3d954bb5a8bbd7a3fda679ed86be6c21962fb4b..972f346a217eaf762da8cbfe1547e1ac909e8c18 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sfc'
@@ -33,8 +32,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sfc'
@@ -61,8 +59,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sfc'
index 2096cfc70b85cbe08bf767eb225e260865e49cd3..6958d317b28040012d3063ffbca832260d4c4941 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snbi'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snbi'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snbi'
index a9830adeae3857119a87fec7a480f164a76329a9..c73acb1be656456653b288aca1227a94e4ff1a8d 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snmp'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snmp'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snmp'
index aa880ef3fa89d42336c559caadd5d41744c29123..b291290359abd6e26aac06e780626fe7a66d367d 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'snmp4sdn'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'snmp4sdn'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'snmp4sdn'
index 15da7544c9ccdf245fa728fdc4ce07b45b54ca7c..a74ba2d59564fac992e307bb4d457b70e6d38e45 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'sxp'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'sxp'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'sxp'
index 1605e66b180f760306d0fa7661db2fae4a4c94ae..88514e606c22d9a6384fb66046498621e3b29cd3 100644 (file)
@@ -3,8 +3,7 @@
     name: systemmetrics-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
@@ -29,8 +28,7 @@
     name: systemmetrics-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
@@ -55,8 +53,7 @@
     name: systemmetrics-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'systemmetrics'
     project-name: 'systemmetrics'
index 5657e668abe2f3cf7005be4f2f72a17877160a88..6c78c55e2cf5545a7790ae751e1377705ef9234f 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'topoprocessing'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'topoprocessing'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'topoprocessing'
index e45a8640653810be66134d7ddc3d06d3ed0ad0a2..a905cf964ee932339d8480ccad55846251af2173 100644 (file)
@@ -3,8 +3,7 @@
     name: transportpce-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
@@ -29,8 +28,7 @@
     name: transportpce-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
@@ -55,8 +53,7 @@
     name: transportpce-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: 'transportpce'
     project-name: 'transportpce'
index 24b551014c1911f76252c3b2e248940d66dffcca..d1cae2d6a15af955fb5850b3d35b9ab4163e6e4c 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'tsdr'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'tsdr'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'tsdr'
index c555ea814b7aa5e89a3d61a098cf04fe3caa9ea1..41de1a0dde1892ba3cab46fb1ee0f727d836c812 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'ttp'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'ttp'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'ttp'
index 2e0441ed01197da63c01d700bb26aa384d907a6c..10f6028891e456a350418770ae510b82226914ca 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'unimgr'
@@ -32,8 +31,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'unimgr'
@@ -60,8 +58,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'unimgr'
index 1a66df1d78ca4215e55027e94927bd6957157c93..86b4017fef51d6c38652123f26ac34f79140b756 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usc'
@@ -32,9 +31,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usc'
@@ -60,9 +58,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usc'
index b93930ad3680bca2f15e68d0e62e8cf2c4cbc83f..1efca00c4429260e513b98ab9d730806e337b9c7 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'usecplugin'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'usecplugin'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'usecplugin'
index 3544b58d264ebcd266f447dbd0bb710a59f36f45..844a26552d370151614af41b90583e00f60f2f45 100644 (file)
@@ -4,9 +4,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'vtn'
@@ -36,9 +35,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'vtn'
@@ -68,9 +66,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'vtn'
index 0c54b14c46701b2af9957f7318936b7ea56c3273..fc38e865bbb090e646dace59d4cee31627ca7982 100644 (file)
@@ -4,8 +4,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yang-push'
@@ -31,8 +30,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yang-push'
@@ -58,8 +56,7 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yang-push'
index cdcdb8427de535e3343c95b081844169b2fd48d7..cd0617c9ca574738702cb2858f979ed0cb9e58cd 100644 (file)
@@ -3,8 +3,7 @@
     name: yangide-oxygen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: oxygen
     project: 'yangide'
@@ -29,8 +28,7 @@
     name: yangide-nitrogen
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yangide'
@@ -55,8 +53,7 @@
     name: yangide-carbon
     jobs:
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yangide'
index 9173f14e69f03fe5b4ff90378634038c7acdda96..2a67a52d72978a538cf4252317d9ccf72ee2645d 100644 (file)
@@ -2,9 +2,8 @@
 - project:
     name: yangtools-master
     jobs:
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     project: yangtools
     project-name: yangtools
@@ -39,9 +38,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: nitrogen
     project: 'yangtools'
@@ -76,9 +74,8 @@
     jobs:
       - '{project-name}-distribution-check-{stream}'
       - '{project-name}-integration-{stream}'
-      - '{project-name}-maven-jobs'
       - '{project-name}-maven-javadoc-jobs'
-      - '{project-name}-merge-{stream}'
+      - odl-maven-jobs
 
     stream: carbon
     project: 'yangtools'
index ba9ed1ef49f7ac3859d5c1b2505116a7610ccfc0..0b9b6addb738ea7c483c8cdf75b9ae173480f9cd 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ba9ed1ef49f7ac3859d5c1b2505116a7610ccfc0
+Subproject commit 0b9b6addb738ea7c483c8cdf75b9ae173480f9cd
index 03776b5eceebb007a047d3a219432964c0507901..459c4a5342d95a3fd63215a4ffe2c3c25c5a82e6 100644 (file)
@@ -49,6 +49,7 @@
           shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
           args:
             chdir: /tmp/build_quagga/zrpcd
+            executable: /bin/bash
           become: true
 
   post_tasks:
diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml
new file mode 100644 (file)
index 0000000..e85baf2
--- /dev/null
@@ -0,0 +1,156 @@
+---
+- import_playbook: ../common-packer/provision/baseline.yaml
+
+- hosts: all
+  become_user: root
+  become_method: sudo
+  vars:
+    ovs_checksum: sha256:8d1c439e26d7044f0ec823c7fef1b00b7c6465da0b83a7d0cf3191ed1dc43893
+    ovs_version: 2.8.1
+
+  pre_tasks:
+    - include_role: name=system-update
+
+  tasks:
+    - name: 'Install OpenVSwitch {{ovs_version}}'
+      block:
+        - name: Install OpenVSwitch dependencies
+          apt: 'name={{item}} state=present'
+          with_items:
+            - autoconf
+            - automake
+            - bzip2
+            - debhelper
+            - dh-autoreconf
+            - libssl-dev
+            - openssl
+            - pkg-config
+            - procps
+            - python-all
+            - python-qt4
+            - python-twisted-conch
+            - python-zopeinterface
+          become: true
+        - name: 'Fetch OpenVSwitch {{ovs_version}}'
+          get_url:
+            url: 'http://openvswitch.org/releases/openvswitch-{{ovs_version}}.tar.gz'
+            dest: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            checksum: '{{ovs_checksum}}'
+        - name: Create /tmp/ovs directory
+          file:
+            path: /tmp/ovs
+            state: directory
+            mode: 0755
+        - name: 'Unarchive OpenVSwitch {{ovs_version}}'
+          unarchive:
+            src: '/tmp/openvswitch-{{ovs_version}}.tar.gz'
+            dest: /tmp/ovs
+            remote_src: true
+        - name: 'Build OpenVSwitch {{ovs_version}}'
+          shell: DEB_BUILD_OPTIONS='parallel=8 nocheck' fakeroot debian/rules binary
+          args:
+            chdir: '/tmp/ovs/openvswitch-{{ovs_version}}'
+        - name: 'Install OpenVSwitch {{ovs_version}}'
+          apt: 'deb={{item}}'
+          with_items:
+            - /tmp/ovs/libopenvswitch_2.8.1-1_amd64.deb
+            - /tmp/ovs/openvswitch-common_2.8.1-1_amd64.deb
+            - /tmp/ovs/openvswitch-switch_2.8.1-1_amd64.deb
+            - /tmp/ovs/python-openvswitch_2.8.1-1_all.deb
+            - /tmp/ovs/openvswitch-vtep_2.8.1-1_amd64.deb
+          become: true
+        - name: Enable openvswitch-switch service
+          systemd:
+            name: openvswitch-switch
+            enabled: true
+            masked: false
+          become: true
+        - name: Enable openvswitch-vtep service
+          systemd:
+            name: openvswitch-vtep
+            enabled: true
+            masked: false
+          become: true
+
+    - name: Install Mininet
+      apt: name=mininet state=present
+      become: true
+
+    - name: Install mtcbench
+      block:
+        - name: Install mtcbench dependencies
+          apt: 'name={{item}} state=present'
+          with_items:
+            - autoconf
+            - automake
+            - build-essential
+            - libconfig-dev
+            - libffi-dev
+            - libpcap-dev
+            - libsnmp-dev
+            - libtool
+            - libssl-doc
+            - make
+            - pkg-config
+            - snmp
+            - snmpd
+          become: true
+        - name: Fetch mtcbench git repo
+          git:
+            repo: https://github.com/intracom-telecom-sdn/mtcbench.git
+            dest: /tmp/mtcbench
+        - name: Run mtcbench/deploy/docker/provision.sh
+          command: /tmp/mtcbench/deploy/docker/provision.sh
+          become: true
+        - name: Build mtcbench
+          # TODO: remove workaround for build issue with mtcbench
+          # when mtcbench dependency build correctly
+          # https://github.com/intracom-telecom-sdn/mtcbench/issues/10
+          shell: /tmp/mtcbench/build_mtcbench.sh || true
+        - name: Run make for cbench
+          command: make
+          args:
+            chdir: /tmp/mtcbench/oflops/cbench
+        - name: Install cbench to /usr/local/bin/cbench
+          copy:
+            src: /tmp/mtcbench/oflops/cbench/cbench
+            dest: /usr/local/bin/cbench
+            mode: 0755
+            owner: root
+            remote_src: yes
+          become: true
+
+    - name: Install exabgp
+      apt: name=exabgp state=present
+      become: true
+
+    - name: Install python-netaddr for custom mininet topologies
+      apt: name=python-netaddr state=present
+      become: true
+
+    - name: Install vlan for vlan based tests in VTN suites
+      apt: name=vlan state=present
+      become: true
+
+    - name: Install Quagga
+      block:
+        - name: Fetch Quagga git repo
+          git:
+            repo: https://github.com/6WIND/zrpcd.git
+            dest: /tmp/build_quagga/zrpcd
+            version: 20170731
+        - name: Set compile script executable
+          file:
+            path: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh
+            mode: 0755
+        - name: Compile Quagga
+          shell: /tmp/build_quagga/zrpcd/pkgsrc/dev_compile_script.sh -d -b -t
+          args:
+            chdir: /tmp/build_quagga/zrpcd
+            executable: /bin/bash
+          become: true
+
+  post_tasks:
+    - name: System Reseal
+      script: ../common-packer/provision/system-reseal.sh
+      become: true
diff --git a/packer/provision/mininet.sh b/packer/provision/mininet.sh
deleted file mode 100644 (file)
index b4a31e6..0000000
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/bash
-
-# vim: sw=4 ts=4 sts=4 et tw=72 :
-
-# force any errors to cause the script and job to end in failure
-set -xeu -o pipefail
-
-# Ensure that necessary variables are set to enable noninteractive mode in
-# commands.
-export DEBIAN_FRONTEND=noninteractive
-
-# To handle the prompt style that is expected all over the environment
-# with how use use robotframework we need to make sure that it is
-# consistent for any of the users that are created during dynamic spin
-# ups
-echo 'PS1="[\u@\h \W]> "' >> /etc/skel/.bashrc
-
-echo '---> Install mininet with OF13 patch'
-cd /tmp
-cat > newOptions.patch <<EOF
---- mininet/node.py     2014-09-12 13:48:03.165628683 +0100
-+++ mininet/node.py     2014-09-12 13:50:39.021630236 +0100
-@@ -952,6 +952,10 @@
-            datapath: userspace or kernel mode (kernel|user)"""
-         Switch.__init__( self, name, **params )
-         self.failMode = failMode
-+        protKey = 'protocols'
-+        if self.params and protKey in self.params:
-+               print 'have protcol params!'
-+               self.opts += protKey + '=' + self.params[protKey]
-         self.datapath = datapath
-
-     @classmethod
-@@ -1027,8 +1031,9 @@
-         if self.datapath == 'user':
-             self.cmd( 'ovs-vsctl set bridge', self,'datapath_type=netdev' )
-         int( self.dpid, 16 ) # DPID must be a hex string
-+        print 'OVSswitch opts: ',self.opts
-         self.cmd( 'ovs-vsctl -- set Bridge', self,
--                  'other_config:datapath-id=' + self.dpid )
-+                  self.opts+' other_config:datapath-id=' + self.dpid )
-         self.cmd( 'ovs-vsctl set-fail-mode', self, self.failMode )
-         for intf in self.intfList():
-             if not intf.IP():
-EOF
-
-git clone git://github.com/mininet/mininet
-cd mininet/
-git checkout -b 2.1.0 2.1.0
-git apply -p0 < ../newOptions.patch
-cd ./util
-./install.sh -nfv
-
-echo '---> Installing cbench installation for running openflow performance tests'
-OF_DIR="$HOME/openflow"  # Directory that contains OpenFlow code
-OFLOPS_DIR="$HOME/oflops"  # Directory that contains oflops repo
-
-apt-get install -y --force-yes libsnmp-dev libpcap-dev libconfig-dev
-
-git clone git://gitosis.stanford.edu/openflow.git "$OF_DIR"
-git clone https://github.com/andi-bigswitch/oflops.git "$OFLOPS_DIR"
-
-cd "$OFLOPS_DIR"
-./boot.sh
-./configure --with-openflow-src-dir="$OF_DIR"
-make
-make install
-
-echo '---> Installing vlan for vlan based tests in VTN suites'
-apt-get install -y --force-yes vlan
-
-# Install netaddr package which is needed by some custom mininet topologies
-apt-get install -y --force-yes -qq python-netaddr
diff --git a/packer/templates/baseline.json b/packer/templates/baseline.json
deleted file mode 100644 (file)
index 4da796d..0000000
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
-    "distro": null,
-    "cloud_user_data": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - baseline - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "v1-standard-1",
-      "networks": [
-        "{{user `public_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    }
-  ]
-}
index fc6a6662ef56980f267df1c4349e11d205fef6c5..f9d6d193485e62c9524c640ebf630acd7ba5156d 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack-newton - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index 68c64314a8bed435d6e220d5725de302a96e8996..3fb4a0b9d01f21193507edd7c2b6ff6d12824fcd 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack-ocata - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index 2c42e2a50f8b877d7cc178d60304f214ed18d2ad..c33f502fca08aba64f1e5bf9a4234d5f73fa0a51 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack-pike - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index b912e87d515b8fd27c3134c6ba4a78f52eae9626..fd4634c15735abaeeec682920608cc8f28922b52 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - devstack - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index 0e3eb0f2b25bcf707157383658cb5e61020cbad2..026c2eba8c5036b156528748200d644f65d8d310 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - gbp - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index a3d02156923831aa726ab50b679512cba2a9264b..3433c09a5dc970fc706d4421594fe0a65cf890d3 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-25 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
index dc2eed198ce52bbe4d98e741c2f2a54e852aca6f..b6ec6998b0a92a426aa91458a0f2378019baef79 100644 (file)
@@ -1,33 +1,33 @@
 {
   "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
+    "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": [
     {
       "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
+      "identity_endpoint": "{{user `cloud_auth_url`}}",
       "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
+      "tenant_name": "{{user `cloud_tenant`}}",
+      "username": "{{user `cloud_user`}}",
+      "password": "{{user `cloud_pass`}}",
       "region": "ca-ymq-1",
       "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
+      "ssh_username": "{{user `ssh_user`}}",
       "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
       "image_name": "ZZCI - {{user `distro`}} - mininet-ovs-26 - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
+      "source_image_name": "{{user `base_image`}}",
       "flavor": "v1-standard-1",
       "networks": [
-        "{{user `public_network`}}"
+        "{{user `cloud_network`}}"
       ],
       "user_data_file": "{{user `cloud_user_data`}}",
       "metadata": {
diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json
new file mode 100644 (file)
index 0000000..142d492
--- /dev/null
@@ -0,0 +1,59 @@
+{
+  "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`}} - mininet-ovs-28 - {{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/mininet-ovs-2.8.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"
+      ]
+    }
+  ]
+}
diff --git a/packer/templates/mininet.json b/packer/templates/mininet.json
deleted file mode 100644 (file)
index d39f2fb..0000000
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  "variables": {
-    "public_base_image": null,
-    "public_network": null,
-    "public_cloud_user": null,
-    "public_auth_url": null,
-    "public_tenant": null,
-    "public_user": null,
-    "public_pass": null,
-    "distro": null,
-    "cloud_user_data": null,
-    "ssh_proxy_host": ""
-  },
-  "builders": [
-    {
-      "type": "openstack",
-      "identity_endpoint": "{{user `public_auth_url`}}",
-      "domain_name": "Default",
-      "tenant_name": "{{user `public_tenant`}}",
-      "username": "{{user `public_user`}}",
-      "password": "{{user `public_pass`}}",
-      "region": "ca-ymq-1",
-      "availability_zone": "ca-ymq-2",
-      "ssh_username": "{{user `public_cloud_user`}}",
-      "ssh_proxy_host": "{{user `ssh_proxy_host`}}",
-      "image_name": "ZZCI - {{user `distro`}} - mininet - {{isotime \"20060102-1504\"}}",
-      "source_image_name": "{{user `public_base_image`}}",
-      "flavor": "v1-standard-1",
-      "networks": [
-        "{{user `public_network`}}"
-      ],
-      "user_data_file": "{{user `cloud_user_data`}}",
-      "metadata": {
-        "ci_managed": "yes"
-      }
-    }
-  ],
-  "provisioners": [
-    {
-      "type": "shell",
-      "scripts": [
-        "provision/baseline.sh",
-        "provision/mininet.sh",
-        "provision/system_reseal_local_env.sh",
-        "provision/system_reseal.sh"
-      ],
-      "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
-    }
-  ]
-}
index 412aac90e16fcd55091426a99d4505ec860a508f..678a903031c32cec3760c96eead90a94ae5e4a7b 100644 (file)
@@ -1,6 +1,4 @@
 {
-  "public_base_image": "CentOS 7.1711 (2017-11-05) - LF upload",
-  "public_cloud_user": "centos",
   "base_image": "LF - CentOS 7.1711 (2017-11-05)",
   "distro": "CentOS 7",
   "ssh_user": "centos",
index 742825fc2ef418812f9d39aa736167d7898a34d5..882d9598d785a4274e089448c7bed35dfedb4c5d 100644 (file)
@@ -1,6 +1,4 @@
 {
-  "public_base_image": "Ubuntu 14.04.5 LTS (2017-12-05) - LF upload",
-  "public_cloud_user": "ubuntu",
   "base_image": "LF - Ubuntu 14.04 LTS (2017-12-01)",
   "distro": "Ubuntu 14.04",
   "ssh_user": "ubuntu",
index b8dc1762b727383c9239f20145df600d9dfe0229..b55f96b4b722b49609f837005c355a1bce5bc38d 100644 (file)
@@ -1,6 +1,4 @@
 {
-  "public_base_image": "Ubuntu 16.04 LTS (2017-12-01) - LF upload",
-  "public_cloud_user": "ubuntu",
   "base_image": "LF - Ubuntu 16.04 LTS (2017-12-01)",
   "distro": "Ubuntu 16.04",
   "ssh_user": "ubuntu",