Merge "Migrate mininet to CP ubuntu-16.04.json"

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

diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml
index f07f229d5ca47717323ae2112ab8eaefefaca325..27d73dd6df85333c5f67b93aeff70f6cb3586fd6 100644 (file)
--- a/jjb/releng-jobs.yaml
+++ b/jjb/releng-jobs.yaml
@@ -29,7 +29,7 @@
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.0.6
+    jjb-version: 2.0.9
     jenkins-urls: >
       https://jenkins.opendaylight.org/releng
       https://jenkins.opendaylight.org/sandbox
@@ -46,45 +46,11 @@
     build-node: centos7-builder-2c-1g
 
     platforms:
-      - centos
       - ubuntu-14.04
       - ubuntu-16.04
 
     templates:
-      - devstack
-      - 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-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-ocata
-      - platforms: ubuntu-16.04
-        templates: devstack-pre-pip-pike
-      - platforms: ubuntu-16.04
-        templates: devstack
 
 - job-template:
     name: builder-check-poms
@@ -181,7 +147,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}'