From: Andrew Grimberg Date: Wed, 24 Jan 2018 15:17:29 +0000 (+0000) Subject: Merge "Switch the csit-verify-1node to use job prefix" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=7d16ac5800cc99d4b31f8a4a8070be9c6407e167;hp=dfe54cf86451de53221319dd0a10c3ec89c525c0;p=releng%2Fbuilder.git Merge "Switch the csit-verify-1node to use job prefix" --- diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index 72a41e37f..e6816390e 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'aaa' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'aaa' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'aaa' diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index a85a816a2..4527fd8e8 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'alto' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'alto' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'alto' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index d6cb887f6..7a9dad82b 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'atrium' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'atrium' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'atrium' diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 172dc1065..e8d9cae84 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -146,6 +146,11 @@ - shell: !include-raw: - generate-release-notes.sh +- builder: + name: autorelease-update-validate-projects + builders: + - shell: !include-raw-escape: update-validate-autorelease-projects.sh + - publisher: # Search console log for failures and email status to the release mailing list. name: opendaylight-infra-notify-status diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index 588d9053c..710ee05f6 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -199,8 +199,7 @@ jenkins-ssh-credential: opendaylight-jenkins-ssh builders: - - shell: !include-raw-escape: - - update-validate-autorelease-projects.sh + - autorelease-update-validate-projects - opendaylight-infra-push-gerrit-patch: project: 'releng/builder' gerrit-topic: 'autorelease-update-validate-jobs-{stream}' @@ -418,6 +417,8 @@ settings-type: cfp global-settings: global-settings global-settings-type: cfp + # Hack to workaround the duplicate-finder plugin in odlparent breaking validate-autorelease + - shell: sed -i 's/validate/none/' /tmp/r/org/opendaylight/odlparent/odlparent/3.0.2/odlparent-3.0.2.pom - maven-target: maven-version: mvn33 pom: pom.xml diff --git a/jjb/autorelease/update-validate-autorelease-projects.sh b/jjb/autorelease/update-validate-autorelease-projects.sh index 7fea2910e..327fb1abf 100644 --- a/jjb/autorelease/update-validate-autorelease-projects.sh +++ b/jjb/autorelease/update-validate-autorelease-projects.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: EPL-1.0 ############################################################################## -# Copyright (c) 2017 The Linux Foundation and others. +# Copyright (c) 2017 - 2018 The Linux Foundation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 @@ -14,9 +14,10 @@ BRANCH="stable/${STREAM}" # The current development release will not have a stable branch defined so if # branch does not exist assume master -wget -nv -O /tmp/ar-branches.json https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/ -if ! grep "$BRANCH" /tmp/ar-branches.json; then - BRANCH=master +url="https://git.opendaylight.org/gerrit/projects/releng%2Fautorelease/branches/" +resp=$(curl -s -w "\\n\\n%{http_code}" --globoff -H "Content-Type:application/json" "$url") +if [[ ! "$resp" =~ $BRANCH ]]; then + BRANCH="master" fi wget -nv -O /tmp/pom.xml "https://git.opendaylight.org/gerrit/gitweb?p=releng/autorelease.git;a=blob_plain;f=pom.xml;hb=$GERRIT_BRANCH" diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index 6787f0d31..da8da068b 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'bgpcep' @@ -38,8 +38,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'bgpcep' @@ -72,8 +72,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'bgpcep' diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index 42d3c5c56..4cbf05927 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'bier' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'bier' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'bier' diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 7549ec42e..eb31447c6 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'capwap' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'capwap' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'capwap' diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 7b4460c01..ffc3baa5c 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'cardinal' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'cardinal' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'cardinal' diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index 757601598..bd045cbf8 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'centinel' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'centinel' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'centinel' diff --git a/jjb/coe/coe-csit-openstack.yaml b/jjb/coe/coe-csit-openstack.yaml deleted file mode 100644 index abef3f782..000000000 --- a/jjb/coe/coe-csit-openstack.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- project: - name: coe-csit-openstack-integration - jobs: - - '{project}-csit-{topology}-openstack-{openstack}-{functionality}-{stream}' - - project: 'coe' - - topology: - - 1node: - openstack_system_count: 3 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system_count: 4 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - testplan: '{project}-{topology}-openstack.txt' - - functionality: 'kubernetes' - - stream: - - oxygen: - branch: 'master' - - nitrogen: - branch: 'stable/nitrogen' - - openstack: - - ocata: - openstack-branch: 'stable/ocata' - odl-ml2-branch: 'stable/ocata' - odl-ml2-driver-version: 'v2' - openstack_system_image: '{openstack_system_image_ocata}' - - create-initial-networks: 'True' - - enable-openstack-plugins: 'networking-odl,kuryr-kubernetes,neutron-lbaas' - - enable-openstack-services: > - legacy_etcd,docker,q-lbaasv2,kubernetes-api, - kubernetes-controller-manager,kubernetes-scheduler,kubelet,kuryr-kubernetes - - disable-openstack-services: 'etcd3' - - lbaas-service-provider: > - 'LOADBALANCERV2:opendaylight:networking_odl.lbaas.driver_v2.OpenDaylightLbaasDriverV2:default' diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 0d49e9b7f..bda82a856 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'coe' project-name: 'coe' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'coe' project-name: 'coe' @@ -55,7 +55,7 @@ name: coe-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'coe' project-name: 'coe' diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 327799ab2..78631d214 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'controller' @@ -32,7 +32,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'controller' @@ -58,7 +58,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'controller' diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index e392ba515..ae09f245f 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -3,7 +3,7 @@ name: coretutorials-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'coretutorials' @@ -29,7 +29,7 @@ name: coretutorials-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'coretutorials' @@ -55,7 +55,7 @@ name: coretutorials-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'coretutorials' @@ -90,4 +90,3 @@ mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' build-timeout: 120 - diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 5c13c798b..96ad52781 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'daexim' project-name: 'daexim' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'daexim' project-name: 'daexim' diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index c2249a289..de560eea3 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'didm' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'didm' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'didm' diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 76a63f8d7..e6ab39ea9 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'dlux' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'dlux' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'dlux' diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 88c1c4b2a..0b479d155 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'dluxapps' project-name: 'dluxapps' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'dluxapps' project-name: 'dluxapps' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'dluxapps' project-name: 'dluxapps' diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index f889912ee..df4f24a34 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'eman' @@ -32,8 +32,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'eman' @@ -60,8 +60,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'eman' diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index e1bfa4d31..af7804f42 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'faas' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'faas' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'faas' diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 3482598c5..b4180e1b3 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: 'federation' project-name: 'federation' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: 'federation' project-name: 'federation' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: 'federation' project-name: 'federation' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 5e21d81bb..a11bd16a7 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'genius' @@ -37,7 +37,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'genius' @@ -68,7 +68,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'genius' diff --git a/jjb/global-jjb b/jjb/global-jjb index c1873360f..a5a5237ab 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit c1873360fa7455fdb690c6235923d7eb68e30ec6 +Subproject commit a5a5237ab810ab8ad4ff61731f9f8bdc1e1e342e diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index bf28b0175..dcf6c8ccc 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'groupbasedpolicy' @@ -36,7 +36,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'groupbasedpolicy' @@ -67,7 +67,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'groupbasedpolicy' diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index d6459caa0..157660f36 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'honeycomb/vbd' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'honeycomb/vbd' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'honeycomb/vbd' diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index 5b26154e4..77fe7e4b3 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'infrautils' @@ -31,7 +31,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'infrautils' @@ -57,7 +57,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'infrautils' diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh index 720331ad1..2a333dea7 100644 --- a/jjb/integration/distribution/distribution-check-bootup.sh +++ b/jjb/integration/distribution/distribution-check-bootup.sh @@ -20,10 +20,13 @@ unzip -q "${BUNDLE}" echo "Configuring the startup features..." FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg" -# Add test feature repo if Karaf 4. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" -# Add test feature repo if Karaf 3. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" +FEATURE_TEST_STRING="features-integration-test" +if [[ "$KARAF_VERSION" == "karaf4" ]]; then + FEATURE_TEST_STRING="features-test" +fi + +sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF} + # Add actual boot features. sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}" cat "${FEATURESCONF}" diff --git a/jjb/integration/distribution/distribution-deploy-offline.sh b/jjb/integration/distribution/distribution-deploy-offline.sh index 570f0617c..e7920b534 100644 --- a/jjb/integration/distribution/distribution-deploy-offline.sh +++ b/jjb/integration/distribution/distribution-deploy-offline.sh @@ -15,10 +15,13 @@ unzip -q "${BUNDLE}" echo "Configuring the startup features..." FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg" -# Add test feature repo if Karaf 4. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" -# Add test feature repo if Karaf 3. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" +FEATURE_TEST_STRING="features-integration-test" +if [[ "$KARAF_VERSION" == "karaf4" ]]; then + FEATURE_TEST_STRING="features-test" +fi + +sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF} + # Feature is instaled later. cat "${FEATURESCONF}" diff --git a/jjb/integration/distribution/distribution-deploy-verify.sh b/jjb/integration/distribution/distribution-deploy-verify.sh index a29a57599..c81ac6db6 100644 --- a/jjb/integration/distribution/distribution-deploy-verify.sh +++ b/jjb/integration/distribution/distribution-deploy-verify.sh @@ -14,11 +14,14 @@ echo "Extracting the new controller..." unzip -q "${BUNDLE}" echo "Configuring the startup features..." -FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg -# Add test feature repo if Karaf 4. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" -# Add test feature repo if Karaf 3. -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,%g" "${FEATURESCONF}" +FEATURESCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg" +FEATURE_TEST_STRING="features-integration-test" +if [[ "$KARAF_VERSION" == "karaf4" ]]; then + FEATURE_TEST_STRING="features-test" +fi + +sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF} + # Add actual boot features. sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}" cat "${FEATURESCONF}" diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh index 89dd8e9aa..5b1db13ec 100644 --- a/jjb/integration/integration-configure-clustering.sh +++ b/jjb/integration/integration-configure-clustering.sh @@ -71,7 +71,13 @@ cat ${MAVENCONF} echo "Configuring the startup features..." sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF} -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/features-integration-test/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} + +FEATURE_TEST_STRING="features-integration-test" +if [[ "$KARAF_VERSION" == "karaf4" ]]; then + FEATURE_TEST_STRING="features-test" +fi + +sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} cat ${FEATURESCONF} echo "Configuring the log..." diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index b56e4958a..c6beeed41 100644 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -64,10 +64,8 @@ if [[ "$USEFEATURESBOOT" == "True" ]]; then sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" ${FEATURESCONF} fi -FEATURE_INDEX_STRING="features-integration-index" FEATURE_TEST_STRING="features-integration-test" if [[ "$KARAF_VERSION" == "karaf4" ]]; then - FEATURE_INDEX_STRING="features-index" FEATURE_TEST_STRING="features-test" fi diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index 8fa57c7f3..4076e47de 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -7,6 +7,7 @@ source ${ROBOT_VENV}/bin/activate PYTHON="${ROBOT_VENV}/bin/python" SSH="ssh -t -t" ADMIN_PASSWORD="admin" +OPENSTACK_MASTER_CLIENTS_VERSION="pike" # TODO: remove this work to run changes.py if/when it's moved higher up to be visible at the Robot level echo "showing recent changes that made it in to the distribution used by this job" @@ -98,6 +99,38 @@ function create_etc_hosts() { cat ${WORKSPACE}/hosts_file } # create_etc_hosts() +#function to install Openstack Clients for Testing +#This will pull the latest versions compatiable with the +# openstack release +function install_openstack_clients_in_robot_vm() { + packages=("python-novaclient" "python-neutronclient" "python-openstackclient") + for plugin_name in ${ENABLE_OS_PLUGINS}; do + if [ "$plugin_name" == "networking-sfc" ]; then + packages+=("networking-sfc") + fi + done + openstack_version=$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2) + #If the job tests "master", we will use the clients from previous released stable version to avoid failures + if [ "${openstack_version}" == "master" ]; then + openstack_version=${OPENSTACK_MASTER_CLIENTS_VERSION} + fi + for package in ${packages[*]}; do + echo "Get the current support version of the package ${package}" + wget https://raw.githubusercontent.com/openstack/requirements/stable/${openstack_version}/upper-constraints.txt -O /tmp/constraints.txt 2>/dev/null + echo "$PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt" + $PYTHON -m pip install --upgrade --no-deps ${package} --no-cache-dir -c /tmp/constraints.txt + echo "$PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt" + $PYTHON -m pip install ${package} --no-cache-dir -c /tmp/constraints.txt + done + + if [ "${ENABLE_NETWORKING_L2GW}" == "yes" ]; then + #networking-l2gw is not officially available in any release yet. Gettting the latest stable version. + $PYTHON -m pip install networking-l2gw + fi +} + + + # convert commas in csv strings to spaces (ssv) function csv2ssv() { local csv=$1 @@ -158,7 +191,7 @@ NEUTRON_CREATE_INITIAL_NETWORKS=${CREATE_INITIAL_NETWORKS} ODL_MODE=manual ODL_MGR_IP=${MGRIP} -ODL_PORT=8080 +ODL_PORT=${ODL_PORT} ODL_PORT_BINDING_CONTROLLER=${ODL_ML2_PORT_BINDING} ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS} @@ -252,10 +285,6 @@ minimize_polling=True physical_network_mtus = ${PUBLIC_PHYSICAL_NETWORK}:1400 path_mtu = 1458 -# workaround for port-status not working due to https://bugs.opendaylight.org/show_bug.cgi?id=9092 -[ml2_odl] -odl_features=nothing - [[post-config|/etc/neutron/dhcp_agent.ini]] [DEFAULT] force_metadata = True @@ -302,7 +331,7 @@ Q_ML2_TENANT_NETWORK_TYPE=${TENANT_NETWORK_TYPE} ODL_MODE=manual ODL_MGR_IP=${MGRIP} -ODL_PORT=8080 +ODL_PORT=${ODL_PORT} ODL_PORT_BINDING_CONTROLLER=${ODL_ML2_PORT_BINDING} ODL_OVS_MANAGERS=${ODL_OVS_MANAGERS} @@ -484,6 +513,8 @@ EOF # archives build step will essentially be a noop. mkdir -p ${WORKSPACE}/archives + mv /tmp/changes.txt ${WORKSPACE}/archives + sleep 5 # FIXME: Do not create .tar and gzip before copying. for i in `seq 1 ${NUM_ODL_SYSTEM}`; do @@ -752,6 +783,7 @@ else fi RECLONE=False +ODL_PORT=8181 # Always compare the lists below against the devstack upstream ENABLED_SERVICES in # https://github.com/openstack-dev/devstack/blob/master/stackrc#L52 @@ -1181,6 +1213,9 @@ else SUITES=${newsuites} fi +#install all client versions required for this job testing +install_openstack_clients_in_robot_vm + # TODO: run openrc on control node and then scrape the vars from it # Environment Variables Needed to execute Openstack Client for NetVirt Jobs cat > /tmp/os_netvirt_client_rc << EOF @@ -1198,6 +1233,17 @@ EOF source /tmp/os_netvirt_client_rc +echo "Get all versions before executing pybot" +echo "openstack --version" +which openstack +openstack --version +echo "nova --version" +which nova +nova --version +echo "neutron --version" +which neutron +neutron --version + echo "Starting Robot test suites ${SUITES} ..." # please add pybot -v arguments on a single line and alphabetized suite_num=0 diff --git a/jjb/integration/integration-install-robotframework.sh b/jjb/integration/integration-install-robotframework.sh index d43f2d32b..48d5f84f3 100644 --- a/jjb/integration/integration-install-robotframework.sh +++ b/jjb/integration/integration-install-robotframework.sh @@ -55,19 +55,6 @@ pip install --upgrade jmespath # Module for backup-restore support library pip install --upgrade jsonpatch -# Module OpenstackClient is needed for Netvirt CSIT jobs -# Module networking-l2gw is required for using l2gw commands with neutron client -# Module python-neutronclient is needed for certain tests run with Openstack Newton -# that does not work with Openstack Client -# Module pyhon-novaclient is installed as a dependency of openstackclient, but the -# latest version (v10.0.0) has some problem with "server add floating ip" that is -# not there with v9.0.0, so pinning it to that for now -pip install python-openstackclient -pip install networking-l2gw==11.0.0 -pip install python-neutronclient==6.1.0 -pip install networking-sfc -pip install --upgrade python-novaclient==9.0.0 - # Print installed versions. pip install --upgrade pipdeptree pipdeptree diff --git a/jjb/iotdm/iotdm.yaml b/jjb/iotdm/iotdm.yaml index 3138be836..c2c135ab6 100644 --- a/jjb/iotdm/iotdm.yaml +++ b/jjb/iotdm/iotdm.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'iotdm' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'iotdm' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'iotdm' diff --git a/jjb/jsonrpc/jsonrpc.yaml b/jjb/jsonrpc/jsonrpc.yaml index 8be6bef23..48cb51f35 100644 --- a/jjb/jsonrpc/jsonrpc.yaml +++ b/jjb/jsonrpc/jsonrpc.yaml @@ -3,7 +3,7 @@ name: jsonrpc-fluorine jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' @@ -28,7 +28,7 @@ name: jsonrpc-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' @@ -53,7 +53,7 @@ name: jsonrpc-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' @@ -78,7 +78,7 @@ name: jsonrpc-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'jsonrpc' project-name: 'jsonrpc' diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index 24535bbee..f203d8959 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'l2switch' @@ -35,7 +35,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'l2switch' @@ -66,7 +66,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'l2switch' diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index 432afc945..72c8ca70b 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'lacp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'lacp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'lacp' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index 0cfe21a30..582621eec 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'lispflowmapping' @@ -35,8 +35,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'lispflowmapping' @@ -66,8 +66,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'lispflowmapping' diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index b45f6641b..79e498ce1 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'mdsal' @@ -32,8 +32,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'mdsal' @@ -59,8 +59,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'mdsal' diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index 60c15f857..5c6f81e30 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'messaging4transport' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'messaging4transport' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'messaging4transport' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 166100f5d..023296967 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'natapp' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'natapp' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'natapp' diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 8a9c37ae7..0b37f358e 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'nemo' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'nemo' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'nemo' diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 575d9c025..806cd5ee7 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'netconf' @@ -31,7 +31,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'netconf' @@ -57,7 +57,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'netconf' diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 1ee7e512d..318b15c50 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'netide' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'netide' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'netide' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 061d222d8..846501688 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -4,9 +4,9 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' - gerrit-tox-verify + - odl-maven-jobs stream: - oxygen: diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index b07936607..3f3de316a 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'neutron' @@ -32,8 +32,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'neutron' @@ -60,8 +60,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'neutron' diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index 4f413844a..36c1d21e9 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'next' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'next' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'next' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index 12cd1473b..0af5510cd 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'nic' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'nic' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'nic' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index ae0c75ad2..9865f61af 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'ocpplugin' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'ocpplugin' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'ocpplugin' diff --git a/jjb/opendaylight-infra-check-image-protection.sh b/jjb/odl-openstack-check-image-protection.sh similarity index 91% rename from jjb/opendaylight-infra-check-image-protection.sh rename to jjb/odl-openstack-check-image-protection.sh index df660c96a..980e70e15 100644 --- a/jjb/opendaylight-infra-check-image-protection.sh +++ b/jjb/odl-openstack-check-image-protection.sh @@ -8,7 +8,6 @@ # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## - # Checks the image "protected" value and set "True" marker # # The script is involked by 'builder-verify-image-protection', searches @@ -16,14 +15,10 @@ # setting. If the image protect setting is not "True", sets the # image protect setting to "True" to prevent the image from getting purged # by the cleanup old images job. +echo "---> Check image protection" -virtualenv "/tmp/v/openstack" # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 source "/tmp/v/openstack/bin/activate" -pip install --upgrade pip -pip install --upgrade python-openstackclient -pip install --upgrade pipdeptree -pipdeptree declare -a images readarray -t images <<< "$(grep -r _system_image: --include \*.yaml \ diff --git a/jjb/opendaylight-infra-cleanup-old-images.sh b/jjb/odl-openstack-cleanup-old-images.sh similarity index 59% rename from jjb/opendaylight-infra-cleanup-old-images.sh rename to jjb/odl-openstack-cleanup-old-images.sh index 6483788bc..db639d1a4 100644 --- a/jjb/opendaylight-infra-cleanup-old-images.sh +++ b/jjb/odl-openstack-cleanup-old-images.sh @@ -1,13 +1,16 @@ #!/bin/bash # SPDX-License-Identifier: EPL-1.0 ############################################################################## -# Copyright (c) 2017 The Linux Foundation and others. +# Copyright (c) 2017 - 2018 The Linux Foundation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## +# Removes openstack images older than 30 days in the cloud +echo "---> Cleanup old images" -lftools openstack --os-cloud vex \ - image cleanup --days=30 +# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 +source "/tmp/v/lftools/bin/activate" +lftools openstack --os-cloud vex image cleanup --days=30 diff --git a/jjb/opendaylight-infra-cleanup-orphaned-nodes.sh b/jjb/odl-openstack-cleanup-orphaned-nodes.sh similarity index 91% rename from jjb/opendaylight-infra-cleanup-orphaned-nodes.sh rename to jjb/odl-openstack-cleanup-orphaned-nodes.sh index 1a832fe09..953dadc81 100644 --- a/jjb/opendaylight-infra-cleanup-orphaned-nodes.sh +++ b/jjb/odl-openstack-cleanup-orphaned-nodes.sh @@ -1,7 +1,7 @@ #!/bin/bash # SPDX-License-Identifier: EPL-1.0 ############################################################################## -# Copyright (c) 2017 The Linux Foundation and others. +# Copyright (c) 2017 - 2018 The Linux Foundation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 @@ -10,13 +10,8 @@ ############################################################################## echo "---> Cleanup orphaned servers" -virtualenv "/tmp/v/openstack" # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 source "/tmp/v/openstack/bin/activate" -pip install --upgrade pip -pip install --upgrade python-openstackclient python-heatclient -pip install --upgrade pipdeptree -pipdeptree minion_in_jenkins() { # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...] diff --git a/jjb/opendaylight-infra-cleanup-stale-nodes.sh b/jjb/odl-openstack-cleanup-stale-nodes.sh similarity index 72% rename from jjb/opendaylight-infra-cleanup-stale-nodes.sh rename to jjb/odl-openstack-cleanup-stale-nodes.sh index 2ec19ee8e..ddd104180 100644 --- a/jjb/opendaylight-infra-cleanup-stale-nodes.sh +++ b/jjb/odl-openstack-cleanup-stale-nodes.sh @@ -1,13 +1,14 @@ #!/bin/bash # SPDX-License-Identifier: EPL-1.0 ############################################################################## -# Copyright (c) 2017 The Linux Foundation and others. +# Copyright (c) 2017 - 2018 The Linux Foundation and others. # # All rights reserved. This program and the accompanying materials # are made available under the terms of the Eclipse Public License v1.0 # which accompanies this distribution, and is available at # http://www.eclipse.org/legal/epl-v10.html ############################################################################## +echo "---> Cleanup stale nodes" # Todo: As a safe check we could obtain the list of active jobs from Jenkins and # compute the checksum from $JOB_NAME to check if any active nodes exist and @@ -15,7 +16,7 @@ # 24H timeout in place for all jobs therefore all jobs are expected to complete # within the timeout. -lftools openstack --os-cloud vex \ - server list --days=1 -lftools openstack --os-cloud vex \ - server cleanup --days=1 +# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 +source "/tmp/v/lftools/bin/activate" +lftools openstack --os-cloud vex server list --days=1 +lftools openstack --os-cloud vex server cleanup --days=1 diff --git a/jjb/opendaylight-infra-cleanup-stale-stacks.sh b/jjb/odl-openstack-cleanup-stale-stacks.sh similarity index 96% rename from jjb/opendaylight-infra-cleanup-stale-stacks.sh rename to jjb/odl-openstack-cleanup-stale-stacks.sh index 6f00ac81b..16559c9fe 100644 --- a/jjb/opendaylight-infra-cleanup-stale-stacks.sh +++ b/jjb/odl-openstack-cleanup-stale-stacks.sh @@ -11,14 +11,10 @@ # Cleanup stale stacks in the cloud # Requires the variable JENKINS_URLS declared in the job as a space separated # list of Jenkins instances to check for active builds. +echo "---> Cleanup stale stacks" -virtualenv "/tmp/v/openstack" # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 source "/tmp/v/openstack/bin/activate" -pip install --upgrade pip -pip install --upgrade python-openstackclient python-heatclient -pip install --upgrade pipdeptree -pipdeptree stack_in_jenkins() { # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...] diff --git a/jjb/odl-openstack-install.sh b/jjb/odl-openstack-install.sh new file mode 100644 index 000000000..adf7d923a --- /dev/null +++ b/jjb/odl-openstack-install.sh @@ -0,0 +1,20 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 2017, 2018 The Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Eclipse Public License v1.0 +# which accompanies this distribution, and is available at +# http://www.eclipse.org/legal/epl-v10.html +############################################################################## +# Installs the openstack cli to /tmp/v/openstack +echo "---> Install openstack cli into /tmp/v/openstack" + +virtualenv "/tmp/v/openstack" +# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 +source "/tmp/v/openstack/bin/activate" +pip install --upgrade pip +pip install --upgrade python-openstackclient python-heatclient +pip install --upgrade pipdeptree +pipdeptree diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index a1e295cfc..ab9c75ce8 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -2,8 +2,8 @@ - project: name: odlparent-master jobs: - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs - gerrit-tox-verify project: odlparent @@ -35,11 +35,85 @@ # Used by the release job staging-profile-id: 880d5ac25eaa +- project: + name: odlparent-3.1.x + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + - gerrit-tox-verify + + project: odlparent + project-name: odlparent + stream: 3.1.x + branch: 3.1.x + distribution_branch: master + + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: mvn33 + mvn-settings: odlparent-settings + mvn-goals: clean install + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: mvn33 + + dependencies: '' + email-upstream: '[odlparent]' + archive-artifacts: > + **/*.prop + **/*.log + **/target/surefire-reports/*-output.txt + **/target/failsafe-reports/failsafe-summary.xml + **/hs_err_*.log + **/target/feature/feature.xml + + # Used by the release job + javadoc-path: org.opendaylight.$PROJECT/$STREAM + staging-profile-id: 880d5ac25eaa + +- project: + name: odlparent-3.0.x + jobs: + - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs + - gerrit-tox-verify + + project: odlparent + project-name: odlparent + stream: 3.0.x + branch: 3.0.x + distribution_branch: master + + jdks: + - openjdk8 + maven: + - mvn33: + mvn-version: mvn33 + mvn-settings: odlparent-settings + mvn-goals: clean install + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: mvn33 + + dependencies: '' + email-upstream: '[odlparent]' + archive-artifacts: > + **/*.prop + **/*.log + **/target/surefire-reports/*-output.txt + **/target/failsafe-reports/failsafe-summary.xml + **/hs_err_*.log + **/target/feature/feature.xml + + # Used by the release job + javadoc-path: org.opendaylight.$PROJECT/$STREAM + staging-profile-id: 880d5ac25eaa + - project: name: odlparent-2.0.x jobs: - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs - gerrit-tox-verify project: odlparent @@ -77,8 +151,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs - gerrit-tox-verify stream: carbon diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index ab6c67a89..7677ec676 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'of-config' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'of-config' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'of-config' diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 1f892da28..66bfcae95 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -3,7 +3,7 @@ name: circuitsw-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'ofextensions/circuitsw' @@ -28,7 +28,7 @@ name: circuitsw-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'ofextensions/circuitsw' @@ -53,7 +53,7 @@ name: circuitsw-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'ofextensions/circuitsw' diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml index 5d7df78f3..c2a080e1d 100644 --- a/jjb/openflowjava/openflowjava.yaml +++ b/jjb/openflowjava/openflowjava.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'openflowjava' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'openflowjava' diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index e82bc6b66..fcb6ef944 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'openflowplugin' @@ -36,8 +36,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'openflowplugin' @@ -67,8 +67,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'openflowplugin' diff --git a/jjb/ovil/ovil.yaml b/jjb/ovil/ovil.yaml index ba3a55032..2e5d81414 100644 --- a/jjb/ovil/ovil.yaml +++ b/jjb/ovil/ovil.yaml @@ -2,7 +2,7 @@ - project: name: ovil jobs: - - '{project-name}-maven-jobs' + - odl-maven-jobs - gerrit-tox-verify project: ovil diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 476b606f2..a87a43b98 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'ovsdb' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'ovsdb' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'ovsdb' diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 1b77e5f93..985d6b25e 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'p4plugin' diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index 5012648af..664380505 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -12,7 +12,9 @@ - 'packaging-test-rpm-master' - 'packaging-test-rpm-upgrade-master' - 'packaging-test-deb-master' - - gerrit-tox-verify + - gerrit-tox-verify: + branch: master + stream: master project: 'integration/packaging' diff --git a/jjb/packaging/test-rpm-deps.sh b/jjb/packaging/test-rpm-deps.sh index 6def490d0..460bdaeed 100644 --- a/jjb/packaging/test-rpm-deps.sh +++ b/jjb/packaging/test-rpm-deps.sh @@ -8,8 +8,12 @@ set -ex -o pipefail # Verify exactly 1 RPM is in the path we expect set -- /home/$USER/rpmbuild/RPMS/noarch/*.rpm -# shellcheck disable=SC1054 -[ $# -eq 1 ] || {{ echo "Expected 1 RPM, found $#"; exit 1; }} +if [ $# -eq 1 ]; then + echo "Found one RPM in build out dir, as expected" +else + echo "Expected 1 RPM, found $#" + echo 1 +fi # If path is globbed (/path/to/*.rpm), expand it path=$(sudo find / -wholename /home/$USER/rpmbuild/RPMS/noarch/*.rpm) diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index cbea081f8..afdf9373d 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'packetcable' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'packetcable' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'packetcable' diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index 0c0db87cf..d89c48f5b 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -3,7 +3,7 @@ name: persistence-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'persistence' @@ -30,7 +30,7 @@ name: persistence-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'persistence' @@ -57,7 +57,7 @@ name: persistence-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'persistence' diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index f6508f409..73c5ab5c3 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -4,15 +4,11 @@ jobs: - '{project-name}-ci-jobs': build-node: centos7-builder-2c-2g + build-timeout: 60 - builder-check-poms - builder-copy-sandbox-logs + - builder-openstack-cron - gerrit-tox-verify - # OpenStack Related - - 'builder-verify-image-protection' - - 'builder-cleanup-old-images' - - 'builder-delete-orphaned-nodes' - - 'builder-delete-stale-nodes' - - 'builder-delete-stale-stacks' # Automation for docs and jobs - 'builder-update-image-list' @@ -26,6 +22,9 @@ archive-artifacts: '**/*.log' build-timeout: 30 jjb-version: 2.0.0 + jenkins-urls: > + https://jenkins.opendaylight.org/releng + https://jenkins.opendaylight.org/sandbox - project: name: packer-jobs @@ -48,7 +47,7 @@ - devstack-pre-pip-newton: build-timeout: 75 - devstack-pre-pip-ocata: - build-timeout: 60 + build-timeout: 75 - devstack-pre-pip-pike: build-timeout: 75 - gbp @@ -162,73 +161,41 @@ - job-template: - name: 'builder-verify-image-protection' - project-type: freestyle - node: centos7-builder-2c-1g - - 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-scm: - branch: '{branch}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - # Listed after to override openstack-infra-wrappers clouds.yaml definition - - config-file-provider: - files: - - file-id: clouds-yaml - target: '$HOME/.config/openstack/clouds.yaml' - - triggers: - - timed: '@daily' - - builders: - - shell: !include-raw-escape: - - opendaylight-infra-check-image-protection.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - lf-infra-publish - - -- job-template: - name: 'builder-cleanup-old-images' + name: builder-openstack-cron project-type: freestyle - node: centos7-builder-2c-1g + node: '{build-node}' properties: - - opendaylight-infra-properties: + - lf-infra-properties: build-days-to-keep: 7 parameters: - - opendaylight-infra-parameters: - os-cloud: '{os-cloud}' + - lf-infra-parameters: project: '{project}' + stream: '{stream}' branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' + lftools-version: '{lftools-version}' + - string: + name: OS_CLOUD + default: '{os-cloud}' + description: Artifacts to archive to the logs server. + - string: + name: ARCHIVE_ARTIFACTS + default: '{archive-artifacts}' + description: Artifacts to archive to the logs server. + - string: + name: JENKINS_URLS + default: '{jenkins-urls}' + description: 'Space separated list of Jenkins URLs to check for active builds' scm: - git-scm: branch: '{branch}' wrappers: - - opendaylight-infra-wrappers: + - lf-infra-wrappers: build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' # Listed after to override openstack-infra-wrappers clouds.yaml definition - config-file-provider: files: @@ -236,136 +203,22 @@ target: '$HOME/.config/openstack/clouds.yaml' triggers: - # Cleanup images on a weekly schedule - - timed: '@weekly' - - builders: - - shell: !include-raw-escape: - - global-jjb/shell/lftools-install.sh - - opendaylight-infra-cleanup-old-images.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - lf-infra-publish - - -- job-template: - name: builder-delete-orphaned-nodes - project-type: freestyle - node: centos7-builder-2c-1g - - 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}' - - string: - name: JENKINS_URLS - default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox' - description: 'Space separated list of Jenkins URLs to check for active builds' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # Attempt to clear up servers every 30 mins in case we have orphaned servers - - timed: '0,30 * * * *' - - builders: - - shell: !include-raw-escape: opendaylight-infra-cleanup-orphaned-nodes.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - lf-infra-publish - - -- job-template: - name: 'builder-delete-stale-nodes' - project-type: freestyle - node: centos7-builder-2c-1g - - 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}' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # Attempt to clear up stacks every 30 mins in case we have orphaned stacks - - timed: '0,30 * * * *' - - builders: - - shell: !include-raw-escape: - - global-jjb/shell/lftools-install.sh - - opendaylight-infra-cleanup-stale-nodes.sh - - publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - - lf-infra-publish - - -- job-template: - name: 'builder-delete-stale-stacks' - project-type: freestyle - node: centos7-builder-2c-1g - - 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}' - - string: - name: JENKINS_URLS - default: 'https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox' - description: 'Space separated list of Jenkins URLs to check for active builds' - - wrappers: - - opendaylight-infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # Attempt to clear up stacks every 30 mins in case we have orphaned stacks - timed: '0,30 * * * *' builders: - - shell: !include-raw-escape: opendaylight-infra-cleanup-stale-stacks.sh + - odl-openstack-install + - shell: !include-raw-escape: global-jjb/shell/lftools-install.sh + # Servers + - odl-openstack-cleanup-stale-stacks + - odl-openstack-cleanup-stale-nodes + - odl-openstack-cleanup-orphaned-nodes + # Images + - odl-openstack-check-image-protection + - odl-openstack-cleanup-old-images publishers: - - email-notification: - email-recipients: '{email-recipients}' - email-prefix: '[releng]' - lf-infra-publish - - job-template: name: 'builder-update-image-list' project-type: freestyle diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 1a69611b4..016c65afb 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -282,6 +282,38 @@ send-to: - recipients + +- builder: + # Installs the openstack cli into a virtualenv at /tmp/v/openstack + name: odl-openstack-install + builders: + - shell: !include-raw: odl-openstack-install.sh + +- builder: + name: odl-openstack-check-image-protection + builders: + - shell: !include-raw: odl-openstack-check-image-protection.sh + +- builder: + name: odl-openstack-cleanup-old-images + builders: + - shell: !include-raw: odl-openstack-cleanup-old-images.sh + +- builder: + name: odl-openstack-cleanup-orphaned-nodes + builders: + - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh + +- builder: + name: odl-openstack-cleanup-stale-nodes + builders: + - shell: !include-raw: odl-openstack-cleanup-stale-nodes.sh + +- builder: + name: odl-openstack-cleanup-stale-stacks + builders: + - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh + - builder: # Deploys a maven site to Nexus using lftools nexus-zip command name: opendaylight-infra-deploy-maven-site diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index f64aa99f3..d697e548f 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -1,4 +1,21 @@ --- +- job-group: + name: odl-maven-jobs + + jobs: + - gerrit-maven-clm + + - gerrit-maven-merge: + post_build_trigger: + - project: + - 'distribution-merge-{stream}' + condition: SUCCESS + trigger-with-no-params: true + + - gerrit-maven-release + - gerrit-maven-verify + - gerrit-maven-verify-dependencies + - job-template: name: '{project-name}-integration-{stream}' diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index c551d402b..1e32c5d21 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -3,7 +3,7 @@ name: reservation-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'reservation' @@ -28,7 +28,7 @@ name: reservation-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'reservation' @@ -53,7 +53,7 @@ name: reservation-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'reservation' diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index 704e1c789..90d2d5aa5 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'sdninterfaceapp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'sdninterfaceapp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'sdninterfaceapp' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index 3da3c1efa..972f346a2 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'sfc' @@ -32,7 +32,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'sfc' @@ -59,7 +59,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'sfc' diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index 1b17aa4b3..6958d317b 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'snbi' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'snbi' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'snbi' diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 6cc6f8a1c..c73acb1be 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'snmp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'snmp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'snmp' diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index f435a1c6f..b29129035 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'snmp4sdn' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'snmp4sdn' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'snmp4sdn' diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index c7df74017..a74ba2d59 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'sxp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'sxp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'sxp' diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index b38ae2e4d..88514e606 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -3,7 +3,7 @@ name: systemmetrics-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'systemmetrics' project-name: 'systemmetrics' @@ -28,7 +28,7 @@ name: systemmetrics-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'systemmetrics' project-name: 'systemmetrics' @@ -53,7 +53,7 @@ name: systemmetrics-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'systemmetrics' project-name: 'systemmetrics' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 47974a495..6c78c55e2 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'topoprocessing' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'topoprocessing' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'topoprocessing' diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index bddccb90f..a905cf964 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -3,7 +3,7 @@ name: transportpce-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'transportpce' project-name: 'transportpce' @@ -28,7 +28,7 @@ name: transportpce-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'transportpce' project-name: 'transportpce' @@ -53,7 +53,7 @@ name: transportpce-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs project: 'transportpce' project-name: 'transportpce' diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index a0594e289..d1cae2d6a 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'tsdr' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'tsdr' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'tsdr' diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 3375a869b..41de1a0dd 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'ttp' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'ttp' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'ttp' diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index 8613b63ac..10f602889 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'unimgr' @@ -31,7 +31,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'unimgr' @@ -58,7 +58,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'unimgr' diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 7ab9c71b6..86b4017fe 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'usc' @@ -31,8 +31,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'usc' @@ -58,8 +58,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'usc' diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 43c14a22d..1efca00c4 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'usecplugin' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'usecplugin' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'usecplugin' diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml index 69abc18b2..844a26552 100644 --- a/jjb/vtn/vtn.yaml +++ b/jjb/vtn/vtn.yaml @@ -4,8 +4,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: oxygen project: 'vtn' @@ -35,8 +35,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'vtn' @@ -66,8 +66,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'vtn' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index 952f813c4..fc38e865b 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -4,7 +4,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'yang-push' @@ -30,7 +30,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'yang-push' @@ -56,7 +56,7 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'yang-push' diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index fbc83d824..cd0617c9c 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -3,7 +3,7 @@ name: yangide-oxygen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: oxygen project: 'yangide' @@ -28,7 +28,7 @@ name: yangide-nitrogen jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: nitrogen project: 'yangide' @@ -53,7 +53,7 @@ name: yangide-carbon jobs: - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' + - odl-maven-jobs stream: carbon project: 'yangide' diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 910746e5e..2a67a52d7 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -2,8 +2,8 @@ - project: name: yangtools-master jobs: - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs project: yangtools project-name: yangtools @@ -38,8 +38,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: nitrogen project: 'yangtools' @@ -74,8 +74,8 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' - - '{project-name}-maven-jobs' - '{project-name}-maven-javadoc-jobs' + - odl-maven-jobs stream: carbon project: 'yangtools' diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml index 81b102cb7..f4cbb5cdd 100644 --- a/openstack-hot/generic-server.yaml +++ b/openstack-hot/generic-server.yaml @@ -33,6 +33,12 @@ parameters: description: VM Image to spin up resources: + port: + type: "OS::Neutron::Port" + properties: + allowed_address_pairs: + - ip_address: 10.250.0.0/24 + network: odlci volume: type: "OS::Cinder::Volume" properties: @@ -58,7 +64,7 @@ resources: "GROUP": {get_param: group} "INDEX": {get_param: index} networks: - - network: odlci + - port: {get_resource: port} key_name: {get_param: ssh_key} user_data: | #!/bin/bash