X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Freleng-templates.yaml;h=d830b59a8bd9aa607117d224057c92ee49f5d3c6;hb=1aaf65a8c4855c8bef7f955b4e0a9937de444d4c;hp=4594e926296084771241555cea547e145a253924;hpb=9ad5a4aa1765c3a9f62472c02b894ce2cfe16840;p=releng%2Fbuilder.git

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index 4594e9262..d830b59a8 100644
--- a/jjb/releng-templates.yaml
+++ b/jjb/releng-templates.yaml
@@ -7,7 +7,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     properties:
       - opendaylight-infra-properties:
@@ -15,6 +15,7 @@
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -41,10 +42,10 @@
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - provide-maven-settings:
-          global-settings-file: 'odl-global-settings'
+          global-settings-file: 'global-settings'
           settings-file: 'autorelease-settings'
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: >
               clean deploy -V -B
@@ -56,7 +57,7 @@
             - '-Xmx1024m -XX:MaxPermSize=256m'
           settings: 'autorelease-settings'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-stage-release
 
@@ -64,8 +65,7 @@
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish
 
 
 - job-template:
@@ -75,10 +75,11 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     parameters:
       - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
           project: '{project}'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
@@ -93,261 +94,25 @@
       - wipe-org-opendaylight-repo
       - jacoco-nojava-workaround
       - releng-fetch-p2zip-if-necessary:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: '{mvn-settings}'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
       - releng-generate-p2pom
       - maven-target:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           pom: 'pom.xml'
           goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
           settings: '{mvn-settings}'
           settings-type: cfp
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
           global-settings-type: cfp
       - releng-update-p2composite-metadata:
-          maven-version: 'mvn33'
+          maven-version: 'mvn35'
           settings: '{mvn-settings}'
-          global-settings: 'odl-global-settings'
+          global-settings: 'global-settings'
 
     publishers:
       - email-notification:
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-# Generic tox-based verify action
-
-- tox_builder_verify: &tox_builder_verify
-    name: tox_builder_verify
-
-    # Required Variables:
-    #     branch:    git branch (eg. stable/boron or master)
-    #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace. Empty works if tox.ini is at project root.
-    # Note that stream value is not needed.
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git:
-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          basedir: 'repo'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - 'origin/$GERRIT_BRANCH'
-          skip-tag: true
-          choosing-strategy: 'gerrit'
-          submodule:
-            recursive: true
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{toxdir}/**'
-
-    builders:
-      - shell: |
-          virtualenv $WORKSPACE/venv-tox
-          source $WORKSPACE/venv-tox/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse
-          pip freeze
-          cd $WORKSPACE/repo/{toxdir}
-          tox
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-- job-template:
-    name: '{project-name}-verify-tox-{stream}'
-
-    # Job template for verify jobs executing tox envlist
-    #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace. Empty works if tox.ini is at project root.
-
-    <<: *tox_builder_verify
-
-# Specification for projects outside release cycle, to avoid referring a stream.
-# This is useful mailny for integration-test-jobs, which defines streams for Integration/Distribution,
-# but the tox job is related to Integration/Test only.
-
-- job-template:
-    name: '{project-name}-verify-tox-master'
-
-    # Job template for verify jobs executing tox envlist
-    #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
-    #
-    # Required Variables:
-    #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace. Empty works if tox.ini is at project root.
-
-    branch: master
-
-    <<: *tox_builder_verify
-
-# Python (pep8) specific, project should migrate to {project-name}-verify-tox-{stream}
-
-- job-template:
-    name: '{project-name}-verify-python-{stream}'
-
-    # Job template for python verify jobs
-    #
-    # The purpose of this job template is to run tox for projects using this
-    # template.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. stable-lithium or beryllium)
-    #     branch:    git branch (eg. stable/lithium or master)
-    #     toxdir:    directory containing the project's tox.ini relative to
-    #                the workspace. Empty works if tox.ini is at project root.
-
-    <<: *tox_builder_verify
-
-- job-template:
-    name: '{project-name}-merge-rtd-{stream}'
-    # Template for ReadTheDocs triggering
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: false
-
-    parameters:
-      - opendaylight-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-merged:
-          server-name: '{server-name}'
-          name: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - shell: |
-          curl -X POST https://readthedocs.org/build/{rtdproject}
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
-
-# Node related
-
-- job-template:
-    name: '{project-name}-verify-node-{stream}'
-
-    # Job template for python verify jobs
-    #
-    # The purpose of this job template is to run node tests for projects using
-    # this template. It uses python virtualenv to install nodeenv and create a
-    # virtualenv for nodejs.
-    #
-    # Required Variables:
-    #     stream:    release stream (eg. boron or carbon)
-    #     branch:    git branch (eg. stable/boron or master)
-    #     nodedir:   directory of nodejs project to run node test against
-    #     nodever:   version of node to install in virtualenv
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - opendaylight-infra-parameters:
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-
-    scm:
-      - git:
-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          basedir: 'repo'
-          refspec: '$GERRIT_REFSPEC'
-          branches:
-            - 'origin/$GERRIT_BRANCH'
-          skip-tag: true
-          choosing-strategy: 'gerrit'
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    triggers:
-      - gerrit-trigger-patch-submitted:
-          server: '{server-name}'
-          project: '{project}'
-          branch: '{branch}'
-          files: '{nodedir}/**'
-
-    builders:
-      - shell: |
-          #!/bin/bash
-          # Prepare Python
-          virtualenv $WORKSPACE/venv-python
-          source $WORKSPACE/venv-python/bin/activate
-          pip install --upgrade pip
-          pip install --upgrade tox argparse nodeenv
-          pip freeze
-
-          # Prepare node
-          nodeenv --node={nodever} --prebuilt $WORKSPACE/venv-node
-          source $WORKSPACE/venv-node/bin/activate
-          cd $WORKSPACE/repo/{nodedir}
-          npm install
-          npm test
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - opendaylight-infra-shiplogs:
-          maven-version: 'mvn33'
+      - lf-infra-publish