X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffaas%2Ffaas.yaml;h=ead4febb2d054465ba362937b6112dc2f5b21531;hb=9d926f94fe3824189d4990b904c1807602ba7d85;hp=374e24cc97e51307fd71f35506a18d59da5e2ec9;hpb=d93ed9416e29f9080b00eea18284931de053837c;p=releng%2Fbuilder.git

diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml
index 374e24cc9..e6ef01382 100644
--- a/jjb/faas/faas.yaml
+++ b/jjb/faas/faas.yaml
@@ -1,300 +1,68 @@
-# REMOVE THIS LINE IF YOU WANT TO CUSTOMIZE ANYTHING BELOW
-# Otherwise this file will be automatically overwritten by the template
-# autobuilder.
-
-# ODL Releng build templates
+---
 - project:
-    name: faas
+    name: faas-oxygen
     jobs:
-        - '{name}-clm-{stream}'
-        - '{name}-distribution-{stream}'
-        - '{name}-distribution-check-{stream}'
-        - '{name}-integration-{stream}'
-        - '{name}-periodic-{stream}'
-        - '{name}-validate-autorelease-{stream}'
-        - 'faas-verify-{stream}'
-        - 'faas-merge-{stream}'
-        - 'faas-sonar'
-
-
-    # stream:    release stream (eg. stable-lithium or beryllium)
-    # branch:    git branch (eg. stable/lithium or master)
-    stream:
-        - boron:
-            branch: 'master'
-            jdk: openjdk8
-            jdks:
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
-        - beryllium:
-            branch: 'stable/beryllium'
-            jdk: openjdk7
-            jdks:
-                - openjdk7
-                - openjdk8
-            disable_autorelease: False
-            disable_distribution_check: False
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
+    stream: oxygen
     project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
     mvn-settings: 'faas-settings'
-    mvn-goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r '
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}'
-    email-upstream: '[faas] [controller] [yangtools] [odlparent]'
-
-# For the Job templates below replace instances of:
-# PROJECT_SHORTNAME with your project name (eg. circuitsw)
-# PROJECT_PATH with your project name (eg. ofextensions/circuitsw)
-# MAVEN_GOALS with your maven goals to build
-# MAVEN_OPTS with your maven options to build
-
-- job-template:
-    name: 'faas-verify-{stream}'
-
-    # Job template for ODL verify jobs
-    #
-    # The purpose of this job template is to setup a ODL verify job
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: matrix
-    node: matrix_master
-    concurrent: true
-
-    axes:
-        - axis:
-            type: slave
-            name: nodes
-            values:
-                - dynamic_verify
-        - axis:
-            type: jdk
-            values: '{obj:jdks}'
-
-    logrotate:
-        daysToKeep: '14'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-
-    scm:
-        - gerrit-trigger-scm:
-            refspec: '$GERRIT_REFSPEC'
-            choosing-strategy: 'gerrit'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
-
-    triggers:
-        - gerrit-trigger-patch-submitted:
-            name: 'faas'
-            branch: '{branch}'
-
-    builders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'faas-settings'
-        - maven-target:
-            maven-version: '{mvn33}'
-            pom: 'pom.xml'
-            goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dstream={stream}'
-            java-opts:
-                - '-Xmx1024m -XX:MaxPermSize=256m'
-            settings: 'faas-settings'
-            settings-type: cfp
-            global-settings: 'odl-global-settings'
-            global-settings-type: cfp
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '**/target/surefire-reports/*-output.txt, '
-        - findbugs
-        - email-notification:
-            email-prefix: '[faas]'
-        - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
-
-- job-template:
-    name: 'faas-merge-{stream}'
-
-    # Job template for ODL merge jobs
-    #
-    # The purpose of this job template is to setup a ODL merge job
-    # and deploy artifacts to Nexus.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-
-    project-type: maven
-    node: dynamic_merge
-    jdk: '{jdk}'
-
-    logrotate:
-        daysToKeep: '14'
-        numToKeep: '10'
-        artifactDaysToKeep: '{build-artifact-days-to-keep}'
-        artifactNumToKeep: '{build-artifact-num-to-keep}'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-        - gerrit-parameters:
-            project: '{project}'
-            branch: '{branch}'
-            refspec: 'refs/heads/{branch}'
-
-    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:
-            name: 'faas'
-            branch: '{branch}'
-
-    prebuilders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'faas-settings'
+    dependencies: ''
+    email-upstream: '[faas]'
 
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dmerge -Dstream={stream}'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'faas-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
-        post-step-run-condition: UNSTABLE
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
 
-    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: 'faas-settings'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-            - maven-target:
-                maven-version: '{mvn33}'
-                pom: deploy-site.xml
-                goals: 'site:deploy -V -B -Dstream={stream}'
-                java-opts:
-                    - '-Xmx2g'
-                settings: 'faas-settings'
-                settings-type: cfp
-                global-settings: 'odl-global-settings'
-                global-settings-type: cfp
-
-    reporters:
-        - findbugs
-
-    publishers:
-        - archive-artifacts:
-            artifacts: '**/target/surefire-reports/*-output.txt, '
-        - email-notification:
-            email-prefix: '[faas]'
-        - maven-deploy:
-            id: ''
-            unique-version: true
-            deploy-unstable: false
-        - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
-
-- job-template:
-    name: 'faas-sonar'
-    disabled: false
-
-    project-type: maven
-    node: dynamic_verify
-    jdk: 'openjdk8'
-
-    logrotate:
-        daysToKeep: '7'
-        numToKeep: '10'
-        artifactDaysToKeep: '1'
-        artifactNumToKeep: '1'
-
-    parameters:
-        - project-parameter:
-            project: '{project}'
-
-    scm:
-        - git-scm:
-            refspec: ''
-            branch: 'master'
-
-    wrappers:
-        - opendaylight-infra-wrappers:
-            build-timeout: '{build-timeout}'
+- project:
+    name: faas-nitrogen
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    triggers:
-        - timed: 'H H * * 6'
-        - gerrit-trigger-patch-sonar:
-            name: 'faas'
+    stream: nitrogen
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'stable/nitrogen'
+    mvn-settings: 'faas-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
 
-    prebuilders:
-        - jacoco-nojava-workaround
-        - provide-maven-settings:
-            global-settings-file: 'odl-global-settings'
-            settings-file: 'faas-settings'
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
 
-    maven:
-        maven-name: '{mvn33}'
-        root-pom: 'pom.xml'
-        goals: 'clean install -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r  -V -B -Djenkins -Dsonar'
-        maven-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-        settings: 'faas-settings'
-        settings-type: cfp
-        global-settings: 'odl-global-settings'
-        global-settings-type: cfp
+- project:
+    name: faas-carbon
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-integration-{stream}'
+      - odl-maven-jobs
 
-    reporters:
-        - findbugs
+    stream: carbon
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'stable/carbon'
+    karaf-version: karaf3
+    mvn-settings: 'faas-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+    dependencies: ''
+    email-upstream: '[faas]'
 
-    publishers:
-        - sonar:
-            language: 'java'
-            maven-opts: '-Xmx6144m -XX:MaxPermSize=1024m'
-        - email-notification:
-            email-prefix: '[faas]'
-        - jacoco-report
-        - archive-build:
-            maven-version: '{mvn33}'
+    # Used by the release job
+    staging-profile-id: 96f5ac591d858
 
+- project:
+    name: faas-sonar
+    jobs:
+      - gerrit-maven-sonar
+    project: 'faas'
+    project-name: 'faas'
+    branch: 'master'
+    mvn-settings: 'faas-settings'
+    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'