Merge "enable driver_type gre and ml2_gre"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index 1b90cc55b103d74f7be55532cd6c409c7345f9bf..7cbd88e5d30e16825f8c547324b3641518d08ef4 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -2,9 +2,17 @@
 - project:
     name: builder-jobs
     jobs:
-      - '{project-name}-ci-jobs':
-          build-node: centos7-builder-2c-2g
-          build-timeout: 60
+      - '{project-name}-rtd-jobs':
+          project-pattern: releng/builder
+          rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-releng-builder/32926/
+          rtd-token: e9fa62bd60a39c22de631791309ccacc37a9929e
+      - gerrit-jenkins-cfg-merge:
+          jenkins-silos: releng sandbox
+      - gerrit-jjb-deploy-job
+      - gerrit-jjb-merge:
+          build-node: centos7-builder-4c-4g
+          build-timeout: 90
+      - gerrit-jjb-verify
       - builder-check-poms
       - builder-copy-sandbox-logs
       - builder-openstack-cron
@@ -18,72 +26,14 @@
     project-name: builder
     stream: master
     branch: master
-    build-node: centos7-builder-2c-1g
+    build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.0.0
+    jjb-version: 2.2.1
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
 
-- project:
-    name: packer-jobs
-    # packer jobs templates are defined in global-jjb
-    jobs:
-      - '{project-name}-packer-jobs'
-    project: 'releng/builder'
-    project-name: builder
-    branch: master
-    archive-artifacts: '**/*.log'
-    build-node: centos7-builder-2c-1g
-
-    platforms:
-      - centos
-      - ubuntu-14.04
-      - ubuntu-16.04
-
-    templates:
-      - devstack
-      - devstack-pre-pip-newton:
-          build-timeout: 75
-      - devstack-pre-pip-ocata:
-          build-timeout: 75
-      - devstack-pre-pip-pike:
-          build-timeout: 75
-      - gbp
-      - mininet-ovs-2.5:
-          build-timeout: 60
-      - mininet-ovs-2.6:
-          build-timeout: 75
-
-    exclude:
-      - platforms: centos
-        templates: gbp
-      - platforms: centos
-        templates: mininet-ovs-2.5
-      - platforms: centos
-        templates: mininet-ovs-2.6
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-newton
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-ocata
-      - platforms: ubuntu-14.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-14.04
-        templates: devstack
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.5
-      - platforms: ubuntu-14.04
-        templates: mininet-ovs-2.6
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-newton
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-ocata
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-16.04
-        templates: devstack
-
 - job-template:
     name: builder-check-poms
     node: centos7-builder-2c-1g
@@ -164,6 +114,7 @@
     name: builder-openstack-cron
     project-type: freestyle
     node: '{build-node}'
+    concurrent: true
 
     properties:
       - lf-infra-properties:
@@ -178,7 +129,12 @@
       - string:
           name: OS_CLOUD
           default: '{os-cloud}'
-          description: Artifacts to archive to the logs server.
+          description: |
+              The name of a cloud configuration in clouds.yaml. OS_CLOUD is a
+              variable name that is significant to openstack client as a
+              environment variable. Please refer to the documentation for
+              further details.
+              https://docs.openstack.org/developer/python-openstackclient/
       - string:
           name: ARCHIVE_ARTIFACTS
           default: '{archive-artifacts}'
@@ -201,19 +157,22 @@
           files:
             - file-id: clouds-yaml
               target: '$HOME/.config/openstack/clouds.yaml'
+            - file-id: npmrc
+              target: '$HOME/.npmrc'
+            - file-id: pipconf
+              target: '$HOME/.config/pip/pip.conf'
 
     triggers:
       - timed: '0,30 * * * *'
 
     builders:
       - odl-openstack-install
-      - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh
       # Servers
       - odl-openstack-cleanup-stale-stacks
       - odl-openstack-cleanup-stale-nodes
-      # Disable orphaned nodes script. See:
-      #   https://jira.linuxfoundation.org/browse/RELENG-780
-      # - odl-openstack-cleanup-orphaned-nodes
+      - odl-openstack-cleanup-orphaned-nodes
+      # Volumes
+      - odl-openstack-cleanup-stale-volumes
       # Images
       - odl-openstack-check-image-protection
       - odl-openstack-cleanup-old-images
@@ -257,10 +216,13 @@
 
     builders:
       - shell: !include-raw-escape: opendaylight-infra-update-image-list.sh
-      - opendaylight-infra-push-gerrit-patch:
+      - lf-infra-push-gerrit-patch:
           project: '{project}'
+          gerrit-user: 'jenkins-$SILO'
+          gerrit-host: 'git.opendaylight.org'
           gerrit-topic: 'releng-update-cloud-image-list'
           gerrit-commit-message: 'Update cloud image list docs'
+          reviewers-email: 'jluhrsen@redhat.com'
 
     publishers:
       - email-notification: