X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fovsdb%2Fovsdb-full-integration.yaml;h=7b86adad7975c614556c00eca64e1a79309dddf5;hb=f93289b1fc422b77fcd00cfebe848c4eac982284;hp=7971adcda7a6b433ccd20849cc7a2553bbb4feb0;hpb=f571cb39b33e760f2267691cf97d792d36848882;p=releng%2Fbuilder.git

diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml
index 7971adcda..7b86adad7 100644
--- a/jjb/ovsdb/ovsdb-full-integration.yaml
+++ b/jjb/ovsdb/ovsdb-full-integration.yaml
@@ -1,24 +1,17 @@
+---
 - project:
     name: ovsdb-full-integration
     jobs:
-        - 'ovsdb-daily-full-integration-{stream}'
+      - 'ovsdb-daily-full-integration-{stream}'
 
     stream:
-        - carbon:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - boron:
-            branch: 'stable/boron'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
+      - oxygen:
+          branch: 'master'
+      - nitrogen:
+          branch: 'stable/nitrogen'
+      - carbon:
+          branch: 'stable/carbon'
+          karaf-version: karaf3
 
     project: 'ovsdb'
     archive-artifacts: '*.log'
@@ -26,157 +19,156 @@
 - builder:
     name: ovsdb-run-it
     builders:
-        - maven-target:
-            maven-version: '{maven-version}'
-            pom: '{pomFile}'
-            goals: '-V -B verify -l {logfile} -Pintegrationtest -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true -Dovsdb.controller.address=${{CONTROLLER_IP}}'
-            properties:
-                - 'ovsdbserver.ipaddress=127.0.0.1'
-                - 'ovsdbserver.port=6641'
-                - 'ovsdb.userspace.enabled=yes'
-                - 'maven.repo.local=/tmp/r'
-                - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
-                - 'stream={stream}'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: 'ovsdb-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
+      - maven-target:
+          maven-version: '{maven-version}'
+          pom: '{pomFile}'
+          goals: >
+              -V -B verify -l {logfile} -Pintegrationtest
+              -Dskip.karaf.featureTest=true -Dmaven.compile.fork=true
+              -Dovsdb.controller.address=${{CONTROLLER_IP}}
+          properties:
+            - 'ovsdbserver.ipaddress=127.0.0.1'
+            - 'ovsdbserver.port=6641'
+            - 'ovsdb.userspace.enabled=yes'
+            - 'maven.repo.local=/tmp/r'
+            - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            - 'stream={stream}'
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m'
+          settings: 'ovsdb-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
 
 - builder:
     name: run-library-it
     builders:
-        - ovsdb-run-it:
-            maven-version: '{maven-version}'
-            stream: '{stream}'
-            pomFile: 'library/it/pom.xml'
-            logfile: '{OVS_VERSION}-libraryIT.log'
+      - ovsdb-run-it:
+          maven-version: '{maven-version}'
+          stream: '{stream}'
+          pomFile: 'library/it/pom.xml'
+          logfile: '{OVS_VERSION}-libraryIT.log'
 
 - builder:
     name: run-southbound-it
     builders:
-        - ovsdb-run-it:
-            maven-version: '{maven-version}'
-            stream: '{stream}'
-            pomFile: 'southbound/southbound-it/pom.xml'
-            logfile: '{OVS_VERSION}-southboundIT.log'
+      - ovsdb-run-it:
+          maven-version: '{maven-version}'
+          stream: '{stream}'
+          pomFile: 'southbound/southbound-it/pom.xml'
+          logfile: '{OVS_VERSION}-southboundIT.log'
 
 - builder:
     name: run-hwvtepsouthbound-it
     builders:
-        - ovsdb-run-it:
-            maven-version: '{maven-version}'
-            stream: '{stream}'
-            pomFile: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'
-            logfile: '{OVS_VERSION}-hwvtepsouthboundIT.log'
+      - ovsdb-run-it:
+          maven-version: '{maven-version}'
+          stream: '{stream}'
+          pomFile: 'hwvtepsouthbound/hwvtepsouthbound-it/pom.xml'
+          logfile: '{OVS_VERSION}-hwvtepsouthboundIT.log'
 
 - builder:
     name: run-ovsdb-it
     builders:
-        - inject:
-            properties-content: OVS_VERSION={OVS_VERSION}
-        - shell:
-            !include-raw-escape:
-                - include-raw-setup-docker.sh
-        - inject:
-            properties-file: env.properties
-        - run-southbound-it:
-            OVS_VERSION: '{OVS_VERSION}'
-            maven-version: '{maven-version}'
-            stream: '{stream}'
-        - shell:
-            !include-raw-escape:
-                - include-setup-hwvtep-docker.sh
-        - run-library-it:
-            OVS_VERSION: '{OVS_VERSION}'
-            maven-version: '{maven-version}'
-            stream: '{stream}'
-        - run-hwvtepsouthbound-it:
-            OVS_VERSION: '{OVS_VERSION}'
-            maven-version: '{maven-version}'
-            stream: '{stream}'
-        - shell:
-            !include-raw-escape:
-                - include-raw-cleanup-docker.sh
+      - inject:
+          properties-content: OVS_VERSION={OVS_VERSION}
+      - shell: !include-raw-escape: setup-docker.sh
+      - inject:
+          properties-file: env.properties
+      - run-southbound-it:
+          OVS_VERSION: '{OVS_VERSION}'
+          maven-version: '{maven-version}'
+          stream: '{stream}'
+      - shell: !include-raw-escape: include-setup-hwvtep-docker.sh
+      - run-library-it:
+          OVS_VERSION: '{OVS_VERSION}'
+          maven-version: '{maven-version}'
+          stream: '{stream}'
+      - run-hwvtepsouthbound-it:
+          OVS_VERSION: '{OVS_VERSION}'
+          maven-version: '{maven-version}'
+          stream: '{stream}'
+      - shell: !include-raw-escape: cleanup-docker.sh
 
 - job-template:
     name: 'ovsdb-daily-full-integration-{stream}'
 
     project-type: freestyle
-    node: centos7-docker-2c-4g
-    jdk: '{jdk}'
-    description: 'Integration tests for the OVSDB project against different versions of OVS and branches. This job runs nightly. '
+    node: centos7-docker-1c-4g
+    jdk: '{java-version}'
+    description: >
+        Integration tests for the OVSDB project against different versions of
+        OVS and branches. This job runs nightly.
 
     properties:
-        - opendaylight-infra-properties:
-            build-days-to-keep: '{build-days-to-keep}'
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
 
     parameters:
-        - opendaylight-infra-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-            artifacts: '{archive-artifacts}'
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
 
     scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            branch: '{branch}'
-            choosing-strategy: gerrit
+      - gerrit-trigger-scm:
+          refspec: '$GERRIT_REFSPEC'
+          branch: '{branch}'
+          choosing-strategy: gerrit
 
     wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
 
     triggers:
-        - timed: '@midnight'
-        - gerrit:
-            server-name: '{server-name}'
-            trigger-on:
-              - comment-added-contains-event:
-                 comment-contains-value: 'runit'
-            projects:
-              - project-compare-type: 'ANT'
-                project-pattern: '{project}'
-                branches:
-                  - branch-compare-type: 'ANT'
-                    branch-pattern: '**/{branch}'
-            skip-vote:
-                successful: true
-                failed: true
-                unstable: true
-                notbuilt: true
+      - timed: '@midnight'
+      - gerrit:
+          server-name: '{gerrit-server-name}'
+          trigger-on:
+            - comment-added-contains-event:
+                comment-contains-value: 'runit'
+          projects:
+            - project-compare-type: 'ANT'
+              project-pattern: '{project}'
+              branches:
+                - branch-compare-type: 'ANT'
+                  branch-pattern: '**/{branch}'
+          skip-vote:
+            successful: true
+            failed: true
+            unstable: true
+            notbuilt: true
 
     builders:
-        - wipe-org-opendaylight-repo
-        - maven-target:
-            maven-version: 'mvn33'
-            pom: 'pom.xml'
-            goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
-            properties:
-                - 'maven.repo.local=/tmp/r'
-                - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
-                - 'stream={stream}'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: 'ovsdb-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-        - run-ovsdb-it:
-            maven-version: 'mvn33'
-            stream: '{stream}'
-            OVS_VERSION: '2.4.0'
-        - run-ovsdb-it:
-            maven-version: 'mvn33'
-            stream: '{stream}'
-            OVS_VERSION: '2.5.0'
-        - jacoco-nojava-workaround
+      - wipe-org-opendaylight-repo
+      - maven-target:
+          maven-version: 'mvn33'
+          pom: 'pom.xml'
+          goals: '-V -B -l build.log clean install dependency:tree -Pq -Dmaven.compile.fork=true'
+          properties:
+            - 'maven.repo.local=/tmp/r'
+            - 'org.ops4j.pax.url.mvn.localRepository=/tmp/r'
+            - 'stream={stream}'
+          java-opts:
+            - '-Xmx1024m -XX:MaxPermSize=256m'
+          settings: 'ovsdb-settings'
+          settings-type: cfp
+          global-settings: 'global-settings'
+          global-settings-type: cfp
+      - run-ovsdb-it:
+          maven-version: 'mvn33'
+          stream: '{stream}'
+          OVS_VERSION: '2.4.0'
+      - run-ovsdb-it:
+          maven-version: 'mvn33'
+          stream: '{stream}'
+          OVS_VERSION: '2.5.0'
+      - jacoco-nojava-workaround
 
     publishers:
-        - email-notification:
-            email-recipients: '{email-recipients}'
-            email-prefix: '[ovsdb]'
-        - opendaylight-infra-shiplogs:
-            maven-version: 'mvn33'
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[ovsdb]'
+      - lf-infra-publish