Merge "Revert "Install odl-mdsal-trace in netvirt oxygen csit""

[releng/builder.git] / jjb / releng-templates.yaml

diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
index bc61bf839462437b545e59c50cb888c73c8ec960..4a5eef8b18b0526a452a73e63e7c7b1bdea22090 100644 (file)
--- 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:
@@ -75,7 +75,7 @@
 
     project-type: freestyle
     node: '{build-node}'
-    jdk: '{jdk}'
+    jdk: '{java-version}'
 
     parameters:
       - opendaylight-infra-parameters:
@@ -116,119 +116,3 @@
           email-recipients: '{email-recipients}'
           email-prefix: '[releng]'
       - lf-infra-publish
-
-- job-template:
-    name: '{project-name}-merge-rtd-{stream}'
-    # Template for ReadTheDocs triggering
-
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: false
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          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}]'
-      - lf-infra-publish
-
-# 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. nitrogen or oxygen)
-    #     branch:    git branch (eg. stable/nitrogen 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:
-          os-cloud: '{os-cloud}'
-          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
-          PYTHON="$WORKSPACE/venv-python/bin/python"
-          $PYTHON -m pip install --upgrade pip
-          $PYTHON -m pip install --upgrade tox argparse nodeenv
-          $PYTHON -m pip install --upgrade pipdeptree
-          pipdeptree
-
-          # 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}]'
-      - lf-infra-publish