Merge "tar and xz files before archiving"

diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml
index 5f898174fb622677be960b459b7967cae9384882..67d646f67b6d8af36a6ef5bc9f353b2863e78440 100644 (file)
--- a/jjb/aaa/aaa-csit-keystone.yaml
+++ b/jjb/aaa/aaa-csit-keystone.yaml
@@ -29,7 +29,7 @@
     install-features: 'odl-restconf-all'
 
     tools_system_count: '1'
-    tools_system_flavor: 'v1-performance-1'
+    tools_system_flavor: 'v2-highcpu-2'
     tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317'
 
     # Robot custom options

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

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

diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
index f835ad75778a19ba174eae39de615a9d0e7481cb..903d75df259a8d446f7d2f132dc5bf16f7a25c71 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml
@@ -46,5 +46,5 @@
         -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4
 

diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
index 43a1ef1881f92e401b6605acf28cc0485a917528..6596c26f534eb1101a22d3f5235ac59aea2f3db2 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
+++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml
@@ -35,4 +35,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # Controller configuration
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'

diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
index c8566b3bfe4a5d7d1aa5d29f3aaafc813aa5cc90..3264311325adca2addacac1422cfd84065aaf50a 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml
@@ -38,4 +38,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4

diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
index 5ea5cc3dcde318993b62cf858a04f246c5133280..c0fc3a7a886c18f2a9e8e02955b76cd3b0abf9c1 100644 (file)
--- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
+++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml
@@ -39,4 +39,4 @@
         -v UPDATER_TIMEOUT:600
 
     # Controller configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4

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

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

diff --git a/jjb/global-jjb b/jjb/global-jjb
index d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584..f52936163e512a126befed7c091bcba94f9fc768 160000 (submodule)
--- a/jjb/global-jjb
+++ b/jjb/global-jjb
@@ -1 +1 @@
-Subproject commit d22c3fe8f7bc3f3276dedd7448c4f82f50fe7584
+Subproject commit f52936163e512a126befed7c091bcba94f9fc768

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 7f01c570ea7ecdb7dab1e7d64a1b3674be5b81c5..77e92a4cc80c0ef8cbe8faaa50ff8b5a74cc3117 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -528,7 +528,7 @@
                 mkdir -p ./archives
                 curl --output robot-plugin.zip "$BUILD_URL/robot/report/*zip*/robot-plugin.zip"
                 unzip -d ./archives robot-plugin.zip
-                mv *log* *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
+                mv *.log *.log.gz *.csv *.png ./archives || true  # Don't fail if file missing
                 # TODO: Can the following line ever fail?
                 find . -type f -name *.hprof -print0 | tar -cvf - --null -T - | xz -9 > ./archives/hprof.tar.xz
                 # TODO: Tweak the compression level if better ratio (or speed) is needed.

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

diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml
index e18b10083b6aa6d5be378dbddbea5e40675af406..a35cda99810032ce1d31648c43651cf27ab759f2 100644 (file)
--- a/jjb/netconf/netconf-scale.yaml
+++ b/jjb/netconf/netconf-scale.yaml
@@ -35,4 +35,4 @@
     robot-options: '-v USE_NETCONF_CONNECTOR:False'
 
     # ODL system configuration
-    odl_system_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-4

diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
index 93b94f15c5021763c7347c94f864932dc7deafa9..db97acfc27f6e1207661b6c580ef323339bd986f 100644 (file)
--- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml
+++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml
@@ -12,9 +12,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -76,9 +76,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -137,9 +137,9 @@
     enable-openstack-services: 'placement-api,tempest'
     enable-openstack-compute-services: 'placement-client'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-8
-    openstack_system_flavor: v1-performance-8
-    openstack_system2_flavor: v1-performance-4
+    odl_system_flavor: v2-standard-8
+    openstack_system_flavor: v2-standard-8
+    openstack_system2_flavor: v2-standard-4
 
     topology:
       - 1node:
@@ -185,8 +185,8 @@
 
     project: 'netvirt'
     security-group-mode: 'stateful'
-    odl_system_flavor: v1-performance-4
-    openstack_system2_flavor: v1-performance-2
+    odl_system_flavor: v2-standard-4
+    openstack_system2_flavor: v2-standard-2
 
     topology:
       - 1node:

diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
index be9eb62d82da3e3b0c9508fbb2b6a4ace45e2c0a..e7b25e8d044d4206d52185cb06a30884bef19bb2 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml
@@ -25,9 +25,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'

diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
index a6bd1362ba678aaf0f37e6d8bc386765be4cbde4..7513bf7132c6558e7bec2ea3582a15b28d53a58d 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
index 416592a8d75d6ef2050e3bd6440d459d3d267d16..339ffa6a2c70f73b8ee382ed1996bd24755f10c0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
index 006c4406cddfd294df2ad82e491542c7901aec80..9445d68e6b273f8e82603cd35e860591cf8d7be0 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
index f1162b8ccddd896d21aa07a60deb097e1bf83b25..c8fa2132874492c5f672ea59b2ecda4375e8ceb9 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml
@@ -25,9 +25,9 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
-    tools_system_flavor: 'v1-performance-2'
+    tools_system_flavor: 'v2-highcpu-2'
 
     # Features to install
     install-features: >

diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
index 0e5a7e20fbb0cddeb9e2a156427685153bea4206..27724beb27850d0547a3a6eb817fd4bc15dbf0c7 100644 (file)
--- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml
+++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml
@@ -27,7 +27,7 @@
           scope: 'only'
 
     # Job images
-    odl_system_flavor: 'v1-performance-4'
+    odl_system_flavor: 'v2-standard-4'
     tools_system_image: 'ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847'
 
     # Features to install

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

diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml
index 259ef196073b5628c9bce72103980f8ce92dfcfe..e0daa66c2255bed020a90ebc7d97554add68e666 100644 (file)
--- a/jjb/releng-templates-java.yaml
+++ b/jjb/releng-templates-java.yaml
@@ -5,12 +5,16 @@
     jobs:
       - gerrit-maven-clm
 
-      - gerrit-maven-merge:
-          post_build_trigger:
-            - project:
-                - 'distribution-merge-{stream}'
-              condition: SUCCESS
-              trigger-with-no-params: true
+      # TODO: Figure out what's wrong with the gerrit-maven-merge job.
+      # - gerrit-maven-merge:
+      #     post_build_trigger:
+      #       - project:
+      #           - 'distribution-merge-{stream}'
+      #         condition: SUCCESS
+      #         trigger-with-no-params: true
+      - '{project-name}-merge-{stream}':
+          build-timeout: 180
+          mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
       - gerrit-maven-release
       - gerrit-maven-verify
@@ -84,3 +88,120 @@
       - findbugs
       - lf-jacoco-report
       - lf-infra-publish
+
+- job-template:
+    name: '{project-name}-merge-{stream}'
+
+    ######################
+    # Default parameters #
+    ######################
+
+    java-version: openjdk8
+
+    #####################
+    # Job Configuration #
+    #####################
+
+    # Need to keep jobs that deploy to Nexus at end of build as Maven
+    # projects. Maybe reconsider this once upstream moves deploy to a
+    # separate lifecycle:
+    #     https://issues.apache.org/jira/browse/MNG-5666
+    project-type: maven
+    node: '{build-node}'
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: 14
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - string:
+          name: STREAM
+          default: '{stream}'
+          description: "String representing release name"
+
+    scm:
+      - gerrit-trigger-scm:
+          refspec: ''
+          choosing-strategy: 'default'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: 'H H * * 0'
+      - gerrit-trigger-patch-merged:
+          gerrit-server-name: '{gerrit-server-name}'
+          name: '{project}'
+          branch: '{branch}'
+
+    prebuilders:
+      - jacoco-nojava-workaround
+      - provide-maven-settings:
+          global-settings-file: 'global-settings'
+          settings-file: '{mvn-settings}'
+
+    # TODO: Do we want to apply sophisticated checks as in *-distribution-check-*?
+    maven:
+      maven-name: 'mvn33'
+      goals: >
+          {mvn-goals}
+          -Dmerge
+          -Dstream={stream}
+          {opendaylight-infra-mvn-opts}
+      maven-opts: '{mvn-opts}'
+      settings: '{mvn-settings}'
+      settings-type: cfp
+      global-settings: 'global-settings'
+      global-settings-type: cfp
+      post-step-run-condition: UNSTABLE
+
+    postbuilders:
+      - conditional-step:
+          condition-kind: file-exists
+          condition-filename: deploy-site.xml
+          condition-basedir: workspace
+
+          # The strategy here is intentional to run Maven site:deploy twice
+          # once using regular pom.xml to produce a staged-site which is
+          # then used by deploy-site.xml to push to Nexus. This is a
+          # workaround to Maven Site's default linking code which creates
+          # incorrect URLs for sites due to auto-detection assuming your
+          # project is configured in a certain way which ODL is not.
+          steps:
+            - maven-target:
+                maven-version: 'mvn33'
+                pom: pom.xml
+                goals: 'site:deploy -V -B -Dstream={stream}'
+                java-opts:
+                  - '-Xmx2g'
+                settings: '{mvn-settings}'
+                settings-type: cfp
+                global-settings: 'global-settings'
+                global-settings-type: cfp
+            - opendaylight-infra-deploy-maven-site:
+                settings-file: '{mvn-settings}'
+
+    reporters:
+      - findbugs
+
+    publishers:
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project-name}]'
+      - maven-deploy:
+          id: ''
+          unique-version: true
+          deploy-unstable: false
+      - lf-jacoco-report
+      - lf-infra-publish
+      - trigger:
+          project: 'distribution-merge-{stream}'
+          threshold: SUCCESS

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