From: Luis Gomez Date: Wed, 6 Jun 2018 14:58:48 +0000 (+0000) Subject: Merge "yaml file for bundle-based-reconciliaion script" X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=07568191388cf45a9525d473a9d59df7c177e78e;hp=ec9e17a65210345c1238281a2a0423adc214bb78;p=releng%2Fbuilder.git Merge "yaml file for bundle-based-reconciliaion script" --- diff --git a/docs/cloud-images.rst b/docs/cloud-images.rst index fccbc7851..777c983e0 100644 --- a/docs/cloud-images.rst +++ b/docs/cloud-images.rst @@ -10,6 +10,7 @@ Following are the list of published images available to be used with Jenkins job * ZZCI - CentOS 7 - docker - 20171209-0317 * ZZCI - CentOS 7 - docker - 20180109-0346 * ZZCI - CentOS 7 - docker - 20180110-1659 +* ZZCI - CentOS 7 - docker - 20180417-0311 * ZZCI - CentOS 7 - java-builder - 20171206-1842 * ZZCI - CentOS 7 - java-builder - 20171209-0032 * ZZCI - CentOS 7 - robot - 20171207-1911 diff --git a/docs/jenkins.rst b/docs/jenkins.rst index 6cb658583..25e5370f9 100644 --- a/docs/jenkins.rst +++ b/docs/jenkins.rst @@ -204,50 +204,38 @@ accounts in the cloud so should ensure consistent performance. - CPUs - Memory - * - v2-standard-1 + * - odl-standard-1 - 1 - 4 - * - v2-standard-2 + * - odl-standard-2 - 2 - 8 - * - v2-standard-4 + * - odl-standard-4 - 4 - 16 - * - v2-standard-8 + * - odl-standard-8 - 8 - 32 - * - v2-standard-16 + * - odl-standard-16 - 16 - 64 - * - v2-highcpu-1 - - 1 - - 1 - - * - v2-highcpu-2 + * - odl-highcpu-2 - 2 - 2 - * - v2-highcpu-4 + * - odl-highcpu-4 - 4 - 4 - * - v2-highcpu-8 + * - odl-highcpu-8 - 8 - 8 - * - v2-highcpu-16 - - 16 - - 16 - - * - v2-highcpu-32 - - 32 - - 32 - Pool: ODLVEX ^^^^^^^^^^^^ @@ -817,6 +805,12 @@ TODO: Document test-{project}-{feature} and test-{project}-all. cherry-pick 59/60259/17 and build netvirt, finally it will checkout latest distribution code and build a distribution. The resulting distribution is stored in Nexus and the URL is stored in a variable called BUNDLE_URL visible in the job console. + This job also accepts a gerrit topic, for example: multipatch-build:topic=binding-tlc-rpc, + in this case the job will find all patches in the topic binding-tlc-rpc for the projects + specified in the BUILD_ORDER parameter and will build all projects from the first a patch + has been found, for successive projects the branch HEAD is used if no patch is found. + The job uses patch numbers to sort patches in the same project. + Use multipatch-build-fast (vs multipatch-build) for building projects fast (-Pq). This job should not alter Gerrit votes for a given patch, nor will do anything with the given patch unless the patch is added to the build list. diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg index a1ba643e4..bbec5364d 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-autorelease-4c-16g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - autorelease - 20180125-2240 VOLUME_SIZE=150 -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=odl-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg index 4cedaefb0..e7d1fa489 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-2g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659 -HARDWARE_ID=v2-highcpu-2 +HARDWARE_ID=odl-highcpu-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg index 7be9c8b1e..4d2f3cfd8 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-2c-8g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659 -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=odl-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg index 94468159c..1c1936b1b 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-16g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659 -HARDWARE_ID=v2-standard-4 +HARDWARE_ID=odl-standard-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg index 637bea8b6..d7466e50d 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-4c-4g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180110-1659 -HARDWARE_ID=v2-highcpu-4 +HARDWARE_ID=odl-highcpu-4 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg index 928834709..385fdff34 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-builder-8c-8g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - CentOS 7 - builder - 20180201-2139 -HARDWARE_ID=v2-highcpu-8 +HARDWARE_ID=odl-highcpu-8 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg index 733c4038d..3f3b64e55 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-1c-4g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121 -HARDWARE_ID=v2-standard-1 +IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311 +HARDWARE_ID=odl-standard-1 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg index 0b3d3a9ec..459f6c593 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-2g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121 -HARDWARE_ID=v2-highcpu-2 +IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311 +HARDWARE_ID=odl-highcpu-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg index 89387d030..cbe2b2f69 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-docker-2c-8g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180314-2121 -HARDWARE_ID=v2-standard-2 +IMAGE_NAME=ZZCI - CentOS 7 - docker - 20180417-0311 +HARDWARE_ID=odl-standard-2 diff --git a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg index d695ad583..081ffad4d 100644 --- a/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/centos7-robot-2c-8g.cfg @@ -1,3 +1,3 @@ IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917 -HARDWARE_ID=v2-standard-2 +HARDWARE_ID=odl-standard-2 INSTANCE_CAP=25 diff --git a/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg new file mode 100644 index 000000000..d58f8cc87 --- /dev/null +++ b/jenkins-config/clouds/openstack/odlvex/queue-disttest-2c-1g.cfg @@ -0,0 +1,3 @@ +IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917 +HARDWARE_ID=v1-standard-1 +INSTANCE_CAP=1 diff --git a/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg new file mode 100644 index 000000000..2e79f1ff7 --- /dev/null +++ b/jenkins-config/clouds/openstack/odlvex/queue-intque-2c-1g.cfg @@ -0,0 +1,4 @@ +IMAGE_NAME=ZZCI - CentOS 7 - robot - 20180109-1917 +HARDWARE_ID=v1-standard-1 +INSTANCE_CAP=1 +NUM_EXECUTORS=4 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg index d1cd1c931..0b0475fd2 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-docker-2c-2g.cfg @@ -1,2 +1,2 @@ -IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180220-2018 -HARDWARE_ID=v2-highcpu-2 +IMAGE_NAME=ZZCI - Ubuntu 16.04 - docker - 20180501-1002 +HARDWARE_ID=odl-highcpu-2 diff --git a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg index 2747b97b6..bc1e0eed4 100644 --- a/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg +++ b/jenkins-config/clouds/openstack/odlvex/ubuntu1604-mininet-ovs-25-1c-4g.cfg @@ -1,2 +1,2 @@ IMAGE_NAME=ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 -HARDWARE_ID=v2-standard-1 +HARDWARE_ID=odl-standard-1 diff --git a/jenkins-scripts/jenkins-init-script.sh b/jenkins-scripts/jenkins-init-script.sh index e79228f33..3309b00ab 100755 --- a/jenkins-scripts/jenkins-init-script.sh +++ b/jenkins-scripts/jenkins-init-script.sh @@ -24,3 +24,9 @@ source /tmp/system_type.sh ## add local environment changes post scripts ./jenkins-init-script-local-env.sh + +# Create a swap file +dd if=/dev/zero of=/swap count=1024 bs=1MiB +chmod 600 /swap +mkswap /swap +swapon /swap diff --git a/jenkins-scripts/system_type.sh b/jenkins-scripts/system_type.sh index d021c0b4a..c5b141afd 100755 --- a/jenkins-scripts/system_type.sh +++ b/jenkins-scripts/system_type.sh @@ -18,6 +18,7 @@ for i in "java-builder,builder" \ "devstack,devstack" \ "docker,docker" \ "gbp,ubuntu-docker-ovs" \ + "kubernetes,mininet-ubuntu" \ "robot,robot" \ "mininet,mininet-ubuntu" do set -- $i diff --git a/jjb/aaa/aaa-csit-authn.yaml b/jjb/aaa/aaa-csit-authn.yaml index 1360004a5..36bdb6040 100644 --- a/jjb/aaa/aaa-csit-authn.yaml +++ b/jjb/aaa/aaa-csit-authn.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/aaa/aaa-csit-keystone.yaml b/jjb/aaa/aaa-csit-keystone.yaml index f4483c246..a3ca1d321 100644 --- a/jjb/aaa/aaa-csit-keystone.yaml +++ b/jjb/aaa/aaa-csit-keystone.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -31,8 +26,8 @@ install-features: 'odl-restconf-all' tools_system_count: '1' - tools_system_flavor: 'v2-highcpu-2' - tools_system_image: 'ZZCI - CentOS 7 - docker - 20171209-0317' + tools_system_flavor: 'odl-highcpu-2' + tools_system_image: 'ZZCI - CentOS 7 - docker - 20180417-0311' # Robot custom options robot-options: '' diff --git a/jjb/aaa/aaa-csit-tls.yaml b/jjb/aaa/aaa-csit-tls.yaml index c557db0bb..189501c35 100644 --- a/jjb/aaa/aaa-csit-tls.yaml +++ b/jjb/aaa/aaa-csit-tls.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/aaa/aaa-patch-test.yaml b/jjb/aaa/aaa-patch-test.yaml index d630199be..e0b3e50bc 100644 --- a/jjb/aaa/aaa-patch-test.yaml +++ b/jjb/aaa/aaa-patch-test.yaml @@ -4,20 +4,15 @@ jobs: - inttest-patch-test - # The project name project: 'aaa' - # Project branches stream: - fluorine: branch: 'master' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 + os-branch: 'queens' feature: - authn: @@ -27,3 +22,15 @@ - keystone: csit-list: > aaa-csit-1node-keystone-all-{stream} + + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} + + - cluster-netvirt: + csit-list: > + netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/aaa/aaa.yaml b/jjb/aaa/aaa.yaml index f4e71ff3d..1a60b2883 100644 --- a/jjb/aaa/aaa.yaml +++ b/jjb/aaa/aaa.yaml @@ -35,43 +35,6 @@ # Used by the release job staging-profile-id: 9318cf3c82c33 -- project: - name: aaa-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'aaa' - project-name: 'aaa' - branch: 'stable/nitrogen' - mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 9318cf3c82c33 - -- project: - name: aaa-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'aaa' - project-name: 'aaa' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'aaa-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[aaa] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 9318cf3c82c33 - - project: name: aaa-sonar jobs: diff --git a/jjb/alto/alto-csit-setup.yaml b/jjb/alto/alto-csit-setup.yaml index 14fbfd8d8..c0c1c0434 100644 --- a/jjb/alto/alto-csit-setup.yaml +++ b/jjb/alto/alto-csit-setup.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/alto/alto.yaml b/jjb/alto/alto.yaml index 7145b02a7..e1ad649ae 100644 --- a/jjb/alto/alto.yaml +++ b/jjb/alto/alto.yaml @@ -2,7 +2,6 @@ - project: name: alto-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: 931eabae9693c -- project: - name: alto-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'alto' - project-name: 'alto' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - - # Used by the release job - staging-profile-id: 931eabae9693c - -- project: - name: alto-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'alto' - project-name: 'alto' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'alto-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'l2switch-merge-{stream}' - email-upstream: '[alto] [l2switch]' - - # Used by the release job - staging-profile-id: 931eabae9693c - - project: name: alto-sonar jobs: diff --git a/jjb/archetypes/archetypes.yaml b/jjb/archetypes/archetypes.yaml index 657fa09c0..c31164de3 100644 --- a/jjb/archetypes/archetypes.yaml +++ b/jjb/archetypes/archetypes.yaml @@ -2,7 +2,15 @@ - project: name: archetypes-fluorine jobs: - - odl-maven-jobs + - gerrit-maven-clm + - '{project-name}-merge-{stream}': + build-timeout: 180 + cron: '@daily' + mvn-goals: clean install -V -Dmaven.compile.fork=true + - gerrit-maven-release + - gerrit-maven-verify + - gerrit-maven-verify-dependencies: + build-timeout: 180 stream: fluorine project: 'archetypes' diff --git a/jjb/atrium/atrium.yaml b/jjb/atrium/atrium.yaml index 34f659786..ca443e740 100644 --- a/jjb/atrium/atrium.yaml +++ b/jjb/atrium/atrium.yaml @@ -2,7 +2,6 @@ - project: name: atrium-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 9324f12310e6a -- project: - name: atrium-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'atrium' - project-name: 'atrium' - branch: 'stable/nitrogen' - mvn-settings: 'atrium-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[atrium]' - - # Used by the release job - staging-profile-id: 9324f12310e6a - -- project: - name: atrium-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'atrium' - project-name: 'atrium' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'atrium-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[atrium]' - - # Used by the release job - staging-profile-id: 9324f12310e6a - - project: name: atrium-sonar jobs: diff --git a/jjb/autorelease/autorelease-macros.yaml b/jjb/autorelease/autorelease-macros.yaml index 903332e80..e6bf110b6 100644 --- a/jjb/autorelease/autorelease-macros.yaml +++ b/jjb/autorelease/autorelease-macros.yaml @@ -56,10 +56,9 @@ virtualenv --system-site-packages $WORKSPACE/venv source $WORKSPACE/venv/bin/activate PYTHON="$WORKSPACE/venv/bin/python" - $PYTHON -m pip install --upgrade pip + $PYTHON -m pip install --upgrade "pip<10.0.0" setuptools $PYTHON -m pip install --upgrade networkx - $PYTHON -m pip install --upgrade pipdeptree - pipdeptree + $PYTHON -m pip freeze ./scripts/determine-merge-order.py deactivate rm -rf $WORKSPACE/venv @@ -146,6 +145,11 @@ - shell: !include-raw: - generate-release-notes.sh +- builder: + name: autorelease-update-project-views + builders: + - shell: !include-raw: update-autorelease-projects-views.sh + - builder: name: autorelease-update-validate-projects builders: diff --git a/jjb/autorelease/autorelease-projects.yaml b/jjb/autorelease/autorelease-projects.yaml index 80a133bfd..877dc08d1 100644 --- a/jjb/autorelease/autorelease-projects.yaml +++ b/jjb/autorelease/autorelease-projects.yaml @@ -12,30 +12,15 @@ - '{project-name}-validate-autorelease-{stream}' - gerrit-tox-verify - # todo: After Carbon EOL remove next-release-tag and directy pass - # '{stream}' to autorelease-release-tag parameter stream: - fluorine: - next-release-tag: '{stream}' branch: 'master' integration-test: fluorine extra-mvn-opts: -P!karaf -Dsft.heap.max=4g - oxygen: - next-release-tag: '{stream}' branch: 'stable/oxygen' integration-test: oxygen extra-mvn-opts: -P!karaf -Dsft.heap.max=4g - - nitrogen: - next-release-tag: '{stream}' - branch: 'stable/nitrogen' - integration-test: nitrogen - extra-mvn-opts: -P!karaf -Dsft.heap.max=4g - - carbon: - next-release-tag: '{stream}' - branch: 'stable/carbon' - integration-test: carbon - karaf-version: karaf3 - extra-mvn-opts: -P!karaf -Dskip.karaf4.featureTest=true project: releng/autorelease project-name: autorelease diff --git a/jjb/autorelease/autorelease-templates.yaml b/jjb/autorelease/autorelease-templates.yaml index e0733cb4f..37e7fdead 100644 --- a/jjb/autorelease/autorelease-templates.yaml +++ b/jjb/autorelease/autorelease-templates.yaml @@ -61,7 +61,7 @@ build-node: '{build-node}' cron: 'H 0 * * *' java-version: openjdk8 - mvn-version: mvn33 + mvn-version: mvn35 extra-mvn-opts: '' ##################### @@ -78,7 +78,7 @@ parameters: - maven-exec: - maven-version: 'mvn33' + maven-version: 'mvn35' - lf-infra-parameters: project: '{project}' stream: '{stream}' @@ -87,7 +87,7 @@ - distribution-karaf-version: karaf-version: '{karaf-version}' - autorelease-release-tag: - release-tag: '{next-release-tag}' + release-tag: '{stream}' - string: name: EXTRA_MVN_OPTS default: '{extra-mvn-opts}' @@ -146,12 +146,12 @@ # to enable building in a single maven reactor afterwards. - autorelease-fix-relative-paths - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn35' pom: 'pom.xml' goals: | clean deploy $EXTRA_MVN_OPTS - -Pintegrationtests,docs,repoBuild + -Pintegrationtests,repoBuild -Dcheckstyle.skip=true -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage {opendaylight-infra-mvn-opts} @@ -165,7 +165,7 @@ - autorelease-get-integration-test-variables - autorelease-maven-sources: opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}' - maven-version: 'mvn33' + maven-version: 'mvn35' settings: 'autorelease-settings' global-settings: 'global-settings' - autorelease-maven-sources-post-process @@ -183,13 +183,6 @@ - project: 'integration-distribution-test-{integration-test}' condition: FAILED trigger-with-no-params: true - - project: 'integration-sanity-test-{integration-test}' - condition: UNSTABLE_OR_BETTER - property-file: variables.jenkins-trigger - fail-on-missing: true - - project: 'integration-sanity-test-{integration-test}' - condition: FAILED - trigger-with-no-params: true - project: 'packaging-build-rpm-{stream}' condition: UNSTABLE_OR_BETTER predefined-parameters: DOWNLOAD_URL=$BUNDLE_URL @@ -271,12 +264,16 @@ jenkins-ssh-credential: opendaylight-jenkins-ssh builders: + - autorelease-update-project-views - autorelease-update-validate-projects - - opendaylight-infra-push-gerrit-patch: - project: 'releng/builder' + - lf-infra-push-gerrit-patch: + project: '{project}' + gerrit-user: 'jenkins-$SILO' + gerrit-host: 'git.opendaylight.org' gerrit-topic: 'autorelease-update-validate-jobs-{stream}' gerrit-commit-message: | - Update validate autorelease projects for {stream} + 'Update validate autorelease projects for {stream}' + reviewers-email: 'release@lists.opendaylight.org' publishers: - lf-infra-publish @@ -299,7 +296,7 @@ lftools-version: '{lftools-version}' - string: name: RELEASE_TAG - default: '{next-release-tag}' + default: '{stream}' description: | Release that is being version bumped. Eg. Lithium, Beryllium, Boron, Carbon, Carbon-SR1, Carbon-SR2... @@ -318,7 +315,7 @@ and artifacts are not pushed to Nexus. Instead the build will be performed using the goals "clean install". - maven-exec: - maven-version: mvn33 + maven-version: mvn35 scm: - lf-infra-gerrit-scm: @@ -337,7 +334,7 @@ builders: # force jenkins install of maven version before any shell scripts use it - maven-target: - maven-version: mvn33 + maven-version: mvn35 goals: '-version' settings: autorelease-settings settings-type: cfp @@ -488,7 +485,7 @@ # to enable building in a single maven reactor afterwards. - autorelease-fix-relative-paths - maven-target: - maven-version: mvn33 + maven-version: mvn35 pom: validate-pom.xml goals: | clean install dependency:tree @@ -504,7 +501,7 @@ # 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 || true - maven-target: - maven-version: mvn33 + maven-version: mvn35 pom: pom.xml goals: | clean validate diff --git a/jjb/autorelease/autorelease-version-management.yaml b/jjb/autorelease/autorelease-version-management.yaml index 88670afd9..5c5df61e9 100644 --- a/jjb/autorelease/autorelease-version-management.yaml +++ b/jjb/autorelease/autorelease-version-management.yaml @@ -15,7 +15,3 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' diff --git a/jjb/autorelease/compare-autorelease-projects.sh b/jjb/autorelease/compare-autorelease-projects.sh index dfcd933ff..0984d01f7 100644 --- a/jjb/autorelease/compare-autorelease-projects.sh +++ b/jjb/autorelease/compare-autorelease-projects.sh @@ -15,12 +15,6 @@ echo "---> compare-autorelease-projects.sh" # The purpose of this script is to compare list of projects in autorelease # are equal to the list of projects in integration/distribution. -# Note: int/dist pom files uses templates only since Oxygen release. -# Todo: Remove this check after Carbon and Nitrogen EOL -if [[ $STREAM =~ carbon ]] || [[ $STREAM =~ nitrogen ]]; then - exit 0 -fi - mapfile -t PROJECTS_INT_DIST < <(xmlstarlet sel\ -N "x=http://maven.apache.org/POM/4.0.0"\ -t -m "/x:project/x:profiles/x:profile[x:activation/x:activeByDefault='true']/x:dependencies/x:dependency/x:groupId"\ diff --git a/jjb/autorelease/prepare-release.sh b/jjb/autorelease/prepare-release.sh index ca3174cb5..b20b845fe 100644 --- a/jjb/autorelease/prepare-release.sh +++ b/jjb/autorelease/prepare-release.sh @@ -37,29 +37,15 @@ git submodule foreach "echo \$path \$(git rev-parse --verify HEAD) ${RELEASE_TAG | tee -a $PATCH_DIR/taglist.log" echo "$RELEASE_TAG" -# Remove this case statement when Carbon is no longer supported. -# Nitrogen onwards we do not want to use the release tag so simply need to -# strip xml files of -SNAPSHOT tags. -case "$RELEASE_TAG" in - Carbon*) - lftools version release "$RELEASE_TAG" - ;; - *) - find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//' - ;; -esac +find . -name "*.xml" -print0 | xargs -0 sed -i 's/-SNAPSHOT//' + git submodule foreach "git commit -am \"Release $RELEASE_TAG\" || true" git commit -am "Release $RELEASE_TAG" modules=$(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' pom.xml) for module in $modules; do pushd "$module" || exit - # TODO: Remove once stable/nitrogen is no longer supported. - if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then - git format-patch --stdout "origin/v1.2.x" > "$PATCH_DIR/${module//\//-}.patch" - else - git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch" - fi + git format-patch --stdout "origin/$GERRIT_BRANCH" > "$PATCH_DIR/${module//\//-}.patch" git bundle create "$PATCH_DIR/${module//\//-}.bundle" "origin/master..HEAD" popd || exit done diff --git a/jjb/autorelease/update-autorelease-projects-views.sh b/jjb/autorelease/update-autorelease-projects-views.sh new file mode 100755 index 000000000..87992153c --- /dev/null +++ b/jjb/autorelease/update-autorelease-projects-views.sh @@ -0,0 +1,60 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 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 +############################################################################## + +VIEWS_AR_YAML_FILE="${WORKSPACE}/jjb/autorelease/view-autorelease-${STREAM}.yaml" +BRANCH="stable/${STREAM}" + +# The current development release will not have a stable branch defined so if +# branch does not exist assume 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" + +# handle list of projects read from the pom.xml output as multiple lines. +mapfile -t modules < <(xmlstarlet sel -N x=http://maven.apache.org/POM/4.0.0 -t -m '//x:modules' -v '//x:module' /tmp/pom.xml) + +cat > "$VIEWS_AR_YAML_FILE" << EOF +--- +# Autogenerated view by autorelease autorelease-update-validate-jobs-{stream} Jenkins job +- releng_view: &releng_autorelease_view_common_${STREAM} + name: releng-view-autorelease-${STREAM} + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + recurse: false + +- view: + name: Merge-${STREAM^} + description: 'List of ${STREAM^} Merge jobs for Autorelease' + job-name: +EOF + +for module in "${modules[@]}"; do + echo "Include project:$module to autorelease view" + echo " - '$module-maven-merge-${STREAM}'" >> "$VIEWS_AR_YAML_FILE" +done +echo " <<: *releng_autorelease_view_common_${STREAM}" >> "$VIEWS_AR_YAML_FILE" + +git add "${VIEWS_AR_YAML_FILE}" + +cp "${VIEWS_AR_YAML_FILE}" $WORKSPACE/archives diff --git a/jjb/autorelease/validate-autorelease-carbon.yaml b/jjb/autorelease/validate-autorelease-carbon.yaml deleted file mode 100644 index c4647d868..000000000 --- a/jjb/autorelease/validate-autorelease-carbon.yaml +++ /dev/null @@ -1,101 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-carbon - jobs: - - '{project-name}-validate-autorelease-{stream}' - stream: carbon - branch: stable/carbon - project-name: - - aaa: - project: aaa - - alto: - project: alto - - bgpcep: - project: bgpcep - - bier: - project: bier - - cardinal: - project: cardinal - - controller: - project: controller - - didm: - project: didm - - dlux: - project: dlux - - dluxapps: - project: dluxapps - - eman: - project: eman - - faas: - project: faas - - federation: - project: federation - - genius: - project: genius - - groupbasedpolicy: - project: groupbasedpolicy - - honeycomb-vbd: - project: honeycomb/vbd - - infrautils: - project: infrautils - - integration-distribution: - project: integration/distribution - - iotdm: - project: iotdm - - l2switch: - project: l2switch - - lacp: - project: lacp - - lispflowmapping: - project: lispflowmapping - - mdsal: - project: mdsal - - nemo: - project: nemo - - netconf: - project: netconf - - netide: - project: netide - - netvirt: - project: netvirt - - neutron: - project: neutron - - nic: - project: nic - - ocpplugin: - project: ocpplugin - - odlparent: - project: odlparent - - of-config: - project: of-config - - openflowjava: - project: openflowjava - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - packetcable: - project: packetcable - - sdninterfaceapp: - project: sdninterfaceapp - - sfc: - project: sfc - - snmp: - project: snmp - - snmp4sdn: - project: snmp4sdn - - sxp: - project: sxp - - topoprocessing: - project: topoprocessing - - tsdr: - project: tsdr - - ttp: - project: ttp - - unimgr: - project: unimgr - - usc: - project: usc - - yangtools: - project: yangtools diff --git a/jjb/autorelease/validate-autorelease-nitrogen.yaml b/jjb/autorelease/validate-autorelease-nitrogen.yaml deleted file mode 100644 index b388684d9..000000000 --- a/jjb/autorelease/validate-autorelease-nitrogen.yaml +++ /dev/null @@ -1,87 +0,0 @@ ---- -# Autogenerated by autorelease autorelease-update-validate-autorelease-jobs-{stream} Jenkins job -- project: - name: autorelease-validate-nitrogen - jobs: - - '{project-name}-validate-autorelease-{stream}' - stream: nitrogen - branch: stable/nitrogen - project-name: - - aaa: - project: aaa - - alto: - project: alto - - bgpcep: - project: bgpcep - - bier: - project: bier - - cardinal: - project: cardinal - - controller: - project: controller - - coe: - project: coe - - daexim: - project: daexim - - dlux: - project: dlux - - dluxapps: - project: dluxapps - - eman: - project: eman - - faas: - project: faas - - genius: - project: genius - - groupbasedpolicy: - project: groupbasedpolicy - - honeycomb-vbd: - project: honeycomb/vbd - - infrautils: - project: infrautils - - integration-distribution: - project: integration/distribution - - l2switch: - project: l2switch - - lispflowmapping: - project: lispflowmapping - - mdsal: - project: mdsal - - nemo: - project: nemo - - netconf: - project: netconf - - netvirt: - project: netvirt - - neutron: - project: neutron - - nic: - project: nic - - ocpplugin: - project: ocpplugin - - of-config: - project: of-config - - openflowplugin: - project: openflowplugin - - ovsdb: - project: ovsdb - - packetcable: - project: packetcable - - sfc: - project: sfc - - snmp: - project: snmp - - snmp4sdn: - project: snmp4sdn - - sxp: - project: sxp - - topoprocessing: - project: topoprocessing - - ttp: - project: ttp - - unimgr: - project: unimgr - - usc: - project: usc - - yangtools: - project: yangtools diff --git a/jjb/autorelease/version-bump.sh b/jjb/autorelease/version-bump.sh index 54bd1203f..d48b49070 100644 --- a/jjb/autorelease/version-bump.sh +++ b/jjb/autorelease/version-bump.sh @@ -35,15 +35,10 @@ fi if [ "$BRANCH_CUT" = "false" ]; then git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}" - # TODO: Simplify once stable/nitrogen is no longer supported. for module in $(git submodule | awk '{ print $2 }') do pushd "$module" - if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then - git checkout -b "v1.2.x" "origin/v1.2.x" - else - git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}" - fi + git checkout -b "${BRANCH,,}" "origin/${BRANCH,,}" popd done fi @@ -73,14 +68,8 @@ mkdir -p "$patch_dir" for module in $(git submodule | awk '{ print $2 }') do pushd "$module" - # TODO: Remove once stable/nitrogen is no longer supported. - if [ "$GERRIT_BRANCH" == "stable/nitrogen" ] && [ "$module" == "yangtools" ]; then - git format-patch --stdout "origin/v1.2.x" > "$patch_dir/${module//\//-}.patch" - git bundle create "$patch_dir/${module//\//-}.bundle" "origin/v1.2.x..HEAD" - else - git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch" - git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD" - fi + git format-patch --stdout "origin/${BRANCH,,}" > "$patch_dir/${module//\//-}.patch" + git bundle create "$patch_dir/${module//\//-}.bundle" "origin/${BRANCH,,}..HEAD" popd done diff --git a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml index 763c5b6bf..e71dd3e0f 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-gate-ingest-mixed.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -46,7 +41,7 @@ -v TEST_DURATION_MULTIPLIER:4 # Controller configuration - odl_system_flavor: v2-standard-4 + odl_system_flavor: odl-standard-4 # Plot Info 01-plot-title: 'Number of generated updates' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml index 16976ff6a..da0f2ffb0 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest-mixed.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgp-ingest-mixed jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality. # The project name @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -39,7 +34,7 @@ # environment or more complex scenario is chosen robot-options: > -v USE_NETCONF_CONNECTOR:False - -v COUNT:1000000 + -v COUNT:500000 -v INSERT:10 -v WITHDRAW:9 -v PREFILL:10 @@ -47,7 +42,7 @@ -v TEST_DURATION_MULTIPLIER:4 # Controller configuration - odl_system_flavor: v2-standard-2 + odl_system_flavor: odl-standard-2 # Plot Info 01-plot-title: 'Number of generated updates' diff --git a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml index b61c1b819..ca9fa8ce9 100644 --- a/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgp-ingest.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgp-ingest jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # FIXME: Dicument differences from -mixed- and unify into single (matrix) definition. # The project name @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -38,14 +33,13 @@ # Robot custom options: robot-options: > -v USE_NETCONF_CONNECTOR:False - -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:10 - -v REPETITIONS_CHANGE_COUNT_SINGLE:3 - -v CHECK_PERIOD_PREFIX_COUNT_MANY:10 + -v CHECK_PERIOD_PREFIX_COUNT_SINGLE:60 + -v REPETITIONS_CHANGE_COUNT_SINGLE:1 + -v CHECK_PERIOD_PREFIX_COUNT_MANY:60 -v TEST_DURATION_MULTIPLIER_PREFIX_COUNT_MANY:8.0 - -v REPETITIONS_CHANGE_COUNT_MANY:10 - -v MULTIPLICITY_CHANGE_COUNT_MANY:600 + -v REPETITIONS_CHANGE_COUNT_MANY:1 + -v MULTIPLICITY_CHANGE_COUNT_MANY:10 -v TEST_DURATION_MULTIPLIER_CHANGE_COUNT_MANY:8.0 # Controller configuration - odl_system_flavor: v2-standard-4 - + odl_system_flavor: odl-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml index 752100734..feca52dad 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-ha.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgpclustering-ha jobs: - - inttest-csit-3node-periodic + - inttest-csit-3node # The project name project: 'bgpcep' @@ -30,19 +30,6 @@ odl-bgpcep-bmp, odl-bgpcep-bmp-config-example, odl-bgpcep-pcep - - nitrogen: - branch: 'stable/nitrogen' - install-features: > - odl-restconf, - odl-bgpcep-bgp, - odl-bgpcep-bgp-config-example - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: > - odl-restconf, - odl-bgpcep-bgp, - odl-bgpcep-bgp-config-example install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml index ee8e9d37a..4c19390a4 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering-longevity.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml index 96f954631..dd72b0f53 100644 --- a/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml +++ b/jjb/bgpcep/bgpcep-csit-bgpclustering.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-bgpclustering jobs: - - inttest-csit-3node-periodic + - inttest-csit-3node # The project name project: 'bgpcep' @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -36,4 +31,4 @@ robot-options: '-v USE_NETCONF_CONNECTOR:False' # Controller configuration - odl_system_flavor: 'v2-standard-4' + odl_system_flavor: 'odl-standard-4' diff --git a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml index 3e7b71c86..b902204cc 100644 --- a/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-gate-throughpcep.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -40,4 +35,4 @@ -v UPDATER_TIMEOUT:600 # Controller configuration - odl_system_flavor: v2-standard-4 + odl_system_flavor: odl-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml index 39e095829..0874aa7d6 100644 --- a/jjb/bgpcep/bgpcep-csit-throughpcep.yaml +++ b/jjb/bgpcep/bgpcep-csit-throughpcep.yaml @@ -2,7 +2,7 @@ - project: name: bgpcep-csit-throughpcep jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # FIXME: Rename job to drop -periodic- and unify job definition with -gate- functionality. # The project name @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -36,9 +31,9 @@ # Robot custom options: robot-options: > -v USE_NETCONF_CONNECTOR:False - -v PCEP_READY_VERIFY_TIMEOUT:5 + -v PCEP_READY_VERIFY_TIMEOUT:180 -v RESTCONF_REUSE:False -v UPDATER_TIMEOUT:900 # Controller configuration - odl_system_flavor: v2-standard-4 + odl_system_flavor: odl-standard-4 diff --git a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml index a0316bfed..98542632c 100644 --- a/jjb/bgpcep/bgpcep-csit-userfeatures.yaml +++ b/jjb/bgpcep/bgpcep-csit-userfeatures.yaml @@ -19,11 +19,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/bgpcep/bgpcep-patch-test.yaml b/jjb/bgpcep/bgpcep-patch-test.yaml index f1e6f274a..f1e2b7a4a 100644 --- a/jjb/bgpcep/bgpcep-patch-test.yaml +++ b/jjb/bgpcep/bgpcep-patch-test.yaml @@ -13,11 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - bgp: diff --git a/jjb/bgpcep/bgpcep.yaml b/jjb/bgpcep/bgpcep.yaml index a05817ddb..bc4f4e1ea 100644 --- a/jjb/bgpcep/bgpcep.yaml +++ b/jjb/bgpcep/bgpcep.yaml @@ -51,59 +51,6 @@ # Used by the release job staging-profile-id: 9427a05049030 -- project: - name: bgpcep-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 'stable/nitrogen' - mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - tcpmd5-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - - # Used by the release job - staging-profile-id: 9427a05049030 - -- project: - name: bgpcep-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'bgpcep' - project-name: 'bgpcep' - build-node: centos7-builder-8c-8g - build-timeout: 120 - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'bgpcep-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - mdsal-merge-{stream}, - tcpmd5-merge-{stream} - email-upstream: '[bgpcep] [odlparent] [yangtools] [controller] [mdsal] [tcpmd5]' - - # Used by the release job - staging-profile-id: 9427a05049030 - - project: name: bgpcep-sonar jobs: diff --git a/jjb/bier/bier-csit-basic.yaml b/jjb/bier/bier-csit-basic.yaml index afeed6b87..67dcb5c01 100644 --- a/jjb/bier/bier-csit-basic.yaml +++ b/jjb/bier/bier-csit-basic.yaml @@ -13,22 +13,13 @@ # Project branches stream: - # Removed jobs testing Carbon branches due to the CSIT update - # incompatible changes in test suites for Nitrogen - # TODO: Create test suites for specific release before - # Nitrogen if needed. - fluorine: branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' - verify-stream: 'nitrogen' - verify-branch: 'stable/nitrogen' + verify-stream: 'oxygen' + verify-branch: 'stable/oxygen' verify-karaf-version: 'karaf4' install: diff --git a/jjb/bier/bier.yaml b/jjb/bier/bier.yaml index be6163729..c3e51500a 100644 --- a/jjb/bier/bier.yaml +++ b/jjb/bier/bier.yaml @@ -2,7 +2,6 @@ - project: name: bier-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -39,45 +38,6 @@ # Used by the release job staging-profile-id: 942a8075b1f2a -- project: - name: bier-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'bier' - project-name: 'bier' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[bier]' - - # Used by the release job - staging-profile-id: 942a8075b1f2a - -- project: - name: bier-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'bier' - project-name: 'bier' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'bier-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[bier]' - - # Used by the release job - staging-profile-id: 942a8075b1f2a - - project: name: bier-sonar jobs: diff --git a/jjb/capwap/capwap-csit-ac.yaml b/jjb/capwap/capwap-csit-ac.yaml index 023718a5c..1ed2c5d6c 100644 --- a/jjb/capwap/capwap-csit-ac.yaml +++ b/jjb/capwap/capwap-csit-ac.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/capwap/capwap.yaml b/jjb/capwap/capwap.yaml index 6836282e6..ed7c55974 100644 --- a/jjb/capwap/capwap.yaml +++ b/jjb/capwap/capwap.yaml @@ -2,7 +2,6 @@ - project: name: capwap-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96bd6b5bf86e3 -- project: - name: capwap-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'capwap' - project-name: 'capwap' - branch: 'stable/nitrogen' - mvn-settings: 'capwap-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[capwap]' - - # Used by the release job - staging-profile-id: 96bd6b5bf86e3 - -- project: - name: capwap-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'capwap' - project-name: 'capwap' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'capwap-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[capwap]' - - # Used by the release job - staging-profile-id: 96bd6b5bf86e3 - - project: name: capwap jobs: diff --git a/jjb/cardinal/cardinal.yaml b/jjb/cardinal/cardinal.yaml index 58b826da0..00397abdd 100644 --- a/jjb/cardinal/cardinal.yaml +++ b/jjb/cardinal/cardinal.yaml @@ -2,7 +2,6 @@ - project: name: cardinal-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96be20348f0f2 -- project: - name: cardinal-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'cardinal' - project-name: 'cardinal' - branch: 'stable/nitrogen' - mvn-settings: 'cardinal-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' - email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - - # Used by the release job - staging-profile-id: 96be20348f0f2 - -- project: - name: cardinal-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'cardinal' - project-name: 'cardinal' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'cardinal-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream},iotdm-merge-{stream},sfc-merge-{stream}' - email-upstream: '[cardinal] [openflowplugin] [iotdm] [sfc]' - - # Used by the release job - staging-profile-id: 96be20348f0f2 - - project: name: cardinal-sonar jobs: diff --git a/jjb/centinel/centinel-csit-basic.yaml b/jjb/centinel/centinel-csit-basic.yaml index 7a4a45f52..47ba93e77 100644 --- a/jjb/centinel/centinel-csit-basic.yaml +++ b/jjb/centinel/centinel-csit-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/centinel/centinel.yaml b/jjb/centinel/centinel.yaml index e65f791a3..53da8f640 100644 --- a/jjb/centinel/centinel.yaml +++ b/jjb/centinel/centinel.yaml @@ -2,7 +2,6 @@ - project: name: centinel-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96bf9b3fefd8a -- project: - name: centinel-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'centinel' - project-name: 'centinel' - branch: 'stable/nitrogen' - mvn-settings: 'centinel-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[centinel]' - - # Used by the release job - staging-profile-id: 96bf9b3fefd8a - -- project: - name: centinel-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'centinel' - project-name: 'centinel' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'centinel-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[centinel]' - - # Used by the release job - staging-profile-id: 96bf9b3fefd8a - - project: name: centinel-sonar jobs: diff --git a/jjb/coe/coe.yaml b/jjb/coe/coe.yaml index 117d2be80..e4ddeea1c 100644 --- a/jjb/coe/coe.yaml +++ b/jjb/coe/coe.yaml @@ -3,6 +3,11 @@ name: coe-fluorine jobs: - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: coe + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/ + rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155 - odl-maven-jobs project: 'coe' @@ -22,6 +27,11 @@ name: coe-oxygen jobs: - '{project-name}-distribution-check-{stream}' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: coe + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-coe/34924/ + rtd-token: 95a5a8fed43b75c6be8432a2643f20a344ba5155 - odl-maven-jobs project: 'coe' @@ -37,42 +47,6 @@ # Used by the release job staging-profile-id: 96c0be46aac33 -- project: - name: coe-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'coe' - project-name: 'coe' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[coe] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96c0be46aac33 - -- project: - name: coe-carbon - jobs: - - odl-maven-jobs - - project: 'coe' - project-name: 'coe' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'coe-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[coe] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96c0be46aac33 - - project: name: coe-sonar jobs: diff --git a/jjb/controller/controller-csit-akka1.yaml b/jjb/controller/controller-csit-akka1.yaml index eb580fda5..e3488469e 100644 --- a/jjb/controller/controller-csit-akka1.yaml +++ b/jjb/controller/controller-csit-akka1.yaml @@ -15,11 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-clustering.yaml b/jjb/controller/controller-csit-clustering.yaml index 23ffa331c..56ab3272c 100644 --- a/jjb/controller/controller-csit-clustering.yaml +++ b/jjb/controller/controller-csit-clustering.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-cs-chasing-leader.yaml b/jjb/controller/controller-csit-cs-chasing-leader.yaml index a6bd7ac4d..b8cc17ed8 100644 --- a/jjb/controller/controller-csit-cs-chasing-leader.yaml +++ b/jjb/controller/controller-csit-cs-chasing-leader.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-cs-partnheal.yaml b/jjb/controller/controller-csit-cs-partnheal.yaml index a5130abf9..14b1725da 100644 --- a/jjb/controller/controller-csit-cs-partnheal.yaml +++ b/jjb/controller/controller-csit-cs-partnheal.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml index 88a8e0c12..33c84f632 100644 --- a/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml +++ b/jjb/controller/controller-csit-ddb-expl-lead-movement.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-dnb-noloss.yaml b/jjb/controller/controller-csit-dnb-noloss.yaml index a95fdb06c..f0b6362b9 100644 --- a/jjb/controller/controller-csit-dnb-noloss.yaml +++ b/jjb/controller/controller-csit-dnb-noloss.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-partnheal.yaml b/jjb/controller/controller-csit-drb-partnheal.yaml index 1743f1b1a..8cad5fe09 100644 --- a/jjb/controller/controller-csit-drb-partnheal.yaml +++ b/jjb/controller/controller-csit-drb-partnheal.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-drb-precedence.yaml b/jjb/controller/controller-csit-drb-precedence.yaml index e79ebef99..742d2b90f 100644 --- a/jjb/controller/controller-csit-drb-precedence.yaml +++ b/jjb/controller/controller-csit-drb-precedence.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml similarity index 98% rename from jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml rename to jjb/controller/controller-csit-dsbenchmark-cluster.yaml index 43a9f55b8..472c2fa75 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark-cluster.yaml +++ b/jjb/controller/controller-csit-dsbenchmark-cluster.yaml @@ -1,8 +1,8 @@ --- - project: - name: mdsal-csit-periodic-dsbenchmark-cluster + name: mdsal-csit-dsbenchmark-cluster jobs: - - inttest-csit-3node-periodic + - inttest-csit-3node # The project name project: 'controller' @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -36,7 +31,7 @@ # ODL system image to use # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough. - odl_system_flavor: 'v2-standard-4' + odl_system_flavor: 'odl-standard-4' build-timeout: '480' diff --git a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml b/jjb/controller/controller-csit-dsbenchmark.yaml similarity index 96% rename from jjb/controller/controller-csit-periodic-dsbenchmark.yaml rename to jjb/controller/controller-csit-dsbenchmark.yaml index 25f583679..3c8973cb1 100644 --- a/jjb/controller/controller-csit-periodic-dsbenchmark.yaml +++ b/jjb/controller/controller-csit-dsbenchmark.yaml @@ -1,8 +1,8 @@ --- - project: - name: mdsal-csit-periodic-dsbenchmark + name: mdsal-csit-dsbenchmark jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # The project name project: 'controller' @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -37,7 +32,7 @@ # ODL system image to use # The job uses scriptplan to set heap to 4GB, so 4GB RAM is not enough. - odl_system_flavor: v2-standard-4 + odl_system_flavor: odl-standard-4 # Plot Info 01-plot-title: 'Performance by structure' diff --git a/jjb/controller/controller-csit-rest-cars-perf.yaml b/jjb/controller/controller-csit-rest-cars-perf.yaml index 0c2b0fdfd..82196035c 100644 --- a/jjb/controller/controller-csit-rest-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-cars-perf.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml index 6cf7ecfea..80b54ae4c 100644 --- a/jjb/controller/controller-csit-rest-clust-cars-perf.yaml +++ b/jjb/controller/controller-csit-rest-clust-cars-perf.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/controller/controller-patch-test.yaml b/jjb/controller/controller-patch-test.yaml new file mode 100644 index 000000000..8bf365966 --- /dev/null +++ b/jjb/controller/controller-patch-test.yaml @@ -0,0 +1,30 @@ +--- +- project: + name: controller-patch-test + jobs: + - inttest-patch-test + + project: 'controller' + + stream: + - fluorine: + branch: 'master' + os-branch: 'queens' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'queens' + + jdk: 'openjdk8' + + feature: + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} + + - cluster-netvirt: + csit-list: > + netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/controller/controller.yaml b/jjb/controller/controller.yaml index 025a9e9a7..d6fc7143a 100644 --- a/jjb/controller/controller.yaml +++ b/jjb/controller/controller.yaml @@ -43,49 +43,6 @@ # Used by the release job staging-profile-id: 96c1c9177efdd -- project: - name: controller-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'controller' - project-name: 'controller' - branch: 'stable/nitrogen' - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - -- project: - name: controller-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'controller' - project-name: 'controller' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'controller-settings' - mvn-goals: 'clean deploy -Pintegrationtests,docs' - mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - build-node: centos7-builder-8c-8g - build-timeout: 90 - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},aaa-merge-{stream}' - email-upstream: '[controller] [odlparent] [yangtools] [aaa]' - - # Used by the release job - staging-profile-id: 96c1c9177efdd - - project: name: controller-sonar jobs: diff --git a/jjb/coretutorials/coretutorials.yaml b/jjb/coretutorials/coretutorials.yaml index 67d5754d2..7c6b90717 100644 --- a/jjb/coretutorials/coretutorials.yaml +++ b/jjb/coretutorials/coretutorials.yaml @@ -35,43 +35,6 @@ # Used by the release job staging-profile-id: 96cd299563ec6 -- project: - name: coretutorials-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/nitrogen' - mvn-settings: 'coretutorials-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[coretutorials]' - build-timeout: 120 - - # Used by the release job - staging-profile-id: 96cd299563ec6 - -- project: - name: coretutorials-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'coretutorials' - project-name: 'coretutorials' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'coretutorials-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[coretutorials]' - build-timeout: 120 - - # Used by the release job - staging-profile-id: 96cd299563ec6 - - project: name: coretutorials-sonar jobs: diff --git a/jjb/daexim/daexim-csit-basic.yaml b/jjb/daexim/daexim-csit-basic.yaml index 083be0a88..1324d4df2 100644 --- a/jjb/daexim/daexim-csit-basic.yaml +++ b/jjb/daexim/daexim-csit-basic.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/daexim/daexim-csit-clustering-basic.yaml b/jjb/daexim/daexim-csit-clustering-basic.yaml index 08da6af2c..b34bcd5c4 100644 --- a/jjb/daexim/daexim-csit-clustering-basic.yaml +++ b/jjb/daexim/daexim-csit-clustering-basic.yaml @@ -16,8 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' install: - only: diff --git a/jjb/daexim/daexim.yaml b/jjb/daexim/daexim.yaml index 5fb3dd0d2..cb3eec201 100644 --- a/jjb/daexim/daexim.yaml +++ b/jjb/daexim/daexim.yaml @@ -35,24 +35,6 @@ # Used by the release job staging-profile-id: 96e4dade34bd7 -- project: - name: daexim-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'daexim' - project-name: 'daexim' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'daexim-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[daexim] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e4dade34bd7 - - project: name: daexim-sonar jobs: diff --git a/jjb/didm/didm-csit-discovery.yaml b/jjb/didm/didm-csit-discovery.yaml index 4732b9b1c..b1e4b2014 100644 --- a/jjb/didm/didm-csit-discovery.yaml +++ b/jjb/didm/didm-csit-discovery.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/didm/didm.yaml b/jjb/didm/didm.yaml index a9a6be7d4..ff620ae1f 100644 --- a/jjb/didm/didm.yaml +++ b/jjb/didm/didm.yaml @@ -2,7 +2,6 @@ - project: name: didm-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96e6338c870f5 -- project: - name: didm-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'didm' - project-name: 'didm' - branch: 'stable/nitrogen' - mvn-settings: 'didm-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[didm]' - - # Used by the release job - staging-profile-id: 96e6338c870f5 - -- project: - name: didm-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'didm' - project-name: 'didm' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'didm-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[didm]' - - # Used by the release job - staging-profile-id: 96e6338c870f5 - - project: name: didm-sonar jobs: diff --git a/jjb/dlux/dlux.yaml b/jjb/dlux/dlux.yaml index 7f52f5c62..7c799b44a 100644 --- a/jjb/dlux/dlux.yaml +++ b/jjb/dlux/dlux.yaml @@ -2,7 +2,6 @@ - project: name: dlux-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96e6a0327484f -- project: - name: dlux-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'dlux' - project-name: 'dlux' - branch: 'stable/nitrogen' - mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - - # Used by the release job - staging-profile-id: 96e6a0327484f - -- project: - name: dlux-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'dlux' - project-name: 'dlux' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'dlux-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[dlux] [odlparent]' - - # Used by the release job - staging-profile-id: 96e6a0327484f - - project: name: dlux-sonar jobs: diff --git a/jjb/dluxapps/dluxapps-csit-yangman.yaml b/jjb/dluxapps/dluxapps-csit-yangman.yaml index b0c568b21..46f7ae503 100644 --- a/jjb/dluxapps/dluxapps-csit-yangman.yaml +++ b/jjb/dluxapps/dluxapps-csit-yangman.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/dluxapps/dluxapps.yaml b/jjb/dluxapps/dluxapps.yaml index 6cd7760b2..ca850310b 100644 --- a/jjb/dluxapps/dluxapps.yaml +++ b/jjb/dluxapps/dluxapps.yaml @@ -2,7 +2,6 @@ - project: name: dluxapps-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs project: 'dluxapps' @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: 96e6fb1e65bf9 -- project: - name: dluxapps-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'dluxapps' - project-name: 'dluxapps' - stream: nitrogen - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e6fb1e65bf9 - -- project: - name: dluxapps-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - project: 'dluxapps' - project-name: 'dluxapps' - stream: carbon - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'dluxapps-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[dluxapps] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96e6fb1e65bf9 - - project: name: dluxapps-sonar jobs: diff --git a/jjb/docs/docs-rtd.yaml b/jjb/docs/docs-rtd.yaml index d61663171..ac1419706 100644 --- a/jjb/docs/docs-rtd.yaml +++ b/jjb/docs/docs-rtd.yaml @@ -10,13 +10,10 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' project: docs project-name: docs build-node: centos7-builder-4c-4g build-timeout: 60 - rtd-project: opendaylight + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/ + rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c diff --git a/jjb/eman/eman.yaml b/jjb/eman/eman.yaml index 36e06e98a..3a3271a10 100644 --- a/jjb/eman/eman.yaml +++ b/jjb/eman/eman.yaml @@ -2,7 +2,6 @@ - project: name: eman-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -39,47 +38,6 @@ # Used by the release job staging-profile-id: 96e9352979521 -- project: - name: eman-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'eman' - project-name: 'eman' - branch: 'stable/nitrogen' - mvn-settings: 'eman-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[eman]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: 96e9352979521 - -- project: - name: eman-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'eman' - project-name: 'eman' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'eman-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[eman]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: 96e9352979521 - - project: name: eman-sonar jobs: diff --git a/jjb/faas/faas.yaml b/jjb/faas/faas.yaml index 08ec7ea29..ea767f6e9 100644 --- a/jjb/faas/faas.yaml +++ b/jjb/faas/faas.yaml @@ -2,7 +2,6 @@ - project: name: faas-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96f5ac591d858 -- project: - name: faas-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'faas' - project-name: 'faas' - branch: 'stable/nitrogen' - mvn-settings: 'faas-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[faas]' - - # Used by the release job - staging-profile-id: 96f5ac591d858 - -- project: - name: faas-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'faas' - project-name: 'faas' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'faas-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[faas]' - - # Used by the release job - staging-profile-id: 96f5ac591d858 - - project: name: faas-sonar jobs: diff --git a/jjb/federation/federation.yaml b/jjb/federation/federation.yaml index 428f14b0d..d08bc6a46 100644 --- a/jjb/federation/federation.yaml +++ b/jjb/federation/federation.yaml @@ -2,7 +2,6 @@ - project: name: federation-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: 96f78c7a40a24 -- project: - name: federation-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - project: 'federation' - project-name: 'federation' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'federation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[federation] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96f78c7a40a24 - -- project: - name: federation-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - project: 'federation' - project-name: 'federation' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'federation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[federation] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: 96f78c7a40a24 - - project: name: federation-sonar jobs: diff --git a/jjb/generate-csit-status-report.sh b/jjb/generate-csit-status-report.sh index 02cdf5b9c..83d5c9ea3 100644 --- a/jjb/generate-csit-status-report.sh +++ b/jjb/generate-csit-status-report.sh @@ -57,7 +57,7 @@ EOF virtualenv --quiet "/tmp/v/jenkins" # shellcheck source=/tmp/v/jenkins/bin/activate disable=SC1091 source "/tmp/v/jenkins/bin/activate" -pip install --quiet --upgrade pip +pip install --quiet --upgrade "pip<10.0.0" setuptools pip install --quiet --upgrade tox beautifulsoup4 requests echo python "$script" "$BUILD_URL" diff --git a/jjb/genius/genius-csit-genius.yaml b/jjb/genius/genius-csit-genius.yaml index 77d08b0d7..056e8a3c1 100644 --- a/jjb/genius/genius-csit-genius.yaml +++ b/jjb/genius/genius-csit-genius.yaml @@ -1,64 +1,45 @@ --- - project: - name: genius-csit-genius-oxygen + name: genius-csit-genius-oxygen-fluorine jobs: - inttest-csit-1node - inttest-csit-3node - # The project name project: 'genius' - # The functionality under test functionality: - 'upstream' - 'gate' - 'tdd-wip': testplan: '{project}-tdd-wip.txt' - schedule: '' - # Project branches stream: - fluorine: branch: 'master' - oxygen: branch: 'stable/oxygen' + install: - all: scope: 'all' - # Mininet configuration tools_system_count: 3 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 - # Features to install install-features: 'odl-genius-rest' - # Robot custom options - robot-options: ' ' - - project: - name: genius-csit-genius-{stream} + name: genius-csit-genius-verify jobs: - - inttest-csit-1node - - inttest-csit-3node - inttest-csit-verify-1node - inttest-csit-verify-3node - # The project name project: 'genius' - # The functionality under test - functionality: - - 'upstream' - - 'gate' + functionality: 'verify' - # Project branches stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 + - fluorine: + branch: 'master' verify-stream: 'oxygen' verify-branch: 'stable/oxygen' @@ -68,12 +49,6 @@ - all: scope: 'all' - # Mininet configuration tools_system_count: 3 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 - # Features to install install-features: 'odl-genius-rest' - - # Robot custom options - robot-options: ' ' diff --git a/jjb/genius/genius-patch-test.yaml b/jjb/genius/genius-patch-test.yaml index 5b0ee7f92..b9f22ec4c 100644 --- a/jjb/genius/genius-patch-test.yaml +++ b/jjb/genius/genius-patch-test.yaml @@ -13,13 +13,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/genius/genius.yaml b/jjb/genius/genius.yaml index 73bbbf8d5..db5cc0958 100644 --- a/jjb/genius/genius.yaml +++ b/jjb/genius/genius.yaml @@ -4,6 +4,11 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: fluorine @@ -30,6 +35,11 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: genius + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-genius/34944/ + rtd-token: 7ba691afb89bd53d19fd7d8585fdd8bd6620de7f - odl-maven-jobs stream: oxygen @@ -51,55 +61,6 @@ # Used by the release job staging-profile-id: 96fb4b6d9d1ee -- project: - name: genius-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'genius' - project-name: 'genius' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream} - email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - - # Used by the release job - staging-profile-id: 96fb4b6d9d1ee - -- project: - name: genius-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'genius' - project-name: 'genius' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'genius-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - controller-merge-{stream}, - yangtools-merge-{stream}, - odlparent-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream} - email-upstream: '[genius] [controller] [yangtools] [odlparent] [openflowplugin] [neutron]' - - # Used by the release job - staging-profile-id: 96fb4b6d9d1ee - - project: name: genius-sonar jobs: diff --git a/jjb/global-jjb b/jjb/global-jjb index edf56a1e9..5a2ef9c64 160000 --- a/jjb/global-jjb +++ b/jjb/global-jjb @@ -1 +1 @@ -Subproject commit edf56a1e9ce91d936388621ecfc850162aabfebd +Subproject commit 5a2ef9c64caf06ff737dfa040b61c4909c97e996 diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml index a8442ad78..8b4b54639 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml @@ -25,13 +25,6 @@ - oxygen: branch: 'stable/oxygen' install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - nitrogen: - branch: 'stable/nitrogen' - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: 'odl-groupbasedpolicy-neutron-and-ofoverlay,odl-restconf' openstack: - ocata: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml index 53b6f7578..a0f6b62e8 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-3node.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml index 1444524aa..191c88f1e 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-6node.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml index 675fdf0c2..6395c4052 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-clustering.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml index be355c2fc..3fa1a99c5 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy-csit-sxp.yaml @@ -15,11 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/groupbasedpolicy/groupbasedpolicy.yaml b/jjb/groupbasedpolicy/groupbasedpolicy.yaml index 6792b6307..93534339a 100644 --- a/jjb/groupbasedpolicy/groupbasedpolicy.yaml +++ b/jjb/groupbasedpolicy/groupbasedpolicy.yaml @@ -2,7 +2,6 @@ - project: name: groupbasedpolicy-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -51,57 +50,6 @@ # Used by the release job staging-profile-id: 96fbb93f95a76 -- project: - name: groupbasedpolicy-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - - # Used by the release job - staging-profile-id: 96fbb93f95a76 - -- project: - name: groupbasedpolicy-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'groupbasedpolicy' - project-name: 'groupbasedpolicy' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'groupbasedpolicy-settings' - mvn-goals: '-U clean deploy findbugs:findbugs' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - openflowjava-merge-{stream}, - openflowplugin-merge-{stream}, - neutron-merge-{stream}, - sfc-merge-{stream}, - ovsdb-merge-{stream} - email-upstream: '[groupbasedpolicy] [openflowjava] [openflowplugin] [neutron] [sfc] [ovsdb]' - - # Used by the release job - staging-profile-id: 96fbb93f95a76 - - project: name: groupbasedpolicy-sonar jobs: diff --git a/jjb/honeycomb/vbd/vbd.yaml b/jjb/honeycomb/vbd/vbd.yaml index f4829d180..936c72b1e 100644 --- a/jjb/honeycomb/vbd/vbd.yaml +++ b/jjb/honeycomb/vbd/vbd.yaml @@ -2,7 +2,6 @@ - project: name: vbd-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96fc362c36862 -- project: - name: vbd-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/nitrogen' - mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[vbd]' - - # Used by the release job - staging-profile-id: 96fc362c36862 - -- project: - name: vbd-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'honeycomb/vbd' - project-name: 'vbd' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'honeycomb-vbd-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[vbd]' - - # Used by the release job - staging-profile-id: 96fc362c36862 - - project: name: vbd-sonar jobs: diff --git a/jjb/infrautils/infrautils-patch-test.yaml b/jjb/infrautils/infrautils-patch-test.yaml index 3dabe2ae7..388131449 100644 --- a/jjb/infrautils/infrautils-patch-test.yaml +++ b/jjb/infrautils/infrautils-patch-test.yaml @@ -13,13 +13,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' @@ -31,3 +24,7 @@ - cluster-netvirt: csit-list: > netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml index bfec7c881..2a865fc9c 100644 --- a/jjb/infrautils/infrautils.yaml +++ b/jjb/infrautils/infrautils.yaml @@ -4,6 +4,12 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: infrautils + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ + rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 - odl-maven-jobs stream: fluorine @@ -23,6 +29,12 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: infrautils + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/ + rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9 - odl-maven-jobs stream: oxygen @@ -37,43 +49,6 @@ # Used by the release job staging-profile-id: 96fca0367756c -- project: - name: infrautils-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/nitrogen' - mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - - # Used by the release job - staging-profile-id: 96fca0367756c - -- project: - name: infrautils-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'infrautils' - project-name: 'infrautils' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'infrautils-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[infrautils] [odlparent]' - - # Used by the release job - staging-profile-id: 96fca0367756c - - project: name: infrautils-sonar jobs: diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh index 605cd8f0a..836100b77 100644 --- a/jjb/integration/common-functions.sh +++ b/jjb/integration/common-functions.sh @@ -115,3 +115,13 @@ function configure_karaf_log() { echo "cat ${LOGCONF}" cat ${LOGCONF} } # function configure_karaf_log() + +# convert commas in csv strings to spaces (ssv) +function csv2ssv() { + local csv=$1 + if [ -n "${csv}" ]; then + ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g') + fi + + echo "${ssv}" +} # csv2ssv diff --git a/jjb/integration/csit-jobs-carbon.lst b/jjb/integration/csit-jobs-carbon.lst deleted file mode 100644 index ac2f49105..000000000 --- a/jjb/integration/csit-jobs-carbon.lst +++ /dev/null @@ -1,97 +0,0 @@ -aaa-csit-1node-authn-all-carbon, -aaa-csit-1node-keystone-all-carbon, -aaa-csit-1node-tls-only-carbon, -alto-csit-1node-setup-all-carbon, -bgpcep-csit-1node-periodic-bgp-ingest-all-carbon, -bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-carbon, -bgpcep-csit-1node-periodic-throughpcep-all-carbon, -bgpcep-csit-1node-userfeatures-all-carbon, -bgpcep-csit-3node-periodic-bgpclustering-all-carbon, -bgpcep-csit-3node-periodic-bgpclustering-ha-only-carbon, -bier-csit-1node-basic-all-carbon, -controller-csit-1node-akka1-all-carbon, -controller-csit-1node-periodic-benchmark-all-carbon, -controller-csit-1node-rest-cars-perf-all-carbon, -controller-csit-3node-clustering-all-carbon, -controller-csit-3node-periodic-benchmark-all-carbon, -controller-csit-3node-rest-clust-cars-perf-only-carbon, -didm-csit-1node-discovery-only-carbon, -distribution-csit-1node-userfeatures-all-carbon, -dluxapps-csit-1node-yangman-all-carbon, -genius-csit-1node-upstream-all-carbon, -genius-csit-3node-upstream-all-carbon, -groupbasedpolicy-csit-1node-3-node-all-carbon, -groupbasedpolicy-csit-1node-6node-all-carbon, -groupbasedpolicy-csit-1node-openstack-ocata-openstack-carbon, -groupbasedpolicy-csit-1node-sxp-only-carbon, -groupbasedpolicy-csit-3node-clustering-all-carbon, -iotdm-csit-1node-basic-all-carbon, -l2switch-csit-1node-periodic-host-scalability-daily-only-carbon, -l2switch-csit-1node-scalability-all-carbon, -l2switch-csit-1node-switch-all-carbon, -lacp-csit-1node-lacp-all-carbon, -lispflowmapping-csit-1node-msmr-all-carbon, -lispflowmapping-csit-1node-performance-only-carbon, -lispflowmapping-csit-3node-msmr-all-carbon, -mdsal-csit-1node-periodic-bindingv1-only-carbon, -messaging4transport-csit-1node-basic-all-carbon, -natapp-csit-1node-basic-all-carbon, -nemo-csit-1node-engine-all-carbon, -netconf-csit-1node-callhome-only-carbon, -netconf-csit-1node-periodic-scale-all-carbon, -netconf-csit-1node-userfeatures-all-carbon, -netconf-csit-3node-cluster-stress-all-carbon, -netconf-csit-3node-clustering-all-carbon, -netconf-csit-3node-periodic-clustering-scale-all-carbon, -netide-csit-1node-basic-all-carbon, -netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon, -netvirt-csit-1node-openstack-ocata-upstream-stateful-snat-conntrack-carbon, -netvirt-csit-1node-openstack-pike-sfc-carbon, -netvirt-csit-1node-openstack-pike-upstream-stateful-carbon, -netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-carbon, -netvirt-csit-3node-openstack-ocata-upstream-stateful-carbon, -netvirt-csit-3node-openstack-ocata-upstream-stateful-snat-conntrack-carbon, -netvirt-csit-3node-openstack-pike-upstream-stateful-carbon, -netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-carbon, -netvirt-csit-hwvtep-1node-openstack-ocata-upstream-stateful-carbon, -netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-carbon, -netvirt-csit-hwvtep-3node-openstack-ocata-upstream-stateful-carbon, -netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-carbon, -nic-csit-1node-basic-all-carbon, -ocpplugin-csit-1node-get-all-carbon, -ocpplugin-csit-1node-scalability-all-carbon, -of-config-csit-1node-basic-all-carbon, -openflowplugin-csit-1node-cbench-only-carbon, -openflowplugin-csit-1node-flow-services-all-carbon, -openflowplugin-csit-1node-perf-bulkomatic-only-carbon, -openflowplugin-csit-1node-perf-stats-collection-only-carbon, -openflowplugin-csit-1node-scale-link-only-carbon, -openflowplugin-csit-1node-scale-only-carbon, -openflowplugin-csit-1node-scale-switch-only-carbon, -openflowplugin-csit-3node-clustering-bulkomatic-only-carbon, -openflowplugin-csit-3node-clustering-only-carbon, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-carbon, -ovsdb-csit-1node-upstream-southbound-all-carbon, -ovsdb-csit-3node-upstream-clustering-only-carbon, -packetcable-csit-1node-pcmm-all-carbon, -sdninterfaceapp-csit-1node-basic-only-carbon, -sfc-csit-3node-docker-full-deploy-all-carbon, -sfc-csit-3node-rest-basic-all-carbon, -sxp-csit-1node-basic-all-carbon, -sxp-csit-1node-filtering-all-carbon, -sxp-csit-1node-periodic-performance-all-carbon, -sxp-csit-1node-topology-all-carbon, -sxp-csit-3node-periodic-clustering-all-carbon, -sxp-csit-3node-periodic-routing-all-carbon, -topoprocessing-csit-1node-topology-operations-all-carbon, -tsdr-csit-1node-cassandra-datastore-only-carbon, -tsdr-csit-1node-elasticsearch-datastore-only-carbon, -tsdr-csit-1node-hbase-datastore-all-carbon, -tsdr-csit-1node-hsqldb-datastore-all-carbon, -unimgr-csit-1node-basic-all-carbon, -unimgr-csit-1node-legato-all-carbon, -usc-csit-1node-channel-all-carbon, -usc-csit-1node-tcp-all-carbon, -usecplugin-csit-1node-basic-all-carbon, -vtn-csit-1node-openstack-pike-neutron-carbon, -yangtools-csit-1node-periodic-system-only-carbon, diff --git a/jjb/integration/csit-jobs-fluorine.lst b/jjb/integration/csit-jobs-fluorine.lst index 1bebf0ae2..a782e56c6 100644 --- a/jjb/integration/csit-jobs-fluorine.lst +++ b/jjb/integration/csit-jobs-fluorine.lst @@ -1,17 +1,17 @@ aaa-csit-1node-authn-all-fluorine, aaa-csit-1node-keystone-all-fluorine, aaa-csit-1node-tls-only-fluorine, -bgpcep-csit-1node-periodic-bgp-ingest-all-fluorine, -bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-fluorine, -bgpcep-csit-1node-periodic-throughpcep-all-fluorine, +bgpcep-csit-1node-bgp-ingest-all-fluorine, +bgpcep-csit-1node-bgp-ingest-mixed-all-fluorine, +bgpcep-csit-1node-throughpcep-all-fluorine, bgpcep-csit-1node-userfeatures-all-fluorine, -bgpcep-csit-3node-periodic-bgpclustering-all-fluorine, -bgpcep-csit-3node-periodic-bgpclustering-ha-only-fluorine, +bgpcep-csit-3node-bgpclustering-all-fluorine, +bgpcep-csit-3node-bgpclustering-ha-only-fluorine, controller-csit-1node-akka1-all-fluorine, -controller-csit-1node-periodic-benchmark-all-fluorine, +controller-csit-1node-benchmark-all-fluorine, controller-csit-1node-rest-cars-perf-all-fluorine, +controller-csit-3node-benchmark-all-fluorine, controller-csit-3node-clustering-all-fluorine, -controller-csit-3node-periodic-benchmark-all-fluorine, controller-csit-3node-rest-clust-cars-perf-only-fluorine, daexim-csit-1node-basic-only-fluorine, daexim-csit-3node-clustering-basic-only-fluorine, @@ -21,15 +21,16 @@ genius-csit-3node-upstream-all-fluorine, lispflowmapping-csit-1node-msmr-all-fluorine, lispflowmapping-csit-1node-performance-only-fluorine, lispflowmapping-csit-3node-msmr-all-fluorine, -mdsal-csit-1node-periodic-bindingv1-only-fluorine, +mdsal-csit-1node-bindingv1-only-fluorine, netconf-csit-1node-callhome-only-fluorine, -netconf-csit-1node-periodic-scale-all-fluorine, +netconf-csit-1node-scale-all-fluorine, netconf-csit-1node-userfeatures-all-fluorine, netconf-csit-3node-cluster-stress-all-fluorine, netconf-csit-3node-clustering-all-fluorine, -netconf-csit-3node-periodic-clustering-scale-all-fluorine, +netconf-csit-3node-clustering-scale-all-fluorine, netvirt-csit-1node-openstack-pike-upstream-stateful-fluorine, netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-fluorine, +netvirt-csit-1node-openstack-queens-sfc-fluorine, netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine, netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-fluorine, netvirt-csit-3node-openstack-pike-upstream-stateful-fluorine, @@ -54,4 +55,4 @@ ovsdb-csit-1node-upstream-southbound-all-fluorine, ovsdb-csit-3node-upstream-clustering-only-fluorine, sfc-csit-3node-docker-full-deploy-all-fluorine, sfc-csit-3node-rest-basic-all-fluorine, -yangtools-csit-1node-periodic-system-only-fluorine, +yangtools-csit-1node-system-only-fluorine, diff --git a/jjb/integration/csit-jobs-nitrogen.lst b/jjb/integration/csit-jobs-nitrogen.lst deleted file mode 100644 index 2263f3284..000000000 --- a/jjb/integration/csit-jobs-nitrogen.lst +++ /dev/null @@ -1,90 +0,0 @@ -aaa-csit-1node-authn-all-nitrogen, -aaa-csit-1node-keystone-all-nitrogen, -aaa-csit-1node-tls-only-nitrogen, -alto-csit-1node-setup-all-nitrogen, -bgpcep-csit-1node-periodic-bgp-ingest-all-nitrogen, -bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-nitrogen, -bgpcep-csit-1node-periodic-throughpcep-all-nitrogen, -bgpcep-csit-1node-userfeatures-all-nitrogen, -bgpcep-csit-3node-periodic-bgpclustering-all-nitrogen, -bgpcep-csit-3node-periodic-bgpclustering-ha-only-nitrogen, -bier-csit-1node-basic-all-nitrogen, -controller-csit-1node-akka1-all-nitrogen, -controller-csit-1node-periodic-benchmark-all-nitrogen, -controller-csit-1node-rest-cars-perf-all-nitrogen, -controller-csit-3node-clustering-all-nitrogen, -controller-csit-3node-periodic-benchmark-all-nitrogen, -controller-csit-3node-rest-clust-cars-perf-only-nitrogen, -daexim-csit-1node-basic-only-nitrogen, -daexim-csit-3node-clustering-basic-only-nitrogen, -distribution-csit-1node-userfeatures-all-nitrogen, -dluxapps-csit-1node-yangman-all-nitrogen, -genius-csit-1node-upstream-all-nitrogen, -genius-csit-3node-upstream-all-nitrogen, -groupbasedpolicy-csit-1node-3-node-all-nitrogen, -groupbasedpolicy-csit-1node-6node-all-nitrogen, -groupbasedpolicy-csit-1node-openstack-ocata-openstack-nitrogen, -groupbasedpolicy-csit-1node-sxp-only-nitrogen, -groupbasedpolicy-csit-3node-clustering-all-nitrogen, -l2switch-csit-1node-periodic-host-scalability-daily-only-nitrogen, -l2switch-csit-1node-scalability-all-nitrogen, -l2switch-csit-1node-switch-all-nitrogen, -lispflowmapping-csit-1node-msmr-all-nitrogen, -lispflowmapping-csit-1node-performance-only-nitrogen, -lispflowmapping-csit-3node-msmr-all-nitrogen, -mdsal-csit-1node-periodic-bindingv1-only-nitrogen, -messaging4transport-csit-1node-basic-all-nitrogen, -nemo-csit-1node-engine-all-nitrogen, -netconf-csit-1node-callhome-only-nitrogen, -netconf-csit-1node-periodic-scale-all-nitrogen, -netconf-csit-1node-userfeatures-all-nitrogen, -netconf-csit-3node-cluster-stress-all-nitrogen, -netconf-csit-3node-clustering-all-nitrogen, -netconf-csit-3node-periodic-clustering-scale-all-nitrogen, -netvirt-csit-1node-openstack-pike-sfc-nitrogen, -netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen, -netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen, -netvirt-csit-1node-openstack-queens-upstream-stateful-nitrogen, -netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen, -netvirt-csit-3node-openstack-pike-upstream-stateful-nitrogen, -netvirt-csit-3node-openstack-pike-upstream-stateful-snat-conntrack-nitrogen, -netvirt-csit-3node-openstack-queens-upstream-stateful-nitrogen, -netvirt-csit-3node-openstack-queens-upstream-stateful-snat-conntrack-nitrogen, -netvirt-csit-hwvtep-1node-openstack-pike-upstream-stateful-nitrogen, -netvirt-csit-hwvtep-1node-openstack-queens-upstream-stateful-nitrogen, -netvirt-csit-hwvtep-3node-openstack-pike-upstream-stateful-nitrogen, -netvirt-csit-hwvtep-3node-openstack-queens-upstream-stateful-nitrogen, -nic-csit-1node-basic-all-nitrogen, -ocpplugin-csit-1node-get-all-nitrogen, -ocpplugin-csit-1node-scalability-all-nitrogen, -of-config-csit-1node-basic-all-nitrogen, -openflowplugin-csit-1node-cbench-only-nitrogen, -openflowplugin-csit-1node-flow-services-all-nitrogen, -openflowplugin-csit-1node-perf-bulkomatic-only-nitrogen, -openflowplugin-csit-1node-perf-stats-collection-only-nitrogen, -openflowplugin-csit-1node-scale-link-only-nitrogen, -openflowplugin-csit-1node-scale-only-nitrogen, -openflowplugin-csit-1node-scale-switch-only-nitrogen, -openflowplugin-csit-3node-clustering-bulkomatic-only-nitrogen, -openflowplugin-csit-3node-clustering-only-nitrogen, -openflowplugin-csit-3node-clustering-perf-bulkomatic-only-nitrogen, -ovsdb-csit-1node-upstream-southbound-all-nitrogen, -ovsdb-csit-3node-upstream-clustering-only-nitrogen, -packetcable-csit-1node-pcmm-all-nitrogen, -sdninterfaceapp-csit-1node-basic-only-nitrogen, -sfc-csit-3node-docker-full-deploy-all-nitrogen, -sfc-csit-3node-rest-basic-all-nitrogen, -sxp-csit-1node-basic-all-nitrogen, -sxp-csit-1node-filtering-all-nitrogen, -sxp-csit-1node-periodic-performance-all-nitrogen, -sxp-csit-1node-topology-all-nitrogen, -sxp-csit-3node-periodic-clustering-all-nitrogen, -sxp-csit-3node-periodic-routing-all-nitrogen, -topoprocessing-csit-1node-topology-operations-all-nitrogen, -unimgr-csit-1node-basic-all-nitrogen, -unimgr-csit-1node-legato-all-nitrogen, -usc-csit-1node-channel-all-nitrogen, -usc-csit-1node-tcp-all-nitrogen, -usecplugin-csit-1node-basic-all-nitrogen, -vtn-csit-1node-openstack-pike-neutron-nitrogen, -yangtools-csit-1node-periodic-system-only-nitrogen, diff --git a/jjb/integration/csit-jobs-oxygen.lst b/jjb/integration/csit-jobs-oxygen.lst index f0ce5ae5b..3f7231166 100644 --- a/jjb/integration/csit-jobs-oxygen.lst +++ b/jjb/integration/csit-jobs-oxygen.lst @@ -2,18 +2,18 @@ aaa-csit-1node-authn-all-oxygen, aaa-csit-1node-keystone-all-oxygen, aaa-csit-1node-tls-only-oxygen, alto-csit-1node-setup-all-oxygen, -bgpcep-csit-1node-periodic-bgp-ingest-all-oxygen, -bgpcep-csit-1node-periodic-bgp-ingest-mixed-all-oxygen, -bgpcep-csit-1node-periodic-throughpcep-all-oxygen, +bgpcep-csit-1node-bgp-ingest-all-oxygen, +bgpcep-csit-1node-bgp-ingest-mixed-all-oxygen, +bgpcep-csit-1node-throughpcep-all-oxygen, bgpcep-csit-1node-userfeatures-all-oxygen, -bgpcep-csit-3node-periodic-bgpclustering-all-oxygen, -bgpcep-csit-3node-periodic-bgpclustering-ha-only-oxygen, +bgpcep-csit-3node-bgpclustering-all-oxygen, +bgpcep-csit-3node-bgpclustering-ha-only-oxygen, bier-csit-1node-basic-all-oxygen, controller-csit-1node-akka1-all-oxygen, -controller-csit-1node-periodic-benchmark-all-oxygen, +controller-csit-1node-benchmark-all-oxygen, controller-csit-1node-rest-cars-perf-all-oxygen, +controller-csit-3node-benchmark-all-oxygen, controller-csit-3node-clustering-all-oxygen, -controller-csit-3node-periodic-benchmark-all-oxygen, controller-csit-3node-rest-clust-cars-perf-only-oxygen, daexim-csit-1node-basic-only-oxygen, daexim-csit-3node-clustering-basic-only-oxygen, @@ -26,23 +26,23 @@ groupbasedpolicy-csit-1node-6node-all-oxygen, groupbasedpolicy-csit-1node-openstack-ocata-openstack-oxygen, groupbasedpolicy-csit-1node-sxp-only-oxygen, groupbasedpolicy-csit-3node-clustering-all-oxygen, -l2switch-csit-1node-periodic-host-scalability-daily-only-oxygen, +l2switch-csit-1node-host-scalability-daily-only-oxygen, l2switch-csit-1node-scalability-all-oxygen, l2switch-csit-1node-switch-all-oxygen, lispflowmapping-csit-1node-msmr-all-oxygen, lispflowmapping-csit-1node-performance-only-oxygen, lispflowmapping-csit-3node-msmr-all-oxygen, -mdsal-csit-1node-periodic-bindingv1-only-oxygen, +mdsal-csit-1node-bindingv1-only-oxygen, nemo-csit-1node-engine-all-oxygen, netconf-csit-1node-callhome-only-oxygen, -netconf-csit-1node-periodic-scale-all-oxygen, +netconf-csit-1node-scale-all-oxygen, netconf-csit-1node-userfeatures-all-oxygen, netconf-csit-3node-cluster-stress-all-oxygen, netconf-csit-3node-clustering-all-oxygen, -netconf-csit-3node-periodic-clustering-scale-all-oxygen, -netvirt-csit-1node-openstack-pike-sfc-oxygen, +netconf-csit-3node-clustering-scale-all-oxygen, netvirt-csit-1node-openstack-pike-upstream-stateful-oxygen, netvirt-csit-1node-openstack-pike-upstream-stateful-snat-conntrack-oxygen, +netvirt-csit-1node-openstack-queens-sfc-oxygen, netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen, netvirt-csit-1node-openstack-queens-upstream-stateful-snat-conntrack-oxygen, netvirt-csit-3node-openstack-pike-upstream-stateful-oxygen, @@ -72,15 +72,14 @@ sfc-csit-3node-docker-full-deploy-all-oxygen, sfc-csit-3node-rest-basic-all-oxygen, sxp-csit-1node-basic-all-oxygen, sxp-csit-1node-filtering-all-oxygen, -sxp-csit-1node-periodic-performance-all-oxygen, +sxp-csit-1node-performance-all-oxygen, sxp-csit-1node-topology-all-oxygen, -sxp-csit-3node-periodic-clustering-all-oxygen, -sxp-csit-3node-periodic-routing-all-oxygen, +sxp-csit-3node-clustering-all-oxygen, +sxp-csit-3node-routing-all-oxygen, tsdr-csit-1node-cassandra-datastore-only-oxygen, tsdr-csit-1node-elasticsearch-datastore-only-oxygen, tsdr-csit-1node-hbase-datastore-all-oxygen, tsdr-csit-1node-hsqldb-datastore-all-oxygen, usc-csit-1node-channel-all-oxygen, usc-csit-1node-tcp-all-oxygen, -vtn-csit-1node-openstack-pike-neutron-oxygen, -yangtools-csit-1node-periodic-system-only-oxygen, +yangtools-csit-1node-system-only-oxygen, diff --git a/jjb/integration/distribution/distribution-check-bootup.sh b/jjb/integration/distribution/distribution-check-bootup.sh index 2a333dea7..be617ee03 100644 --- a/jjb/integration/distribution/distribution-check-bootup.sh +++ b/jjb/integration/distribution/distribution-check-bootup.sh @@ -1,10 +1,9 @@ - CONTROLLERMEM="3072m" ACTUALFEATURES="odl-integration-all" -BUNDLEVERSION="$(xpath distribution/pom.xml '/project/version/text()' 2> /dev/null)" -BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}" -BUNDLE="${BUNDLEFOLDER}.zip" -BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSION}/${BUNDLE}" + +if [[ ! -z "${CONTROLLERFEATURES}" ]]; then + ACTUALFEATURES="odl-integration-all,${CONTROLLERFEATURES}" +fi echo "Kill any controller running" ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh @@ -12,23 +11,31 @@ ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh echo "Clean Existing distribution" rm -rf ${BUNDLEFOLDER} -echo "Copying the distribution..." -cp "${BUNDLE_PATH}" . +echo "Fetch the distribution..." +if [[ -z "${BUNDLE_PATH}" ]]; then + wget --progress=dot:mega "${ACTUAL_BUNDLE_URL}" +else + cp "${BUNDLE_PATH}" . +fi echo "Extracting the new controller..." unzip -q "${BUNDLE}" echo "Configuring the startup features..." 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" +FEATURE_TEST_STRING="features-test" +if [[ "$KARAF_VERSION" == "karaf3" ]]; then + FEATURE_TEST_STRING="features-integration-test" fi -sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLEVERSION}/xml/features,%g" ${FEATURESCONF} +sed -ie "s%\(featuresRepositories= \|featuresRepositories = \)%featuresRepositories = mvn:org.opendaylight.integration/${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,%g" ${FEATURESCONF} + +if [[ ! -z "${REPO_URL}" ]]; then + sed -ie "s%featuresRepositories = %featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF} +fi # Add actual boot features. -sed -ie "s/\(featuresBoot=\|featuresBoot =\)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}" +sed -ie "s/\(featuresBoot= \|featuresBoot = \)/featuresBoot = ${ACTUALFEATURES},/g" "${FEATURESCONF}" cat "${FEATURESCONF}" echo "Configuring the log..." @@ -44,10 +51,6 @@ cat "${MEMCONF}" echo "Listing all open ports on controller system" netstat -pnatu -echo "redirected karaf console output to karaf_console.log" -export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" -mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log - if [ "${JDKVERSION}" == 'openjdk8' ]; then echo "Setting the JRE Version to 8" # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start. @@ -70,47 +73,31 @@ mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log echo "Starting controller..." ${WORKSPACE}/${BUNDLEFOLDER}/bin/start -# No need for verbose printing during repeating operations. -set +x - -echo "Waiting for controller to come up..." -COUNT=0 -while true; do - RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)" - echo "${RESP}" - if [[ "${RESP}" == *"200"* ]]; then - echo Controller is UP - break - elif (( "${COUNT}" > 600 )); then - echo Timeout Controller DOWN - echo "Dumping Karaf log..." - cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Listing all open ports on controller system" - netstat -pnatu - exit 1 - else - COUNT=$(( ${COUNT} + 1 )) - sleep 1 - if [[ $(($COUNT % 5)) == 0 ]]; then - echo already waited ${COUNT} seconds... - fi - fi -done +function dump_log_and_exit { + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" + cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . + cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . + exit 1 +} -echo "loading many features at once. Need to allow time for problems to show up in logs. cool down for 5 min ..." -COUNT="300" +echo "Waiting up to 5 minutes for controller to come up, checking every 5 seconds..." +COUNT="0" while true; do - if (( "${COUNT}" <= "0" )); then + COUNT=$(( ${COUNT} + 5 )) + sleep 5 + echo "already waited ${COUNT} seconds..." + if grep --quiet 'org.opendaylight.infrautils.ready-impl.*System ready' "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then + echo "Controller is UP" break + elif (( "${COUNT}" > "300" )); then + echo "Timeout Controller DOWN" + dump_log_and_exit fi - echo "${COUNT} seconds yet to wait..." - sleep 10 - COUNT="$(( ${COUNT} - 10 ))" done -# End of repeating operations, enable verbose printing. -set -x - # echo "Checking OSGi bundles..." # sshpass seems to fail with new karaf version # sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list' @@ -122,28 +109,17 @@ function exit_on_log_file_message { echo "looking for \"$1\" in karaf.log file" if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then echo ABORTING: found "$1" - echo "Dumping first 500K bytes of karaf log..." - head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Dumping last 500K bytes of karaf log..." - tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . - exit 1 + dump_log_and_exit fi echo "looking for \"$1\" in karaf_console.log file" if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then echo ABORTING: found "$1" - echo "Dumping first 500K bytes of karaf log..." - head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" - echo "Dumping last 500K bytes of karaf log..." - tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . - exit 1 + dump_log_and_exit fi } +exit_on_log_file_message 'Error installing boot feature repository' exit_on_log_file_message 'BindException: Address already in use' exit_on_log_file_message 'server is unhealthy' diff --git a/jjb/integration/distribution/distribution-csit-userfeatures.yaml b/jjb/integration/distribution/distribution-csit-userfeatures.yaml index 0d016eb58..4c69b386c 100644 --- a/jjb/integration/distribution/distribution-csit-userfeatures.yaml +++ b/jjb/integration/distribution/distribution-csit-userfeatures.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/integration/distribution/distribution-deploy-offline.sh b/jjb/integration/distribution/distribution-deploy-offline.sh deleted file mode 100644 index e7920b534..000000000 --- a/jjb/integration/distribution/distribution-deploy-offline.sh +++ /dev/null @@ -1,122 +0,0 @@ -CONTROLLERMEM="3072m" -ACTUALFEATURES="odl-integration-all" - -echo "Kill any controller running" -ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh - -echo "Clean workspace" -rm -rf * - -echo "Downloading the distribution..." -wget --progress=dot:mega "${ACTUAL_BUNDLE_URL}" - -echo "Extracting the new controller..." -unzip -q "${BUNDLE}" - -echo "Configuring the startup features..." -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} - -# Feature is instaled later. -cat "${FEATURESCONF}" - -echo "Configuring the log..." -LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg" -sed -ie 's/log4j.appender.out.maxBackupIndex=10/log4j.appender.out.maxBackupIndex=1/g' "${LOGCONF}" -# FIXME: Make log size limit configurable from build parameter. -sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=30GB/g' "${LOGCONF}" -cat "${LOGCONF}" - -echo "Configure the repos..." -REPOCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.url.mvn.cfg" -sed -ie '/http/d' "${REPOCONF}" -sed -ie '$s/...$//' "${REPOCONF}" -cat "${REPOCONF}" - -echo "Configure max memory..." -MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv" -sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}" -cat "${MEMCONF}" - -if [ "${JDKVERSION}" == 'openjdk8' ]; then - echo "Setting the JRE Version to 8" - # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start. - # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java - export JAVA_HOME='/usr/lib/jvm/java-1.8.0' -elif [ "${JDKVERSION}" == 'openjdk7' ]; then - echo "Setting the JRE Version to 7" - # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start. - # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java - export JAVA_HOME='/usr/lib/jvm/java-1.7.0' -fi -readlink -e "${JAVA_HOME}/bin/java" -echo "Default JDK Version, JAVA_HOME should override" -java -version - -echo "Redirecting karaf console output to karaf_console.log" -export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" -mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log - -echo "Starting controller..." -${WORKSPACE}/${BUNDLEFOLDER}/bin/start - -echo "Waiting for controller to come up..." -# Silence the chatty output during the loop. -set +x -COUNT=0 -# Bug 9044 workaround: use bin/client instead of Linux ssh command. -CLIENT="${WORKSPACE}/${BUNDLEFOLDER}/bin/client" -while true; do - # Is there a way to both print output and store RC without manipulating the e flag? - set +e - ${CLIENT} "feature:list -i" - RC="$?" - set -e - if [[ "${RC}" == "0" ]]; then - echo Karaf is UP - break - elif (( "${COUNT}" > 600 )); then - echo Timeout Karaf DOWN - echo "Dumping Karaf log..." - cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Listing all open ports on controller system" - netstat -pnatu - exit 1 - else - echo "${RC}" - COUNT=$(( ${COUNT} + 1 )) - sleep 1 - if [[ $(($COUNT % 5)) == 0 ]]; then - echo already waited ${COUNT} seconds... - fi - fi -done -# Un-silence the chatty output. -set -x - -echo "Installing all features..." -$CLIENT feature:install ${ACTUALFEATURES} || echo $? > "${WORKSPACE}/error.txt" - -echo "killing karaf process..." -ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh -sleep 5 - -echo "Fetching Karaf logs" -# TODO: Move instead of copy? Gzip? -cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . -cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . - -echo "Exit if error" -if [ -f "${WORKSPACE}/error.txt" ]; then - echo "Failed to deploy offline" - exit 1 -else - echo "Offline test: PASS" -fi - -# vim: ts=4 sw=4 sts=4 et ft=sh : diff --git a/jjb/integration/distribution/distribution-deploy-verify.sh b/jjb/integration/distribution/distribution-deploy-verify.sh deleted file mode 100644 index c81ac6db6..000000000 --- a/jjb/integration/distribution/distribution-deploy-verify.sh +++ /dev/null @@ -1,147 +0,0 @@ -CONTROLLERMEM="3072m" -ACTUALFEATURES="odl-integration-all" - -echo "Kill any controller running" -ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh - -echo "Clean workspace" -rm -rf * - -echo "Downloading the distribution..." -wget --progress=dot:mega "${ACTUAL_BUNDLE_URL}" - -echo "Extracting the new controller..." -unzip -q "${BUNDLE}" - -echo "Configuring the startup features..." -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}" - -echo "Configuring the log..." -LOGCONF="${WORKSPACE}/${BUNDLEFOLDER}/etc/org.ops4j.pax.logging.cfg" -sed -ie 's/log4j.appender.out.maxFileSize=1MB/log4j.appender.out.maxFileSize=20MB/g' "${LOGCONF}" -cat "${LOGCONF}" - -echo "Configure max memory..." -MEMCONF="${WORKSPACE}/${BUNDLEFOLDER}/bin/setenv" -sed -ie "s/2048m/${CONTROLLERMEM}/g" "${MEMCONF}" -cat "${MEMCONF}" - -echo "Listing all open ports on controller system" -netstat -pnatu - -if [ "${JDKVERSION}" == 'openjdk8' ]; then - echo "Setting the JRE Version to 8" - # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start. - # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java - export JAVA_HOME='/usr/lib/jvm/java-1.8.0' -elif [ "${JDKVERSION}" == 'openjdk7' ]; then - echo "Setting the JRE Version to 7" - # dynamic_verify does not allow sudo, JAVA_HOME should be enough for karaf start. - # sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java - export JAVA_HOME='/usr/lib/jvm/java-1.7.0' -fi -readlink -e "${JAVA_HOME}/bin/java" -echo "Default JDK Version, JAVA_HOME should override" -java -version - -echo "Redirecting karaf console output to karaf_console.log" -export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" -mkdir -p ${WORKSPACE}/${BUNDLEFOLDER}/data/log - -echo "Starting controller..." -${WORKSPACE}/${BUNDLEFOLDER}/bin/start - -echo "Waiting for controller to come up..." -COUNT=0 -while true; do - RESP="$(curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null || true)" - echo "${RESP}" - if [[ "${RESP}" == *"200"* ]]; then - echo Controller is UP - break - elif (( "${COUNT}" > 600 )); then - echo Timeout Controller DOWN - echo "Dumping Karaf log..." - cat "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Listing all open ports on controller system" - netstat -pnatu - exit 1 - else - COUNT=$(( ${COUNT} + 1 )) - sleep 1 - if [[ $(($COUNT % 5)) == 0 ]]; then - echo already waited ${COUNT} seconds... - fi - fi -done - -echo "loading many features at once. Need to allow time for problems to show up in logs. cool down for 5 min ..." -sleep 300 - -echo "Checking OSGi bundles..." -# sshpass seems to fail with new karaf version -# sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list' - -echo "Listing all open ports on controller system" -netstat -pnatu - -function exit_on_log_file_message { - echo "looking for \"$1\" in karaf.log file" - if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log"; then - echo ABORTING: found "$1" - echo "Dumping first 500K bytes of karaf log..." - head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Dumping last 500K bytes of karaf log..." - tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . - exit 1 - fi - - echo "looking for \"$1\" in karaf_console.log file" - if grep --quiet "$1" "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"; then - echo ABORTING: found "$1" - echo "Dumping first 500K bytes of karaf log..." - head --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" - echo "Dumping last 500K bytes of karaf log..." - tail --bytes=500K "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . - cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . - exit 1 - fi -} - -exit_on_log_file_message 'BindException: Address already in use' -exit_on_log_file_message 'server is unhealthy' - -echo "Fetching Karaf logs" -# TODO: Move instead of copy? Gzip? -cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" . -cp "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log" . - -echo "Kill controller" -ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh - -echo "Bug 4628: Detecting misplaced config files" -pushd "${WORKSPACE}/${BUNDLEFOLDER}" || exit -XMLS_FOUND=`echo *.xml` -popd || exit -if [ "$XMLS_FOUND" != "*.xml" ]; then - echo "Bug 4628 confirmed." - ## TODO: Uncomment the following when ODL is fixed, to guard against regression. - # exit 1 -else - echo "Bug 4628 not detected." -fi - -# vim: ts=4 sw=4 sts=4 et ft=sh : diff --git a/jjb/integration/distribution/distribution-jobs.yaml b/jjb/integration/distribution/distribution-jobs.yaml index 1ffd0ea7d..af7327a60 100644 --- a/jjb/integration/distribution/distribution-jobs.yaml +++ b/jjb/integration/distribution/distribution-jobs.yaml @@ -1,6 +1,51 @@ --- - project: - name: distribution-jobs + name: distribution + jobs: + # gerrit- is generic template, distribution- is project specific. + - 'distribution-merge-{stream}' + - 'distribution-verify-{stream}' + - 'distribution-check-{stream}' + - 'distribution-sanity-{stream}' + - 'distribution-managed-{stream}' + - gerrit-maven-clm + - gerrit-maven-verify-dependencies + - gerrit-tox-verify + - '{project-name}-rtd-jobs': + project-pattern: integration/distribution + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-distribution/34591/ + rtd-token: 6247e7a21158a20b207470b8bf7719c676ff8944 + + project: integration/distribution + project-name: distribution + mvn-settings: integration-distribution-settings + mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + dependencies: '' + email-upstream: '[int/dist]' + + stream: + - fluorine: + branch: 'master' + karaf-version: odl + # Self-Managed projects repos and features: + sm-repos: mvn:org.opendaylight.sxp/features-sxp//xml/features + sm-features: odl-sxp-controller + - oxygen: + branch: 'stable/oxygen' + karaf-version: karaf4 + +- project: + name: distribution-sonar + jobs: + - gerrit-maven-sonar + + project: integration/distribution + project-name: distribution + branch: master + mvn-settings: integration-distribution-settings + mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - job-template: name: 'distribution-verify-{stream}' @@ -8,7 +53,7 @@ project-type: freestyle node: centos7-builder-8c-8g concurrent: true - jdk: '{jre}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -21,12 +66,10 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - - integration-patch-refspec: - branch: '$GERRIT_REFSPEC' scm: - gerrit-trigger-scm: - refspec: '$PATCHREFSPEC' + refspec: '$GERRIT_REFSPEC' choosing-strategy: 'gerrit' wrappers: @@ -46,12 +89,13 @@ global-settings-file: 'global-settings' settings-file: 'integration-settings' - maven-target: - maven-version: mvn33 + maven-version: mvn35 pom: pom.xml goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt -Dstream={stream} -Dsft.heap.max=4g + -Pmanaged -Punmanaged {opendaylight-infra-mvn-opts} # {opendaylight-infra-parallel-mvn-opts} is bad when there are multiple big features in SFT. java-opts: @@ -67,7 +111,7 @@ - lf-infra-publish - email-notification: email-recipients: '{email-recipients}' - email-prefix: '[int/dist]' + email-prefix: '[{project-name}]' - job-template: name: 'distribution-merge-{stream}' @@ -79,7 +123,7 @@ project-type: maven node: 'centos7-builder-8c-8g' - jdk: '{jre}' + jdk: '{java-version}' properties: - opendaylight-infra-properties: @@ -107,7 +151,7 @@ triggers: - gerrit-trigger-patch-merged: gerrit-server-name: '{gerrit-server-name}' - name: 'integration/distribution' + name: '{project}' branch: '{branch}' prebuilders: @@ -121,52 +165,21 @@ path: '$KARAF_ARTIFACT/src/main/assembly' maven: - maven-name: 'mvn33' + maven-name: 'mvn35' root-pom: 'pom.xml' goals: > clean install dependency:tree -DoutputFile=dependency_tree.txt -V -B -Dmaven.repo.local=/tmp/r -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r -Dsft.heap.max=4g -Djenkins -Dmerge -Dstream={stream} + -Pmanaged -Punmanaged maven-opts: '-Xmx1024m -XX:MaxPermSize=256m' - settings: 'integration-settings' + settings: integration-settings settings-type: cfp - global-settings: 'global-settings' + global-settings: global-settings global-settings-type: cfp postbuilders: - - conditional-step: - condition-kind: file-exists - condition-filename: deploy-site.xml - condition-basedir: workspace - - # The strategy here is intentional to run Maven site:deploy twice - # once using regular pom.xml to produce a staged-site which is - # then used by deploy-site.xml to push to Nexus. This is a - # workaround to Maven Site's default linking code which creates - # incorrect URLs for sites due to auto-detection assuming your - # project is configured in a certain way which ODL is not. - steps: - - maven-target: - maven-version: 'mvn33' - pom: pom.xml - goals: 'site:deploy -V -B -Dstream={stream}' - java-opts: - - '-Xmx2g' - settings: 'integration-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - - maven-target: - maven-version: 'mvn33' - pom: deploy-site.xml - goals: 'site:deploy -V -B -Dstream={stream}' - java-opts: - - '-Xmx2g' - settings: 'integration-settings' - settings-type: cfp - global-settings: 'global-settings' - global-settings-type: cfp - integration-compare-distributions # TODO: the output of the above command is not *friendly* for the reader because the most important info # is listed last. This is fine/best for command line output, but for keeping in a file it would be better @@ -184,7 +197,7 @@ - lf-infra-publish - email-notification: email-recipients: '{email-recipients}' - email-prefix: '[int/dist]' + email-prefix: '[{project-name}]' - job-template: name: 'distribution-check-{stream}' @@ -193,7 +206,7 @@ # Default parameters # ###################### - mvn-version: mvn33 + mvn-version: mvn35 ##################### # Job Configuration # @@ -218,10 +231,12 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' + - integration-distribution-stream: + stream: '{stream}' - distribution-karaf-version: karaf-version: '{karaf-version}' - maven-exec: - maven-version: mvn33 + maven-version: mvn35 scm: - integration-gerrit-scm: @@ -247,6 +262,8 @@ builders: - distribution-check-wipe + - inject: + properties-file: 'allowed_projects.txt' - distribution-check-build-project: pom: 'distribution/pom.xml' mvn-opts: '{opendaylight-infra-mvn-opts}' @@ -276,10 +293,10 @@ - lf-infra-publish - job-template: - name: 'distribution-deploy-{stream}' + name: 'distribution-sanity-{stream}' # Goal: Verify distribution starts with no issues when all features are loaded. - # Operation: This job deploys the controller installing odl-integration-all. - # FIXME: List required variables. + # Operation: This job deploys odl-integration-all + list of UM features. + # This job works for both managed & self-managed distro. project-type: freestyle node: centos7-builder-4c-4g @@ -296,10 +313,16 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' + - integration-distribution-stream: + stream: '{stream}' - integration-distribution-branch: branch: '{branch}' - integration-bundle-url: bundle-url: '{bundle-url}' + - integration-repo-url: + repo-url: '{sm-repos}' + - integration-controller-features: + controller-features: '{sm-features}' - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: @@ -309,23 +332,22 @@ - opendaylight-infra-wrappers: build-timeout: '{build-timeout}' - # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}. - builders: - - distribution-deploy-verify + - integration-detect-variables + - distribution-check-bootup publishers: - email-notification: email-recipients: '{email-recipients}' - email-prefix: '[int/dist]' + email-prefix: '[{project-name}]' - integration-csit-archive-build - lf-infra-publish - job-template: - name: 'distribution-offline-{stream}' - # Goal: Verify distribution can start with no internet connection. - # Operation: This job deploys the controller removing any external repository definition. - # FIXME: List required variables. + name: 'distribution-managed-{stream}' + # Goal: Verify distribution starts with no issues when all features are loaded. + # Operation: This job deploys odl-integration-all. + # This job works for just managed distro. project-type: freestyle node: centos7-builder-4c-4g @@ -342,6 +364,8 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' + - integration-distribution-stream: + stream: '{stream}' - integration-distribution-branch: branch: '{branch}' - integration-bundle-url: @@ -349,20 +373,20 @@ - integration-jdk-version: jdkversion: '{jre}' - distribution-karaf-version: - karaf-version: '{karaf-version}' + karaf-version: 'karaf4' wrappers: - opendaylight-infra-wrappers: build-timeout: '{build-timeout}' - # TODO: Trigger from sanity (instead of weekly) when this job is stable for {stream}. - builders: - - distribution-deploy-offline + - integration-detect-variables + - distribution-check-bootup publishers: - email-notification: email-recipients: '{email-recipients}' - email-prefix: '[int/dist]' + email-prefix: '[{project-name}]' - integration-csit-archive-build - lf-infra-publish + diff --git a/jjb/integration/distribution/distribution-macros.yaml b/jjb/integration/distribution/distribution-macros.yaml index bd835f21f..2e3ba043b 100644 --- a/jjb/integration/distribution/distribution-macros.yaml +++ b/jjb/integration/distribution/distribution-macros.yaml @@ -1,26 +1,5 @@ # JJB macros specific to Integration/Distribution ODL project --- - -- builder: - name: distribution-deploy-verify - # Operation: Deploy ODL with all fetures and check it is not broken. - # Required bash variables: - # KARAF_VERSION: 'karaf4' or 'karaf3'. - # Use distribution-karaf-version macro to customize. - builders: - - integration-detect-variables - - shell: !include-raw: distribution-deploy-verify.sh - -- builder: - name: distribution-deploy-offline - # Operation: Deploys ODL on the current system, with no external repo configuration, check it works. - # Required bash variables: - # KARAF_VERSION: 'karaf4' or 'karaf3'. - # Use distribution-karaf-version macro to customize. - builders: - - integration-detect-variables - - shell: !include-raw: distribution-deploy-offline.sh - - builder: name: distribution-check-wipe # Step zero: Wipe file repositories up front. @@ -34,6 +13,14 @@ rm -rfv /tmp/t echo "create n: multithreaded execution might fail at creating it." mkdir /tmp/n + echo "detecting distribution allowed projects" + # Some allowed projects cannot be detected in distribution because they do not produce features. + ALLOW_PROJECTS=(yangtools mdsal openflowjava) + ALLOW_PROJECTS+=(`grep 'org.opendaylight.' -Rh distribution \ + | sed -e 's%^[ \t]*org.opendaylight.%%' \ + | sed -e 's%%%' | sort -u`) + echo "Allowed projects are ${ALLOW_PROJECTS[@]}" + echo "ALLOW_PROJECTS=${ALLOW_PROJECTS[@]}" > allowed_projects.txt - builder: name: distribution-check-build-project @@ -48,7 +35,7 @@ goals: | clean deploy dependency:tree -DoutputFile=dependency_tree.txt - -Pq + -Pq -Pmanaged -Punmanaged -DaltDeploymentRepository=fake-nexus::default::file:///tmp/n/ {mvn-opts} java-opts: @@ -68,6 +55,18 @@ # gerrit-project: Project name as nexus URI part. Typically '$GERRIT_PROJECT'. builders: - shell: | + echo "These are allowed projects: $ALLOW_PROJECTS" + echo "These are distribution pulled projects:" + EXIT_CODE="0" + for PROJECT in `ls /tmp/r/org/opendaylight`; do + echo "checking $PROJECT" + if [[ "$ALLOW_PROJECTS" != *"$PROJECT"* ]]; then + echo "ERROR: Not allowed project $PROJECT pulled" + EXIT_CODE="1" + fi + done + exit $EXIT_CODE + echo "verify project groupId" mkdir -p /tmp/t/org/opendaylight/{gerrit-project} mv /tmp/n/org/opendaylight/{gerrit-project}/* /tmp/t/org/opendaylight/{gerrit-project}/ test -z "`find /tmp/n/ -type f`" || ( echo "ERROR: Mismatched groupId detected (see above)." && false ) @@ -88,7 +87,7 @@ goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt - -Pq + -Pq -Pmanaged -Punmanaged {mvn-opts} java-opts: - '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' @@ -193,7 +192,7 @@ clean install dependency:tree -DoutputFile=dependency_tree.txt -s fake_remotes.xml - -Pq + -Pq -Pmanaged -Punmanaged {mvn-opts} java-opts: - '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' @@ -219,7 +218,7 @@ clean install dependency:tree -DoutputFile=dependency_tree.txt -s fake_remotes.xml - -Pq + -Pq -Pmananaged -Punmanaged -Dsft.heap.max=4g -DskipTests=false {mvn-opts} diff --git a/jjb/integration/distribution/distribution-templates.yaml b/jjb/integration/distribution/distribution-templates.yaml index e7c0746e2..45fda0b32 100644 --- a/jjb/integration/distribution/distribution-templates.yaml +++ b/jjb/integration/distribution/distribution-templates.yaml @@ -10,7 +10,7 @@ ###################### java-version: openjdk8 - mvn-version: mvn33 + mvn-version: mvn35 ##################### # Job Configuration # @@ -37,6 +37,8 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' + - integration-distribution-stream: + stream: '{stream}' - integration-distribution-git-url: git-url: '{git-url}' - distribution-karaf-version: @@ -70,6 +72,8 @@ builders: - distribution-check-wipe + - inject: + properties-file: 'allowed_projects.txt' - distribution-check-build-project: pom: '$GERRIT_PROJECT/pom.xml' mvn-opts: '{opendaylight-infra-mvn-opts}' diff --git a/jjb/integration/distribution/distribution.yaml b/jjb/integration/distribution/distribution.yaml deleted file mode 100644 index c737d8d70..000000000 --- a/jjb/integration/distribution/distribution.yaml +++ /dev/null @@ -1,43 +0,0 @@ ---- -- project: - name: distribution - jobs: - # gerrit- is generic template, distribution- is project specific. - - 'distribution-merge-{stream}' - - 'distribution-verify-{stream}' - - 'distribution-deploy-{stream}' - - 'distribution-offline-{stream}' - - 'distribution-check-{stream}' - - gerrit-maven-clm - - gerrit-maven-verify-dependencies - - gerrit-tox-verify - - project: integration/distribution - project-name: distribution - mvn-settings: integration-distribution-settings - mvn-goals: 'clean install dependency:tree -DoutputFile=dependency_tree.txt' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[int/dist]' - - stream: - - fluorine: - branch: 'master' - - oxygen: - branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - -- project: - name: distribution-sonar - jobs: - - gerrit-maven-sonar - project: integration/distribution - project-name: distribution - branch: master - mvn-settings: integration-distribution-settings - mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/integration/integration-compare-distributions.sh b/jjb/integration/integration-compare-distributions.sh index a7b3827ec..b02b56802 100644 --- a/jjb/integration/integration-compare-distributions.sh +++ b/jjb/integration/integration-compare-distributions.sh @@ -12,12 +12,12 @@ DISTROBRANCH=${DISTROBRANCH:-$GERRIT_BRANCH} # Obtain current pom.xml of integration/distribution, correct branch. wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" -# Extract the BUNDLEVERSION from the pom.xml -BUNDLEVERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null) -echo "Bundle version is ${BUNDLEVERSION}" +# Extract the BUNDLE_VERSION from the pom.xml +BUNDLE_VERSION=$(xpath pom.xml '/project/version/text()' 2> /dev/null) +echo "Bundle version is ${BUNDLE_VERSION}" # Acquire the timestamp information from maven-metadata.xml NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}" -wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml +wget ${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml if [ $? -ne 0 ]; then echo "unable to find maven-metadata.xml. no need to continue..." @@ -27,9 +27,9 @@ fi less maven-metadata.xml TIMESTAMP=$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null) echo "Nexus timestamp is ${TIMESTAMP}" -BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}" +BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}" BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip" -ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}" +ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}" wget --progress=dot:mega $ACTUAL_BUNDLE_URL echo "Extracting the last distribution found on nexus..." diff --git a/jjb/integration/integration-configure-clustering.sh b/jjb/integration/integration-configure-clustering.sh index ee18f2540..42a2d8696 100644 --- a/jjb/integration/integration-configure-clustering.sh +++ b/jjb/integration/integration-configure-clustering.sh @@ -69,7 +69,7 @@ echo "Extracting the new controller..." unzip -q ${BUNDLE} echo "Adding external repositories..." -sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} +sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} cat ${MAVENCONF} echo "Configuring the startup features..." @@ -80,7 +80,10 @@ 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} +sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} +if [[ ! -z "${REPO_URL}" ]]; then + sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF} +fi cat ${FEATURESCONF} if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then diff --git a/jjb/integration/integration-deploy-controller-run-test.sh b/jjb/integration/integration-deploy-controller-run-test.sh index 423420aba..021161e61 100644 --- a/jjb/integration/integration-deploy-controller-run-test.sh +++ b/jjb/integration/integration-deploy-controller-run-test.sh @@ -56,7 +56,7 @@ echo "Extracting the new controller..." unzip -q ${BUNDLE} echo "Adding external repositories..." -sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} +sed -ie "s%org.ops4j.pax.url.mvn.repositories=%org.ops4j.pax.url.mvn.repositories=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot@id=opendaylight-snapshot@snapshots, https://nexus.opendaylight.org/content/repositories/public@id=opendaylight-mirror, http://repo1.maven.org/maven2@id=central, http://repository.springsource.com/maven/bundles/release@id=spring.ebr.release, http://repository.springsource.com/maven/bundles/external@id=spring.ebr.external, http://zodiac.springsource.com/maven/bundles/release@id=gemini, http://repository.apache.org/content/groups/snapshots-group@id=apache@snapshots@noreleases, https://oss.sonatype.org/content/repositories/snapshots@id=sonatype.snapshots.deploy@snapshots@noreleases, https://oss.sonatype.org/content/repositories/ops4j-snapshots@id=ops4j.sonatype.snapshots.deploy@snapshots@noreleases%g" ${MAVENCONF} cat ${MAVENCONF} if [[ "$USEFEATURESBOOT" == "True" ]]; then @@ -69,7 +69,10 @@ 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} +sed -ie "s%\(featuresRepositories=\|featuresRepositories =\)%featuresRepositories = mvn:org.opendaylight.integration/\${FEATURE_TEST_STRING}/${BUNDLE_VERSION}/xml/features,mvn:org.apache.karaf.decanter/apache-karaf-decanter/1.0.0/xml/features,%g" ${FEATURESCONF} +if [[ ! -z "${REPO_URL}" ]]; then + sed -ie "s%featuresRepositories =%featuresRepositories = ${REPO_URL},%g" ${FEATURESCONF} +fi cat ${FEATURESCONF} if [ "${ODL_ENABLE_L3_FWD}" == "yes" ]; then @@ -152,70 +155,29 @@ if [[ "$USEFEATURESBOOT" != "True" ]]; then feature:list -i fi -if [ "${DISTROSTREAM}" == "carbon" ] || [ "${DISTROSTREAM}" == "nitrogen" ]; -then - echo "only oxygen and above have the infrautils.ready feature, so using REST API to /modules or /shards to determine if the controller is ready."; - - COUNT="0" - - while true; do - RESP="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/restconf/modules -o /dev/null )" - echo \$RESP - - if [ "${ENABLE_HAPROXY_FOR_NEUTRON}" == "yes" ]; then - SHARD="\$( curl --user admin:admin -sL -w "%{http_code} %{url_effective}\\n" http://localhost:8181/jolokia/read/org.opendaylight.controller:Category=Shards,name=\member-\$1-shard-inventory-config,type=DistributedConfigDatastore)" - echo \$SHARD - fi - - if ([[ \$RESP == *"200"* ]] && ([[ "${ENABLE_HAPROXY_FOR_NEUTRON}" != "yes" ]] || [[ \$SHARD == *'"status":200'* ]])); then - echo "Controller is UP" - break - - elif (( "\$COUNT" > "600" )); then - echo Timeout Controller DOWN - echo "Dumping first 500K bytes of karaf log..." - head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Dumping last 500K bytes of karaf log..." - tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Listing all open ports on controller system" - netstat -pnatu - exit 1 - else - - COUNT=\$(( \${COUNT} + 1 )) - sleep 1 - - if [[ \$((\$COUNT % 5)) == 0 ]]; then - echo already waited \${COUNT} seconds... - fi - fi - done - -else - echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..." - for i in {1..36}; - do sleep 5; - grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log - if [ \$? -eq 0 ] - then - echo "Controller is UP" - break - fi - done; - - # if we ended up not finding ready status in the above loop, we can output some debugs +echo "Waiting up to 3 minutes for controller to come up, checking every 5 seconds..." +for i in {1..36}; + do sleep 5; grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log - if [ $? -ne 0 ] + if [ \$? -eq 0 ] then - echo "Timeout Controller DOWN" - echo "Dumping first 500K bytes of karaf log..." - head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Dumping last 500K bytes of karaf log..." - tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" - echo "Listing all open ports on controller system" - netstat -pnatu - exit 1 + echo "Controller is UP" + break fi +done; + +# if we ended up not finding ready status in the above loop, we can output some debugs +grep 'org.opendaylight.infrautils.ready-impl.*System ready' /tmp/${BUNDLEFOLDER}/data/log/karaf.log +if [ $? -ne 0 ] +then + echo "Timeout Controller DOWN" + echo "Dumping first 500K bytes of karaf log..." + head --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Dumping last 500K bytes of karaf log..." + tail --bytes=500K "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" + echo "Listing all open ports on controller system" + netstat -pnatu + exit 1 fi echo "Listing all open ports on controller system..." @@ -360,6 +322,7 @@ pybot -N ${TESTPLAN} \ -v CONTROLLER_USER:${USER} \ -v JAVA_HOME:${JAVA_HOME} \ -v JDKVERSION:${JDKVERSION} \ + -v JENKINS_WORKSPACE:${WORKSPACE} \ -v MININET1:${TOOLS_SYSTEM_2_IP} \ -v MININET2:${TOOLS_SYSTEM_3_IP} \ -v MININET3:${TOOLS_SYSTEM_4_IP} \ @@ -369,10 +332,12 @@ pybot -N ${TESTPLAN} \ -v MININET_USER:${USER} \ -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \ -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \ + -v NUM_TOOLS_SYSTEM:${NUM_TOOLS_SYSTEM} \ -v ODL_STREAM:${DISTROSTREAM} \ -v ODL_SYSTEM_1_IP:${ODL_SYSTEM_IP} \ -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} \ -v ODL_SYSTEM_USER:${USER} \ + -v TOOLS_SYSTEM_1_IP:${TOOLS_SYSTEM_IP} \ -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} \ -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \ -v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} \ diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh index 6a0e9463b..06ebf1094 100644 --- a/jjb/integration/integration-deploy-openstack-run-test.sh +++ b/jjb/integration/integration-deploy-openstack-run-test.sh @@ -4,6 +4,8 @@ # script. # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091 source ${ROBOT_VENV}/bin/activate +source /tmp/common-functions.sh ${BUNDLEFOLDER} + PYTHON="${ROBOT_VENV}/bin/python" SSH="ssh -t -t" ADMIN_PASSWORD="admin" @@ -18,7 +20,9 @@ python ${WORKSPACE}/test/tools/distchanges/changes.py -d /tmp/distribution_folde printf "\nshowing recent changes that made it into integration/test used by this job:\n" cd ${WORKSPACE}/test -git --no-pager log --pretty=format:'%h %<(13)%ar%<(13)%cr %<(20,trunc)%an%d %s' -n10 +printf "Hash Author Date Commit Date Author Subject" +printf "------- ------------------------------ ------------------------------ -------------------- -----------------------------" +git --no-pager log --pretty=format:'%h %<(30)%ad%<(30)%cd %<(20,trunc)%an%d %s' -n20 cd - cat << EOF @@ -111,7 +115,9 @@ function create_etc_hosts() { # openstack release function install_openstack_clients_in_robot_vm() { packages=("python-novaclient" "python-neutronclient" "python-openstackclient") - for plugin_name in ${ENABLE_OS_PLUGINS}; do + local os_plugins + os_plugins=$(csv2ssv "${ENABLE_OS_PLUGINS}") + for plugin_name in $os_plugins; do if [ "$plugin_name" == "networking-sfc" ]; then packages+=("networking-sfc") fi @@ -136,16 +142,6 @@ function install_openstack_clients_in_robot_vm() { fi } -# convert commas in csv strings to spaces (ssv) -function csv2ssv() { - local csv=$1 - if [ -n "${csv}" ]; then - ssv=$(echo ${csv} | sed 's/,/ /g' | sed 's/\ \ */\ /g') - fi - - echo "${ssv}" -} # csv2ssv - function is_openstack_feature_enabled() { local feature=$1 for enabled_feature in $(csv2ssv ${ENABLE_OS_SERVICES}) @@ -158,14 +154,14 @@ function is_openstack_feature_enabled() { echo 0 } -function fix_libvirt_version_n_cpu_ocata() { +function fix_libvirt_version_n_cpu_pike() { local ip=$1 ${SSH} ${ip} " cd /opt/stack; git clone https://git.openstack.org/openstack/requirements; cd requirements; - git checkout stable/ocata; - sed -i s/libvirt-python===2.5.0/libvirt-python===3.2.0/ upper-constraints.txt + git checkout stable/pike; + sed -i s/libvirt-python===3.5.0/libvirt-python===4.2.0/ upper-constraints.txt " } @@ -183,10 +179,6 @@ function install_rdo_release() { ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm" ;; - *ocata*) - ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-ocata/rdo-release-ocata-3.noarch.rpm" - ;; - master) ${SSH} ${ip} "sudo yum install -y https://repos.fedorapeople.org/repos/openstack/openstack-queens/rdo-release-queens-1.noarch.rpm" ;; @@ -282,7 +274,6 @@ EOF if [ "${ODL_ML2_DRIVER_VERSION}" == "v2" ]; then echo "ODL_V2DRIVER=True" >> ${local_conf_file_name} fi - IFS=, for plugin_name in ${ENABLE_OS_PLUGINS}; do if [ "$plugin_name" == "networking-odl" ]; then @@ -293,7 +284,8 @@ EOF ENABLE_PLUGIN_ARGS="${DEVSTACK_LBAAS_PLUGIN_REPO} ${OPENSTACK_BRANCH}" IS_LBAAS_PLUGIN_ENABLED="yes" elif [ "$plugin_name" == "networking-sfc" ]; then - ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} ${OPENSTACK_BRANCH}" + ENABLE_PLUGIN_ARGS="${DEVSTACK_NETWORKING_SFC_PLUGIN_REPO} master" + IS_SFC_PLUGIN_ENABLED="yes" else echo "Error: Invalid plugin $plugin_name, unsupported" continue @@ -333,6 +325,9 @@ EOF if [ "${IS_LBAAS_PLUGIN_ENABLED}" == "yes" ]; then SERVICE_PLUGINS+=", lbaasv2" fi + if [ "${IS_SFC_PLUGIN_ENABLED}" == "yes" ]; then + SERVICE_PLUGINS+=", networking_sfc.services.flowclassifier.plugin.FlowClassifierPlugin,networking_sfc.services.sfc.plugin.SfcPlugin" + fi fi #check for ODL_ENABLE_L3_FWD cat >> ${local_conf_file_name} << EOF @@ -689,6 +684,7 @@ EOF ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_err_warn_exception.log # Print ROBOT lines and print Exception lines. For exception lines also print the previous line for context sed -n -e '/ROBOT MESSAGE/P' -e '$!N;/Exception/P;D' ${NODE_FOLDER}/odl${i}_karaf.log > ${NODE_FOLDER}/odl${i}_exception.log + mv /tmp/odl${i}_exceptions.txt ${NODE_FOLDER} rm ${NODE_FOLDER}/odl${i}_karaf.log.tar mv *_threads* ${NODE_FOLDER} mv ps_* ${NODE_FOLDER} @@ -798,9 +794,6 @@ EOF mkdir -p ${TEMPEST_LOGS_DIR} scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest_results.html ${TEMPEST_LOGS_DIR} scp ${OPENSTACK_CONTROL_NODE_1_IP}:${DEVSTACK_TEMPEST_DIR}/tempest.log ${TEMPEST_LOGS_DIR} - if [ "$(echo ${OPENSTACK_BRANCH} | cut -d/ -f2)" != "queens" ]; then - mv ${WORKSPACE}/tempest_output* ${TEMPEST_LOGS_DIR} - fi else echo "tempest results not found in ${DEVSTACK_TEMPEST_DIR}/${TESTREPO}/0" fi @@ -882,12 +875,7 @@ function is_rabbitmq_ready() { local -r ip=${1} local grepfor="nova_cell1" rm -f rabbit.txt - if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then - ${SSH} ${ip} "sudo rabbitmqctl status" > rabbit.txt - grepfor="pid" - else - ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt - fi + ${SSH} ${ip} "sudo rabbitmqctl list_vhosts" > rabbit.txt grep ${grepfor} rabbit.txt } @@ -1074,12 +1062,6 @@ for i in `seq 1 ${NUM_OPENSTACK_CONTROL_NODES}`; do ssh ${!CONTROLIP} "sed -i 's/flat_networks public/flat_networks public,physnet1/' /opt/stack/devstack/lib/neutron" ssh ${!CONTROLIP} "sed -i '186i iniset \$NEUTRON_CORE_PLUGIN_CONF ml2_type_vlan network_vlan_ranges public:1:4094,physnet1:1:4094' /opt/stack/devstack/lib/neutron" fi - if [[ "${ODL_ML2_BRANCH}" == "stable/ocata" && "$(is_openstack_feature_enabled n-cpu)" == "1" ]]; then - echo "Updating requirements for ${ODL_ML2_BRANCH}" - echo "Workaround for https://review.openstack.org/#/c/491032/" - echo "Modify upper-constraints to use libvirt-python 3.2.0" - fix_libvirt_version_n_cpu_ocata ${!CONTROLIP} - fi create_control_node_local_conf ${!CONTROLIP} ${ODLMGRIP[$i]} "${ODL_OVS_MGRS[$i]}" scp ${WORKSPACE}/local.conf_control_${!CONTROLIP} ${!CONTROLIP}:/opt/stack/devstack/local.conf echo "Install rdo release to avoid incompatible Package versions" @@ -1131,11 +1113,11 @@ for i in `seq 1 ${NUM_OPENSTACK_COMPUTE_NODES}`; do scp ${WORKSPACE}/hosts_file ${!COMPUTEIP}:/tmp/hosts scp ${WORKSPACE}/get_devstack.sh ${!COMPUTEIP}:/tmp ${SSH} ${!COMPUTEIP} "bash /tmp/get_devstack.sh > /tmp/get_devstack.sh.txt 2>&1" - if [ "${ODL_ML2_BRANCH}" == "stable/ocata" ]; then + if [ "${ODL_ML2_BRANCH}" == "stable/pike" ]; then echo "Updating requirements for ${ODL_ML2_BRANCH}" - echo "Workaround for https://review.openstack.org/#/c/491032/" - echo "Modify upper-constraints to use libvirt-python 3.2.0" - fix_libvirt_version_n_cpu_ocata ${!COMPUTEIP} + echo "Workaround for libvirt-python failing installation" + echo "Modify upper-constraints to use libvirt-python 4.2.0" + fix_libvirt_version_n_cpu_pike ${!COMPUTEIP} fi create_compute_node_local_conf ${!COMPUTEIP} ${!CONTROLIP} ${ODLMGRIP[$SITE_INDEX]} "${ODL_OVS_MGRS[$SITE_INDEX]}" scp ${WORKSPACE}/local.conf_compute_${!COMPUTEIP} ${!COMPUTEIP}:/opt/stack/devstack/local.conf @@ -1222,13 +1204,6 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do echo "sleep for 60s and print hypervisor-list" sleep 60 - # In Ocata if we do not enable the n-cpu in control node then - # we need to discover hosts manually and ensure that they are mapped to cells. - # reference: https://ask.openstack.org/en/question/102256/how-to-configure-placement-service-for-compute-node-on-ocata/ - if [ "${OPENSTACK_BRANCH}" == "stable/ocata" ]; then - scp ${WORKSPACE}/setup_host_cell_mapping.sh ${!CONTROLIP}:/tmp - ${SSH} ${!CONTROLIP} "sudo bash /tmp/setup_host_cell_mapping.sh" - fi ${SSH} ${!CONTROLIP} "cd /opt/stack/devstack; source openrc admin admin; nova hypervisor-list" # in the case that we are doing openstack (control + compute) all in one node, then the number of hypervisors # will be the same as the number of openstack systems. However, if we are doing multinode openstack then the @@ -1246,12 +1221,14 @@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`; do exit 1 fi - # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node - # this needs to happen after devstack runs because it seems devstack is pulling in specific versions - # of these libs that are not working for tempest. - ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip" - ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade" - ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade" + if [ "${OPENSTACK_BRANCH}" == "stable/pike" ]; then + # upgrading pip, urllib3 and httplib2 so that tempest tests can be run on openstack control node + # this needs to happen after devstack runs because it seems devstack is pulling in specific versions + # of these libs that are not working for tempest. + ${SSH} ${!CONTROLIP} "sudo pip install --upgrade pip" + ${SSH} ${!CONTROLIP} "sudo pip install urllib3 --upgrade" + ${SSH} ${!CONTROLIP} "sudo pip install httplib2 --upgrade" + fi # Gather Compute IPs for the site for j in `seq 1 ${NUM_COMPUTES_PER_SITE}`; do @@ -1439,6 +1416,7 @@ for suite in ${SUITES}; do -v HA_PROXY_2_IP:${HA_PROXY_2_IP} \ -v HA_PROXY_3_IP:${HA_PROXY_3_IP} \ -v JDKVERSION:${JDKVERSION} \ + -v JENKINS_WORKSPACE:${WORKSPACE} \ -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \ -v NUM_ODL_SYSTEM:${NUM_ODL_SYSTEM} \ -v NUM_OPENSTACK_SITES:${NUM_OPENSTACK_SITES} \ diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh index f28711cd8..542b0dcc1 100644 --- a/jjb/integration/integration-detect-variables.sh +++ b/jjb/integration/integration-detect-variables.sh @@ -8,29 +8,29 @@ DISTROBRANCH="${DISTROBRANCH:-$GERRIT_BRANCH}" if [ ${BUNDLE_URL} == 'last' ]; then # Obtain current pom.xml of integration/distribution, correct branch. wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml" - # Extract the BUNDLEVERSION from the pom.xml - BUNDLEVERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)" - echo "Bundle version is ${BUNDLEVERSION}" + # Extract the BUNDLE_VERSION from the pom.xml + BUNDLE_VERSION="$(xpath pom.xml '/project/version/text()' 2> /dev/null)" + echo "Bundle version is ${BUNDLE_VERSION}" # Acquire the timestamp information from maven-metadata.xml NEXUSPATH="${NEXUSURL_PREFIX}/${ODL_NEXUS_REPO}/org/opendaylight/integration/${KARAF_ARTIFACT}" - wget "${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml" + wget "${NEXUSPATH}/${BUNDLE_VERSION}/maven-metadata.xml" less "maven-metadata.xml" TIMESTAMP="$(xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null)" echo "Nexus timestamp is ${TIMESTAMP}" - BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}" + BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}" BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip" - ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}" + ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLE_VERSION}/${BUNDLE}" else ACTUAL_BUNDLE_URL="${BUNDLE_URL}" BUNDLE="${BUNDLE_URL##*/}" ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")" - BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")" - BUNDLEFOLDER="${ARTIFACT}-${BUNDLEVERSION}" + BUNDLE_VERSION="$(basename "$(dirname "${BUNDLE_URL}")")" + BUNDLEFOLDER="${ARTIFACT}-${BUNDLE_VERSION}" fi echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}" echo "Distribution bundle is ${BUNDLE}" -echo "Distribution bundle version is ${BUNDLEVERSION}" +echo "Distribution bundle version is ${BUNDLE_VERSION}" echo "Distribution folder is ${BUNDLEFOLDER}" echo "Nexus prefix is ${NEXUSURL_PREFIX}" @@ -38,7 +38,7 @@ echo "Nexus prefix is ${NEXUSURL_PREFIX}" cat > "${WORKSPACE}/detect_variables.env" < + infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron + lispflowmapping openflowplugin coe genius sfc netvirt + + - oxygen: + branch: 'stable/oxygen' + mvn-version: 'mvn35' + csit-list: !include: csit-jobs-oxygen.lst + build-order: > + infrautils mdsal controller aaa netconf daexim bgpcep ovsdb neutron + lispflowmapping openflowplugin coe genius sfc netvirt + +- project: + name: integration-distribution + project: integration/test + project-name: integration-test + jobs: + - 'integration-distribution-test-{stream}' + - 'integration-distribution-weekly-test-trigger-{stream}' + - 'integration-distribution-high-frequency-test-trigger-{stream}' + - 'integration-update-csit-tests-{stream}' + # CSIT Lists in releng-defaults.yaml stream: - fluorine: @@ -29,52 +52,41 @@ l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip csit-list: !include: csit-jobs-fluorine.lst - csit-sanity-list: '{csit-sanity-list-fluorine}' csit-weekly-list: '{csit-weekly-list-fluorine}' csit-high-frequency-list: '{csit-high-frequency-list-fluorine}' - mvn-version: 'mvn33' - oxygen: branch: 'stable/oxygen' csit-blacklist: > capwap centinel coe didm iotdm jsonrpc lacp messaging4transport netide nic ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip csit-list: !include: csit-jobs-oxygen.lst - csit-sanity-list: '{csit-sanity-list-oxygen}' csit-weekly-list: '{csit-weekly-list-oxygen}' csit-high-frequency-list: '{csit-high-frequency-list-oxygen}' - mvn-version: 'mvn33' - - - nitrogen: - branch: 'stable/nitrogen' - csit-blacklist: capwap centinel coe didm iotdm jsonrpc lacp netide tsdr gate longevity sanity tdd wip - csit-list: !include: csit-jobs-nitrogen.lst - csit-sanity-list: '{csit-sanity-list-nitrogen}' - csit-weekly-list: '{csit-weekly-list-nitrogen}' - csit-high-frequency-list: '{csit-high-frequency-list-nitrogen}' - mvn-version: 'mvn33' - - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - csit-blacklist: capwap centinel coe jsonrpc gate longevity sanity tdd wip - csit-list: !include: csit-jobs-carbon.lst - csit-sanity-list: '{csit-sanity-list-carbon}' - csit-weekly-list: '{csit-weekly-list-carbon}' - csit-high-frequency-list: '{csit-high-frequency-list-carbon}' - mvn-version: 'mvn33' - - # tools system image - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 - -# Template: integration-distribution-test-{stream} -# Goal: Verify a distribution through all system test available -# Operation: This template takes a distribution and passes all available system test + +- project: + name: integration-sanity + project: integration/test + project-name: integration-test + jobs: + - 'integration-sanity-test-{stream}' + + stream: + - fluorine: + branch: 'master' + karaf-version: odl + csit-sanity-list: '{csit-sanity-list-fluorine}' + - oxygen: + branch: 'stable/oxygen' + karaf-version: karaf4 + csit-sanity-list: '{csit-sanity-list-oxygen}' - job-template: name: 'integration-distribution-test-{stream}' + # Goal: Verify a distribution through all system test available + # Operation: This template takes a distribution and passes all available system test project-type: freestyle - node: centos7-robot-2c-8g + node: queue-disttest-2c-1g properties: - opendaylight-infra-properties: @@ -101,15 +113,14 @@ email-prefix: '[integration]' - lf-infra-publish -# Template: integration-sanity-test-{stream} -# Goal: Verify a distribution through sanity test -# Operation: This template takes a distribution and passes sanity test - - job-template: name: 'integration-sanity-test-{stream}' + # Goal: Verify a distribution through sanity test + # Operation: This template takes a distribution and passes sanity test + # This jobs works for both managed & unmanaged distro. project-type: freestyle - node: centos7-robot-2c-8g + node: queue-intque-2c-1g properties: - opendaylight-infra-properties: @@ -121,6 +132,9 @@ - distribution-karaf-version: karaf-version: '{karaf-version}' + triggers: + - timed: '{schedule-daily}' + builders: - trigger-builds: - project: '{csit-sanity-list}' @@ -134,13 +148,12 @@ email-recipients: '{email-recipients}' email-prefix: '[integration]' -# Template: integration-patch-test-{stream} -# Goal: Build a patch and run all available system test on a distribution containing the change -# Operation: This job template builds a patch, creates a distribution containing the patch, and -# triggers the distribution test when test-integration is used in gerrit comments - - job-template: name: 'integration-patch-test-{stream}' + # Template: integration-patch-test-{stream} + # Goal: Build a patch and run all available system test on a distribution containing the change + # Operation: This job template builds a patch, creates a distribution containing the patch, and + # triggers the distribution test when test-integration is used in gerrit comments project-type: freestyle node: centos7-builder-2c-8g @@ -163,7 +176,7 @@ - integration-distribution-git-url: git-url: '{git-url}' - maven-exec: - maven-version: mvn33 + maven-version: mvn35 scm: - integration-gerrit-scm: @@ -202,7 +215,7 @@ global-settings-file: 'global-settings' settings-file: 'integration-settings' - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn35' pom: '$GERRIT_PROJECT/pom.xml' goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -217,7 +230,7 @@ global-settings: global-settings global-settings-type: cfp - maven-target: - maven-version: mvn33 + maven-version: mvn35 pom: distribution/pom.xml goals: | clean install dependency:tree -DoutputFile=dependency_tree.txt @@ -253,7 +266,8 @@ # (if not all) available CSIT jobs. project-type: freestyle - node: centos7-builder-4c-4g + node: centos7-builder-8c-8g + concurrent: true jdk: '{java-version}' properties: @@ -263,6 +277,10 @@ parameters: - patches-to-build-parameter: patches_to_build: '$PATCHES_TO_BUILD' + - build-order-parameter: + build-order: '{build-order}' + - build-fast-parameter: + build-fast: 'false' - run-test-parameter: run-test: 'false' - integration-distribution-branch: @@ -277,8 +295,11 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: mvn33 + - lf-infra-maven-parameters: + mvn-opts: '' + mvn-params: '' + mvn-version: mvn35 + staging-profile-id: '' # Staging repos do not make sense for this job wrappers: - opendaylight-infra-wrappers: @@ -289,7 +310,7 @@ server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: - comment-contains-value: 'multipatch-build:' + comment-contains-value: 'multipatch-build' projects: - project-compare-type: ANT project-pattern: '**' @@ -309,7 +330,7 @@ dist-pom: patch_tester/distribution/pom.xml - conditional-step: condition-kind: boolean-expression - condition-expression: $RUNTEST + condition-expression: $RUN_TEST steps: - trigger-builds: - project: '{csit-list}' @@ -328,7 +349,7 @@ name: 'integration-distribution-weekly-test-trigger-{stream}' project-type: freestyle - node: centos7-robot-2c-8g + node: queue-intque-2c-1g properties: - opendaylight-infra-properties: @@ -360,7 +381,7 @@ name: 'integration-distribution-high-frequency-test-trigger-{stream}' project-type: freestyle - node: centos7-robot-2c-8g + node: queue-intque-2c-1g properties: - opendaylight-infra-properties: @@ -448,10 +469,13 @@ - shell: | git status git add jjb/integration/*.lst - - opendaylight-infra-push-gerrit-patch: - project: "releng/builder" - gerrit-topic: "auto-update-csit-jobs-{stream}" - gerrit-commit-message: "Auto Update CSIT Jobs to run for {stream}" + - lf-infra-push-gerrit-patch: + project: 'releng/builder' + gerrit-user: 'jenkins-$SILO' + gerrit-host: 'git.opendaylight.org' + gerrit-topic: 'auto-update-csit-jobs-{stream}' + gerrit-commit-message: 'Auto Update CSIT Jobs to run for {stream}' + reviewers-email: 'integration-dev@lists.opendaylight.org' publishers: - lf-infra-publish diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh index e9e2bdf82..073db0ebd 100644 --- a/jjb/integration/integration-upload-distribution.sh +++ b/jjb/integration/integration-upload-distribution.sh @@ -2,16 +2,17 @@ set -xeu -o pipefail BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null) -BUNDLE="${KARAF_ARTIFACT}-${BUNDLE_VERSION}.zip" -BUNDLE_FILEPATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}" -ls -l "${BUNDLE_FILEPATH}" +BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}" +BUNDLE="${BUNDLEFOLDER}.zip" +BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}" +ls -l "${BUNDLE_PATH}" LOG_FILE='integration-upload-distribution.log' echo "Uploading distribution to Nexus..." "$MVN" deploy:deploy-file \ --log-file ${LOG_FILE} \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ - -Dfile="${BUNDLE_FILEPATH}" \ + -Dfile="${BUNDLE_PATH}" \ -DrepositoryId=opendaylight-snapshot \ -Durl="$ODLNEXUSPROXY/content/repositories/opendaylight.snapshot/" \ -DgroupId="org.opendaylight.integration.${GERRIT_PROJECT//\//.}" \ @@ -22,10 +23,14 @@ echo "Uploading distribution to Nexus..." cat "${LOG_FILE}" -BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $3}') || true +BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $5}') || true echo "Bundle uploaded to ${BUNDLE_URL}" # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus cat > "${WORKSPACE}/integration-upload-distribution.env" < - l2switch-csit-1node-periodic-host-scalability-daily-only-{stream}, + l2switch-csit-1node--host-scalability-daily-only-{stream}, l2switch-csit-1node-scalability-all-{stream}, l2switch-csit-1node-switch-all-{stream} diff --git a/jjb/l2switch/l2switch.yaml b/jjb/l2switch/l2switch.yaml index e2955c101..ab0fc666c 100644 --- a/jjb/l2switch/l2switch.yaml +++ b/jjb/l2switch/l2switch.yaml @@ -2,7 +2,6 @@ - project: name: l2switch-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -45,53 +44,6 @@ # Used by the release job staging-profile-id: 96fee85953ca0 -- project: - name: l2switch-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/nitrogen' - mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream} - email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96fee85953ca0 - -- project: - name: l2switch-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'l2switch' - project-name: 'l2switch' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'l2switch-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream}, - openflowplugin-merge-{stream} - email-upstream: '[l2switch] [odlparent] [yangtools] [controller] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96fee85953ca0 - - project: name: l2switch-sonar jobs: diff --git a/jjb/lacp/lacp-csit-lacp.yaml b/jjb/lacp/lacp-csit-lacp.yaml index 1cf3cabbd..4996065d7 100644 --- a/jjb/lacp/lacp-csit-lacp.yaml +++ b/jjb/lacp/lacp-csit-lacp.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/lacp/lacp.yaml b/jjb/lacp/lacp.yaml index c089d6123..cdeed106f 100644 --- a/jjb/lacp/lacp.yaml +++ b/jjb/lacp/lacp.yaml @@ -2,7 +2,6 @@ - project: name: lacp-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: 96ff6c0ff6ab1 -- project: - name: lacp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'lacp' - project-name: 'lacp' - branch: 'stable/nitrogen' - mvn-settings: 'lacp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' - email-upstream: '[lacp] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96ff6c0ff6ab1 - -- project: - name: lacp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'lacp' - project-name: 'lacp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'lacp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream},openflowplugin-merge-{stream}' - email-upstream: '[lacp] [openflowjava] [openflowplugin]' - - # Used by the release job - staging-profile-id: 96ff6c0ff6ab1 - - project: name: lacp-sonar jobs: diff --git a/jjb/lf-infra/lf-infra-jobs.yaml b/jjb/lf-infra/lf-infra-jobs.yaml index 3d83608ce..1472f1d1b 100644 --- a/jjb/lf-infra/lf-infra-jobs.yaml +++ b/jjb/lf-infra/lf-infra-jobs.yaml @@ -31,11 +31,14 @@ - project: name: lf-infra-common-packer jobs: + - '{project-name}-rtd-jobs' - gerrit-tox-verify project-name: lf-infra-common-packer project: releng/common-packer build-node: centos7-builder-2c-8g + rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-common-packer/38930/ + rtd-token: 0cdf727cc22f8f888ffec0e69f46d89031018776 stream: any branch: '*' @@ -52,7 +55,8 @@ project: releng/docs project-pattern: releng/docs build-node: centos7-builder-2c-1g - rtd-project: lf-releng-docs + rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-docs/32930/ + rtd-token: e02d61c268c3cc11b65ef169ff199dbb82989647 stream: any branch: '*' @@ -69,7 +73,8 @@ project: releng/docs-conf project-pattern: releng/docs-conf build-node: centos7-builder-2c-1g - rtd-project: lfdocs-conf + rtd-build-url: https://readthedocs.org/api/v2/webhook/lfdocs-conf/32931/ + rtd-token: 27a59073490f2cefab41761dc225ac8c8bfdf028 stream: any branch: '*' @@ -86,23 +91,8 @@ project: releng/global-jjb project-pattern: releng/global-jjb build-node: centos7-builder-2c-8g - rtd-project: lf-releng-global-jjb - stream: any - branch: '*' - - git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT - gerrit-server-name: LinuxFoundation - -- project: - name: lf-infra-lf-ansible - jobs: - - gerrit-tox-verify - - project-name: lf-infra-lf-ansible - project: releng/lf-ansible - project-pattern: releng/lf-ansible - build-node: centos7-docker-2c-8g - build-timeout: 60 + rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-global-jjb/32932/ + rtd-token: f19058af6f90e04dff828e3eec5e2f0990895a7b stream: any branch: '*' @@ -119,7 +109,8 @@ project: releng/lftools project-pattern: releng/lftools build-node: centos7-builder-2c-8g - rtd-project: lf-releng-tools + rtd-build-url: https://readthedocs.org/api/v2/webhook/lf-releng-tools/32933/ + rtd-token: 47a135ceba9053c6f88394a7171ebf5602a9fc95 stream: any branch: '*' diff --git a/jjb/lfn/lfn.yaml b/jjb/lfn/lfn.yaml new file mode 100644 index 000000000..d43a06778 --- /dev/null +++ b/jjb/lfn/lfn.yaml @@ -0,0 +1,19 @@ +--- +- project: + name: lf-infra-lfn-process + jobs: + - '{project-name}-rtd-jobs' + - gerrit-tox-verify + + project-name: lf-infra-lfn-process + project: lfn/process + project-pattern: lfn/process + build-node: centos7-builder-2c-1g + rtd-build-url: https://readthedocs.org/api/v2/webhook/lfn-process/33719/ + rtd-token: e505b4ae2bf222dcd2b6b08d7b04384ac0459b19 + stream: any + branch: '*' + + git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT + gerrit-server-name: LinuxFoundation + diff --git a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml index fb0a4f21b..3ed9a6506 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-msmr.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml index 01b9e23ba..85662fa09 100644 --- a/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml +++ b/jjb/lispflowmapping/lispflowmapping-csit-performance.yaml @@ -16,18 +16,13 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: scope: 'only' # Job instance type - odl_system_flavor: 'v2-highcpu-8' + odl_system_flavor: 'odl-highcpu-8' # Features to install install-features: 'odl-lispflowmapping-msmr' diff --git a/jjb/lispflowmapping/lispflowmapping.yaml b/jjb/lispflowmapping/lispflowmapping.yaml index d3fc860f9..a14c7ffc8 100644 --- a/jjb/lispflowmapping/lispflowmapping.yaml +++ b/jjb/lispflowmapping/lispflowmapping.yaml @@ -49,53 +49,6 @@ # Used by the release job staging-profile-id: 96fff2503b766 -- project: - name: lispflowmapping-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/nitrogen' - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' - dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' - email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - archive-artifacts: > - **/*.log - **/target/surefire-reports/*-output.txt - - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: 96fff2503b766 - -- project: - name: lispflowmapping-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'lispflowmapping' - project-name: 'lispflowmapping' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'lispflowmapping-settings' - mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true' - dependencies: 'controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream},neutron-merge-{stream}' - email-upstream: '[lispflowmapping] [controller] [odlparent] [yangtools] [neutron]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: 96fff2503b766 - - project: name: lispflowmapping-sonar jobs: diff --git a/jjb/mdsal/mdsal-csit-bindingv1.yaml b/jjb/mdsal/mdsal-csit-bindingv1.yaml index 6e6075725..70cebc427 100644 --- a/jjb/mdsal/mdsal-csit-bindingv1.yaml +++ b/jjb/mdsal/mdsal-csit-bindingv1.yaml @@ -2,7 +2,7 @@ - project: name: mdsal-csit-bindingv1 jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # The project name project: 'mdsal' @@ -15,12 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - robot-options: '-v JAVA_OPTIONS:-Xmx6656m' install: - only: @@ -28,7 +22,7 @@ # No tools system VMs needed, but ODL system needs RAM and benefits from CPUs. tools_system_count: 0 - odl_system_flavor: v2-standard-4 + odl_system_flavor: odl-standard-4 # Features to install install-features: 'odl-restconf' diff --git a/jjb/mdsal/mdsal-patch-test.yaml b/jjb/mdsal/mdsal-patch-test.yaml new file mode 100644 index 000000000..136bd4936 --- /dev/null +++ b/jjb/mdsal/mdsal-patch-test.yaml @@ -0,0 +1,30 @@ +--- +- project: + name: mdsal-patch-test + jobs: + - inttest-patch-test + + project: 'mdsal' + + stream: + - fluorine: + branch: 'master' + os-branch: 'queens' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'queens' + + jdk: 'openjdk8' + + feature: + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} + + - cluster-netvirt: + csit-list: > + netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/mdsal/mdsal.yaml b/jjb/mdsal/mdsal.yaml index dd0a04631..2f9a39a92 100644 --- a/jjb/mdsal/mdsal.yaml +++ b/jjb/mdsal/mdsal.yaml @@ -45,49 +45,6 @@ # Used by the release job staging-profile-id: a674173c7b29d -- project: - name: mdsal-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/nitrogen' - build-node: centos7-builder-8c-8g - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a674173c7b29d - -- project: - name: mdsal-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'mdsal' - project-name: 'mdsal' - branch: 'stable/carbon' - build-node: centos7-builder-8c-8g - karaf-version: karaf3 - mvn-settings: 'mdsal-settings' - mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[mdsal] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a674173c7b29d - - project: name: mdsal-sonar jobs: diff --git a/jjb/messaging4transport/messaging4transport-csit-basic.yaml b/jjb/messaging4transport/messaging4transport-csit-basic.yaml index c6afc49a0..3c620626f 100644 --- a/jjb/messaging4transport/messaging4transport-csit-basic.yaml +++ b/jjb/messaging4transport/messaging4transport-csit-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/messaging4transport/messaging4transport.yaml b/jjb/messaging4transport/messaging4transport.yaml index b27a82795..f1cc04467 100644 --- a/jjb/messaging4transport/messaging4transport.yaml +++ b/jjb/messaging4transport/messaging4transport.yaml @@ -2,7 +2,6 @@ - project: name: messaging4transport-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: a677283157db4 -- project: - name: messaging4transport-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'messaging4transport' - project-name: 'messaging4transport' - branch: 'stable/nitrogen' - mvn-settings: 'messaging4transport-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[messaging4transport]' - - # Used by the release job - staging-profile-id: a677283157db4 - -- project: - name: messaging4transport-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'messaging4transport' - project-name: 'messaging4transport' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'messaging4transport-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[messaging4transport]' - - # Used by the release job - staging-profile-id: a677283157db4 - - project: name: messaging4transport-sonar jobs: diff --git a/jjb/natapp/natapp-csit-basic.yaml b/jjb/natapp/natapp-csit-basic.yaml deleted file mode 100644 index cf2700191..000000000 --- a/jjb/natapp/natapp-csit-basic.yaml +++ /dev/null @@ -1,28 +0,0 @@ ---- -- project: - name: natapp-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'natapp' - - # The functionality under test - functionality: 'basic' - - # Project branches - stream: - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf, odl-natapp' - - # Robot custom options - robot-options: '' diff --git a/jjb/natapp/natapp.yaml b/jjb/natapp/natapp.yaml index 5bffab748..f42bc0c8a 100644 --- a/jjb/natapp/natapp.yaml +++ b/jjb/natapp/natapp.yaml @@ -2,7 +2,6 @@ - project: name: natapp-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: a679c0f4f08a8 -- project: - name: natapp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'natapp' - project-name: 'natapp' - branch: 'stable/nitrogen' - mvn-settings: 'natapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[natapp] [openflowplugin]' - - # Used by the release job - staging-profile-id: a679c0f4f08a8 - -- project: - name: natapp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'natapp' - project-name: 'natapp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'natapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[natapp] [openflowplugin]' - - # Used by the release job - staging-profile-id: a679c0f4f08a8 - - project: name: natapp-sonar jobs: diff --git a/jjb/nemo/nemo-csit-engine.yaml b/jjb/nemo/nemo-csit-engine.yaml index 8ffa8fd78..e856c23bc 100644 --- a/jjb/nemo/nemo-csit-engine.yaml +++ b/jjb/nemo/nemo-csit-engine.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/nemo/nemo.yaml b/jjb/nemo/nemo.yaml index 49d944258..97c35cdbe 100644 --- a/jjb/nemo/nemo.yaml +++ b/jjb/nemo/nemo.yaml @@ -2,7 +2,6 @@ - project: name: nemo-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a67a9890f6202 -- project: - name: nemo-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'nemo' - project-name: 'nemo' - branch: 'stable/nitrogen' - mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - - # Used by the release job - staging-profile-id: a67a9890f6202 - -- project: - name: nemo-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'nemo' - project-name: 'nemo' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'nemo-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[nemo]' - - # Used by the release job - staging-profile-id: a67a9890f6202 - - project: name: nemo-sonar jobs: diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml index 122759990..e107549d2 100644 --- a/jjb/netconf/netconf-cluster-stress.yaml +++ b/jjb/netconf/netconf-cluster-stress.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-clustering-scale.yaml b/jjb/netconf/netconf-clustering-scale.yaml index 46ad660fc..35393c283 100644 --- a/jjb/netconf/netconf-clustering-scale.yaml +++ b/jjb/netconf/netconf-clustering-scale.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-clustering-scale jobs: - - inttest-csit-3node-periodic + - inttest-csit-3node # The project name project: 'netconf' @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-clustering.yaml b/jjb/netconf/netconf-clustering.yaml index 1cc6053f4..0deef710b 100644 --- a/jjb/netconf/netconf-clustering.yaml +++ b/jjb/netconf/netconf-clustering.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf-csit-callhome.yaml b/jjb/netconf/netconf-csit-callhome.yaml index 9579718bc..0a400d422 100644 --- a/jjb/netconf/netconf-csit-callhome.yaml +++ b/jjb/netconf/netconf-csit-callhome.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/netconf/netconf-patch-test.yaml b/jjb/netconf/netconf-patch-test.yaml index c64b959d0..3834975a3 100644 --- a/jjb/netconf/netconf-patch-test.yaml +++ b/jjb/netconf/netconf-patch-test.yaml @@ -4,23 +4,30 @@ jobs: - inttest-patch-test - # The project name project: 'netconf' - # Project branches stream: - fluorine: branch: 'master' + os-branch: 'queens' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 + os-branch: 'queens' feature: - core: csit-list: > netconf-csit-1node-gate-userfeatures-all-{stream}, netconf-csit-1node-gate-callhome-only-{stream} + + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} + + - cluster-netvirt: + csit-list: > + netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/netconf/netconf-scale.yaml b/jjb/netconf/netconf-scale.yaml index 0b5bc974e..7c63b90f2 100644 --- a/jjb/netconf/netconf-scale.yaml +++ b/jjb/netconf/netconf-scale.yaml @@ -2,7 +2,7 @@ - project: name: netconf-csit-scale jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # The project name project: 'netconf' @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: @@ -37,4 +32,4 @@ robot-options: '-v USE_NETCONF_CONNECTOR:False' # ODL system configuration - odl_system_flavor: v2-standard-4 + odl_system_flavor: odl-standard-4 diff --git a/jjb/netconf/netconf-userfeatures.yaml b/jjb/netconf/netconf-userfeatures.yaml index 90f876065..9b6af63a8 100644 --- a/jjb/netconf/netconf-userfeatures.yaml +++ b/jjb/netconf/netconf-userfeatures.yaml @@ -19,11 +19,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netconf/netconf.yaml b/jjb/netconf/netconf.yaml index 5e5054050..67246a2fd 100644 --- a/jjb/netconf/netconf.yaml +++ b/jjb/netconf/netconf.yaml @@ -41,47 +41,6 @@ # Used by the release job staging-profile-id: a67b22fc3663f -- project: - name: netconf-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'netconf' - project-name: 'netconf' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'netconf-settings' - mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a67b22fc3663f - -- project: - name: netconf-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'netconf' - project-name: 'netconf' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'netconf-settings' - mvn-goals: 'clean deploy -Pintegrationtests' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true' - dependencies: 'aaa-merge-{stream},controller-merge-{stream},odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[netconf] [aaa] [controller] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: a67b22fc3663f - - project: name: netconf-sonar jobs: diff --git a/jjb/netide/netide-csit-basic.yaml b/jjb/netide/netide-csit-basic.yaml index c45a2ca2a..7677a6596 100644 --- a/jjb/netide/netide-csit-basic.yaml +++ b/jjb/netide/netide-csit-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/netide/netide.yaml b/jjb/netide/netide.yaml index 732afd3c1..8fbfacff1 100644 --- a/jjb/netide/netide.yaml +++ b/jjb/netide/netide.yaml @@ -2,7 +2,6 @@ - project: name: netide-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a67bab3755815 -- project: - name: netide-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'netide' - project-name: 'netide' - branch: 'stable/nitrogen' - mvn-settings: 'netide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream}' - email-upstream: '[netide] [openflowjava]' - - # Used by the release job - staging-profile-id: a67bab3755815 - -- project: - name: netide-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'netide' - project-name: 'netide' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'netide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowjava-merge-{stream}' - email-upstream: '[netide] [openflowjava]' - - # Used by the release job - staging-profile-id: a67bab3755815 - - project: name: netide-sonar jobs: diff --git a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml index 6aff8bf1e..86cf45cc6 100644 --- a/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml @@ -12,9 +12,9 @@ enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 + odl_system_flavor: odl-standard-8 + openstack_system_flavor: odl-standard-8 + openstack_system2_flavor: odl-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 @@ -23,12 +23,12 @@ topology: - 1node: - openstack_system2_count: 1 + openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system2_count: 1 + openstack_system2_count: 2 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' @@ -65,9 +65,9 @@ enable-openstack-services: 'placement-api,l2gw-plugin' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 + odl_system_flavor: odl-standard-8 + openstack_system_flavor: odl-standard-8 + openstack_system2_flavor: odl-standard-4 tools_system_count: 2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 @@ -76,12 +76,12 @@ topology: - 1node: - openstack_system2_count: 1 + openstack_system2_count: 2 odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' - 3node: - openstack_system2_count: 1 + openstack_system2_count: 2 odl_system_count: 3 enable-haproxy: 'yes' install-features: 'odl-jolokia,odl-netvirt-openstack' @@ -104,110 +104,3 @@ odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-nitrogen - jobs: - - inttest-csit-hwvtep-openstack - - project: 'netvirt' - stream: 'nitrogen' - branch: 'stable/nitrogen' - testplan: '{project}-{topology}-l2gw-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - - topology: - - 1node: - openstack_system2_count: 1 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 1 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful - - gate-stateful - - openstack: - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - -- project: - name: netvirt-csit-hwvtep-openstack-integration-carbon - jobs: - - inttest-csit-hwvtep-openstack - - project: 'netvirt' - stream: 'carbon' - branch: 'stable/carbon' - karaf-version: karaf3 - testplan: '{project}-{topology}-l2gw-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,l2gw-plugin' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 - tools_system_count: 2 - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-26 - 20171208-1847 - - # TODO: remove this flag and instead use the enable-openstack-services list to know if l2gw is enabled - enable-networking-l2gw: 'yes' - - topology: - - 1node: - openstack_system2_count: 1 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 1 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful - - gate-stateful - - openstack: - - ocata: - openstack-branch: 'stable/ocata' - odl-ml2-branch: 'stable/ocata' - openstack_system_image: '{openstack_system_image_ocata}' - openstack_system2_image: '{openstack_system_image_ocata}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' diff --git a/jjb/netvirt/netvirt-csit-multi-openstack.yaml b/jjb/netvirt/netvirt-csit-multi-openstack.yaml index 6f525f57f..b88655e37 100644 --- a/jjb/netvirt/netvirt-csit-multi-openstack.yaml +++ b/jjb/netvirt/netvirt-csit-multi-openstack.yaml @@ -12,9 +12,9 @@ enable-openstack-services: 'placement-api,tempest' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 + odl_system_flavor: odl-standard-8 + openstack_system_flavor: odl-standard-8 + openstack_system2_flavor: odl-standard-4 topology: - 1node: @@ -71,9 +71,9 @@ enable-openstack-services: 'placement-api,tempest' enable-openstack-compute-services: 'placement-client' security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 + odl_system_flavor: odl-standard-8 + openstack_system_flavor: odl-standard-8 + openstack_system2_flavor: odl-standard-4 topology: - 1node: @@ -81,6 +81,7 @@ odl_system_count: 1 enable-haproxy: 'no' install-features: 'odl-netvirt-openstack' + robot-options: '-v FAIL_ON_EXCEPTIONS:True' - 3node: openstack_system2_count: 3 odl_system_count: 3 @@ -116,115 +117,6 @@ openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' -- project: - name: netvirt-csit-openstack-integration-nitrogen - jobs: - - inttest-csit-openstack - - project: 'netvirt' - stream: 'nitrogen' - branch: 'stable/nitrogen' - testplan: '{project}-{topology}-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,tempest' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful - - upstream-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - gate-stateful - - gate-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - gate-minimal-cluster: - testplan: '{project}-{topology}-minimal-openstack.txt' - - openstack: - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - queens: - openstack-branch: 'stable/queens' - odl-ml2-branch: 'stable/queens' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - -- project: - name: netvirt-csit-openstack-integration-carbon - jobs: - - inttest-csit-openstack - - project: 'netvirt' - stream: 'carbon' - branch: 'stable/carbon' - karaf-version: karaf3 - testplan: '{project}-{topology}-openstack.txt' - odl-ml2-driver-version: 'v2' - enable-openstack-services: 'placement-api,tempest' - enable-openstack-compute-services: 'placement-client' - security-group-mode: 'stateful' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - openstack_system2_flavor: v2-standard-4 - - topology: - - 1node: - openstack_system2_count: 2 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-netvirt-openstack' - - 3node: - openstack_system2_count: 3 - odl_system_count: 3 - enable-haproxy: 'yes' - install-features: 'odl-jolokia,odl-netvirt-openstack' - - functionality: - - upstream-stateful: - schedule: '@daily' - - upstream-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - schedule: '@daily' - - gate-stateful - - gate-stateful-snat-conntrack: - odl-snat-mode: 'conntrack' - - openstack: - - ocata: - openstack-branch: 'stable/ocata' - odl-ml2-branch: 'stable/ocata' - openstack_system_image: '{openstack_system_image_ocata}' - openstack_system2_image: '{openstack_system_image_ocata}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - odl-ml2-port-binding: 'pseudo-agentdb-binding' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - - project: name: netvirt-csit-sfc-openstack-integration jobs: @@ -232,8 +124,8 @@ project: 'netvirt' security-group-mode: 'stateful' - odl_system_flavor: v2-standard-4 - openstack_system2_flavor: v2-standard-2 + odl_system_flavor: odl-standard-4 + openstack_system2_flavor: odl-standard-2 topology: - 1node: @@ -250,19 +142,15 @@ testplan: '{project}-extensions-sfc.txt' stream: - - oxygen: + - fluorine: branch: 'master' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 + - oxygen: + branch: 'stable/oxygen' openstack: - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' + - queens: + openstack-branch: 'stable/queens' + odl-ml2-branch: 'stable/queens' odl-ml2-port-binding: 'pseudo-agentdb-binding' openstack_system_image: '{openstack_system_image_pike}' openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' diff --git a/jjb/netvirt/netvirt-full-integration.yaml b/jjb/netvirt/netvirt-full-integration.yaml index bb4852f00..9b8698c7a 100644 --- a/jjb/netvirt/netvirt-full-integration.yaml +++ b/jjb/netvirt/netvirt-full-integration.yaml @@ -9,11 +9,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 project: 'netvirt' archive-artifacts: '*.log **/target/surefire-reports/*.txt' diff --git a/jjb/netvirt/netvirt-patch-test.yaml b/jjb/netvirt/netvirt-patch-test.yaml index 73b3adb16..d9369a109 100644 --- a/jjb/netvirt/netvirt-patch-test.yaml +++ b/jjb/netvirt/netvirt-patch-test.yaml @@ -15,13 +15,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/netvirt/netvirt.yaml b/jjb/netvirt/netvirt.yaml index 50b654e6f..4024faed8 100644 --- a/jjb/netvirt/netvirt.yaml +++ b/jjb/netvirt/netvirt.yaml @@ -8,7 +8,8 @@ build-node: centos7-builder-2c-2g doc-dir: .tox/docs/tmp/html project-pattern: netvirt - rtd-project: odl-netvirt + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-netvirt/32929/ + rtd-token: 7b6a1dcfc729957ace511e016274e253e07a8d6c - gerrit-tox-verify - odl-maven-jobs @@ -17,11 +18,7 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 + project: 'netvirt' project-name: 'netvirt' mvn-settings: 'netvirt-settings' diff --git a/jjb/neutron/neutron-patch-test.yaml b/jjb/neutron/neutron-patch-test.yaml new file mode 100644 index 000000000..ec10ee5b7 --- /dev/null +++ b/jjb/neutron/neutron-patch-test.yaml @@ -0,0 +1,22 @@ +--- +- project: + name: neutron-patch-test + jobs: + - inttest-patch-test + + project: 'neutron' + + stream: + - fluorine: + branch: 'master' + os-branch: 'queens' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'queens' + + jdk: 'openjdk8' + + feature: + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} diff --git a/jjb/neutron/neutron.yaml b/jjb/neutron/neutron.yaml index 766bd81c7..48bd2756b 100644 --- a/jjb/neutron/neutron.yaml +++ b/jjb/neutron/neutron.yaml @@ -39,47 +39,6 @@ # Used by the release job staging-profile-id: a67e1b40d7419 -- project: - name: neutron-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'neutron' - project-name: 'neutron' - build-timeout: 60 - branch: 'stable/nitrogen' - mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - - # Used by the release job - staging-profile-id: a67e1b40d7419 - -- project: - name: neutron-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'neutron' - project-name: 'neutron' - build-timeout: 60 - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'neutron-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},aaa-merge-{stream}' - email-upstream: '[neutron] [odlparent] [aaa]' - - # Used by the release job - staging-profile-id: a67e1b40d7419 - - project: name: neutron-sonar jobs: diff --git a/jjb/next/next.yaml b/jjb/next/next.yaml index b160dc6d3..86b6a16d8 100644 --- a/jjb/next/next.yaml +++ b/jjb/next/next.yaml @@ -2,7 +2,6 @@ - project: name: next-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a67e7c516f385 -- project: - name: next-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'next' - project-name: 'next' - branch: 'stable/nitrogen' - mvn-settings: 'next-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[next]' - - # Used by the release job - staging-profile-id: a67e7c516f385 - -- project: - name: next-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'next' - project-name: 'next' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'next-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[next]' - - # Used by the release job - staging-profile-id: a67e7c516f385 - - project: name: next-sonar jobs: diff --git a/jjb/nic/nic-csit-basic.yaml b/jjb/nic/nic-csit-basic.yaml deleted file mode 100644 index 6d21673ae..000000000 --- a/jjb/nic/nic-csit-basic.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- project: - name: nic-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'nic' - - # The functionality under test - functionality: 'basic' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-nic-intent-common' - - # Robot custom options - robot-options: '' diff --git a/jjb/nic/nic.yaml b/jjb/nic/nic.yaml index bf200779b..8bf2afef3 100644 --- a/jjb/nic/nic.yaml +++ b/jjb/nic/nic.yaml @@ -2,7 +2,6 @@ - project: name: nic-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: a67ef386204aa -- project: - name: nic-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'nic' - project-name: 'nic' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'nic-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' - email-upstream: '[nic] [vtn] [groupbasedpolicy]' - - # Used by the release job - staging-profile-id: a67ef386204aa - -- project: - name: nic-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'nic' - project-name: 'nic' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'nic-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'vtn-merge-{stream},groupbasedpolicy-merge-{stream}' - email-upstream: '[nic] [vtn] [groupbasedpolicy]' - - # Used by the release job - staging-profile-id: a67ef386204aa - - project: name: nic-sonar jobs: diff --git a/jjb/ocpplugin/ocpplugin-csit-basic.yaml b/jjb/ocpplugin/ocpplugin-csit-basic.yaml deleted file mode 100644 index 142e659d8..000000000 --- a/jjb/ocpplugin/ocpplugin-csit-basic.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- project: - name: ocpplugin-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'ocpplugin' - - # The functionality under test - functionality: 'get' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all' - - # Robot custom options - robot-options: '' diff --git a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml b/jjb/ocpplugin/ocpplugin-csit-scalability.yaml deleted file mode 100644 index a7c7c5628..000000000 --- a/jjb/ocpplugin/ocpplugin-csit-scalability.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- project: - name: ocpplugin-csit-scalability - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'ocpplugin' - - # The functionality under test - functionality: 'scalability' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf,odl-l2switch-switch,odl-ocpplugin-all' - - # Robot custom options - robot-options: '' diff --git a/jjb/ocpplugin/ocpplugin.yaml b/jjb/ocpplugin/ocpplugin.yaml index f9e55c810..496e31ec7 100644 --- a/jjb/ocpplugin/ocpplugin.yaml +++ b/jjb/ocpplugin/ocpplugin.yaml @@ -2,7 +2,6 @@ - project: name: ocpplugin-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a687673279f9c -- project: - name: ocpplugin-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'ocpplugin' - project-name: 'ocpplugin' - branch: 'stable/nitrogen' - mvn-settings: 'ocpplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a687673279f9c - -- project: - name: ocpplugin-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'ocpplugin' - project-name: 'ocpplugin' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'ocpplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[ocpplugin] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a687673279f9c - - project: name: ocpplugin-sonar jobs: diff --git a/jjb/odl-openstack-cleanup-old-images.sh b/jjb/odl-openstack-cleanup-old-images.sh index db639d1a4..01e420dde 100644 --- a/jjb/odl-openstack-cleanup-old-images.sh +++ b/jjb/odl-openstack-cleanup-old-images.sh @@ -11,6 +11,6 @@ # Removes openstack images older than 30 days in the cloud echo "---> Cleanup old images" -# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 -source "/tmp/v/lftools/bin/activate" +# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 +source "/tmp/v/openstack/bin/activate" lftools openstack --os-cloud vex image cleanup --days=30 diff --git a/jjb/odl-openstack-cleanup-orphaned-nodes.sh b/jjb/odl-openstack-cleanup-orphaned-nodes.sh index 1b7f0c68e..c3c6b35a2 100644 --- a/jjb/odl-openstack-cleanup-orphaned-nodes.sh +++ b/jjb/odl-openstack-cleanup-orphaned-nodes.sh @@ -50,15 +50,10 @@ source "/tmp/v/openstack/bin/activate" # shellcheck disable=SC2207 mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd') -deactivate - ############################# ## DELETE ORPHANED SERVERS ## ############################# -# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 -source "/tmp/v/lftools/bin/activate" - # Search for servers that are not in use by either releng or sandbox silos and # delete them. for server in "${OS_SERVERS[@]}"; do diff --git a/jjb/odl-openstack-cleanup-stale-nodes.sh b/jjb/odl-openstack-cleanup-stale-nodes.sh index ddd104180..f9af3c8e1 100644 --- a/jjb/odl-openstack-cleanup-stale-nodes.sh +++ b/jjb/odl-openstack-cleanup-stale-nodes.sh @@ -10,13 +10,14 @@ ############################################################################## echo "---> Cleanup stale nodes" +# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 +source "/tmp/v/openstack/bin/activate" + # 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 # skip deleting those nodes. This step may not be required since there is already # 24H timeout in place for all jobs therefore all jobs are expected to complete # within the timeout. -# 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/odl-openstack-cleanup-stale-volumes.sh b/jjb/odl-openstack-cleanup-stale-volumes.sh new file mode 100644 index 000000000..433aecf2c --- /dev/null +++ b/jjb/odl-openstack-cleanup-stale-volumes.sh @@ -0,0 +1,27 @@ +#!/bin/bash +# SPDX-License-Identifier: EPL-1.0 +############################################################################## +# Copyright (c) 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 +############################################################################## +# Scans OpenStack for orphaned volumes + +# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 +source "/tmp/v/openstack/bin/activate" +mapfile -t os_volumes < <(openstack volume list -f value -c ID --status Available) + +echo "---> Orphaned volumes" +if [ ${#os_volumes[@]} -eq 0 ]; then + echo "No orphaned volumes found." +else + for volume in "${os_volumes[@]}"; do + echo "Removing volume $volume" + lftools openstack --os-cloud vex volume remove --minutes 15 "$volume" + done +fi + +deactivate diff --git a/jjb/odl-openstack-install.sh b/jjb/odl-openstack-install.sh index adf7d923a..776b2b858 100644 --- a/jjb/odl-openstack-install.sh +++ b/jjb/odl-openstack-install.sh @@ -14,7 +14,6 @@ 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 +pip install --upgrade "pip<10.0.0" setuptools +pip install --upgrade lftools lftools[openstack] python-openstackclient python-heatclient +pip freeze diff --git a/jjb/odlparent/odlparent-patch-test.yaml b/jjb/odlparent/odlparent-patch-test.yaml new file mode 100644 index 000000000..72c78e929 --- /dev/null +++ b/jjb/odlparent/odlparent-patch-test.yaml @@ -0,0 +1,30 @@ +--- +- project: + name: odlparent-patch-test + jobs: + - inttest-patch-test + + project: 'odlparent' + + stream: + - fluorine: + branch: 'master' + os-branch: 'queens' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'queens' + + jdk: 'openjdk8' + + feature: + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} + + - cluster-netvirt: + csit-list: > + netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml index 24da02383..6b87b0719 100644 --- a/jjb/odlparent/odlparent.yaml +++ b/jjb/odlparent/odlparent.yaml @@ -30,7 +30,7 @@ staging-profile-id: 880d5ac25eaa - project: - name: odlparent-3.1.x + name: odlparent-3.2.x jobs: - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -38,8 +38,8 @@ project: odlparent project-name: odlparent - stream: 3.1.x - branch: 3.1.x + stream: 3.2.x + branch: 3.2.x distribution_branch: master mvn-settings: odlparent-settings @@ -60,7 +60,7 @@ staging-profile-id: 880d5ac25eaa - project: - name: odlparent-3.0.x + name: odlparent-3.1.x jobs: - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -68,8 +68,8 @@ project: odlparent project-name: odlparent - stream: 3.0.x - branch: 3.0.x + stream: 3.1.x + branch: 3.1.x distribution_branch: master mvn-settings: odlparent-settings @@ -90,7 +90,7 @@ staging-profile-id: 880d5ac25eaa - project: - name: odlparent-2.0.x + name: odlparent-3.0.x jobs: - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -98,8 +98,8 @@ project: odlparent project-name: odlparent - stream: 2.0.x - branch: 2.0.x + stream: 3.0.x + branch: 3.0.x distribution_branch: master mvn-settings: odlparent-settings @@ -119,35 +119,6 @@ javadoc-path: org.opendaylight.$PROJECT/$STREAM staging-profile-id: 880d5ac25eaa -- project: - name: odlparent-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - gerrit-tox-verify - - stream: carbon - project: 'odlparent' - project-name: 'odlparent' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'odlparent-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - 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-sonar jobs: diff --git a/jjb/of-config/of-config-csit-basic.yaml b/jjb/of-config/of-config-csit-basic.yaml index a614b7968..5af388393 100644 --- a/jjb/of-config/of-config-csit-basic.yaml +++ b/jjb/of-config/of-config-csit-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/of-config/of-config.yaml b/jjb/of-config/of-config.yaml index c7a309ad8..b9366d2c9 100644 --- a/jjb/of-config/of-config.yaml +++ b/jjb/of-config/of-config.yaml @@ -2,7 +2,6 @@ - project: name: of-config-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a6880455efe67 -- project: - name: of-config-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'of-config' - project-name: 'of-config' - branch: 'stable/nitrogen' - mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - - # Used by the release job - staging-profile-id: a6880455efe67 - -- project: - name: of-config-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'of-config' - project-name: 'of-config' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'of-config-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: netconf-merge-{stream}' - email-upstream: '[of-config] [netconf]' - - # Used by the release job - staging-profile-id: a6880455efe67 - - project: name: of-config-sonar jobs: diff --git a/jjb/ofextensions/circuitsw/circuitsw.yaml b/jjb/ofextensions/circuitsw/circuitsw.yaml index 2cdba4046..4198831a9 100644 --- a/jjb/ofextensions/circuitsw/circuitsw.yaml +++ b/jjb/ofextensions/circuitsw/circuitsw.yaml @@ -33,40 +33,6 @@ # Used by the release job staging-profile-id: a68970cf5b25c -- project: - name: circuitsw-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'ofextensions/circuitsw' - project-name: 'circuitsw' - branch: 'stable/nitrogen' - mvn-settings: 'ofextensions-circuitsw-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[circuitsw]' - - # Used by the release job - staging-profile-id: a68970cf5b25c - -- project: - name: circuitsw-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'ofextensions/circuitsw' - project-name: 'circuitsw' - branch: 'stable/carbon' - mvn-settings: 'ofextensions-circuitsw-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[circuitsw]' - - # Used by the release job - staging-profile-id: a68970cf5b25c - - project: name: circuitsw-sonar jobs: diff --git a/jjb/openci/create-ape.sh b/jjb/openci/create-ape.sh new file mode 100755 index 000000000..3a4c8afaf --- /dev/null +++ b/jjb/openci/create-ape.sh @@ -0,0 +1,29 @@ +#!/bin/bash +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 Ericsson AB and others. +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +set -o errexit +set -o nounset +set -o pipefail + +# This script creates ArtifactPublishedEvent (APE) +# The JMS Messaging Plugin doesn't handle the newlines well so the eventBody is +# constructed on a single line. This is something that needs to be fixed properly + +cat << EOF > $WORKSPACE/event.properties +type=$PUBLISH_EVENT_TYPE +origin=$PUBLISH_EVENT_ORIGIN +eventBody="{ 'type': '$PUBLISH_EVENT_TYPE', 'id': '$(uuidgen)', \ +'time': '$(date -u +%Y-%m-%d_%H:%M:%SUTC)', 'origin': '$PUBLISH_EVENT_ORIGIN', \ +'buildUrl': '$BUILD_URL', 'branch': 'master', 'artifactLocation': '$ARTIFACT_LOCATION', \ +'confidenceLevel': { $CONFIDENCE_LEVEL } }" +EOF +echo "Constructed $PUBLISH_EVENT_TYPE" +echo "--------------------------------------------" +cat $WORKSPACE/event.properties +echo "--------------------------------------------" diff --git a/jjb/openci/openci-odl-daily-jobs.yaml b/jjb/openci/openci-odl-daily-jobs.yaml new file mode 100644 index 000000000..1ef00f0f3 --- /dev/null +++ b/jjb/openci/openci-odl-daily-jobs.yaml @@ -0,0 +1,103 @@ +--- +- project: + name: openci-odl + + project: '{name}' + + stream: + - master: + branch: '{stream}' + gs-pathname: '' + disabled: false + + jobs: + - 'openci-odl-autorelease-daily-{stream}' + - 'openci-odl-promote-daily-{stream}' + +# This job gets triggered manually for the demo purposes. +# +# In prototype, either what this job does needs to be integrated to +# ODL autorelease job or triggered by the upstream autorelease job. +- job-template: + name: 'openci-odl-autorelease-daily-{stream}' + + disabled: '{obj:disabled}' + + concurrent: false + + build-node: centos7-builder-2c-2g + + parameters: + - string: + name: PUBLISH_EVENT_TYPE + default: ArtifactPublishedEvent + description: 'The type of the event this job publishes' + - string: + name: PUBLISH_EVENT_ORIGIN + default: ODL + description: 'Originating community' + - string: + name: ARTIFACT_LOCATION + default: https://url/to/artifact/on/odl/nexus/$BUILD_NUMBER + description: 'The location of the artifact on ODL Nexus' + - string: + name: CONFIDENCE_LEVEL + default: "'autorelease': 'SUCCESS'" + description: 'The confidence level the published artifact gained' + + builders: + # first build step in the job executes create-ape.sh to construct the + # ArtifactPublishedEvent (ape) + - shell: + !include-raw-escape: ./create-ape.sh + # constructed event gets injected into environment so JME Messaging + # plugin can publish the event and its properties in post-build step + - inject: + properties-file: "$WORKSPACE/event.properties" + + publishers: + - jms-messaging: + provider-name: openci.activemq + msg-type: Custom + msg-props: | + type=$type + origin=$origin + msg-content: + $eventBody + +# This job gets triggered by a ConfidenceLevelModifiedEvent published +# by OPNFV jobs so ODL can promote the autorelease artifact even further. +# +# This job is created for the demo purposes and might not be there for +# the prototype. +- job-template: + name: 'openci-odl-promote-daily-{stream}' + + disabled: '{obj:disabled}' + + concurrent: false + + build-node: centos7-builder-2c-2g + + triggers: + - jms-messaging: + provider-name: openci.activemq + selector: CI_TYPE = 'custom' + checks: + - field: origin + expected-value: 'OPNFV' + - field: type + expected-value: 'ConfidenceLevelModifiedEvent' + - field: scenario + expected-value: 'os-odl-nofeature' + + builders: + - shell: | + #!/bin/bash + + echo + echo "Triggered by $type" + echo "----------------------------------" + echo $CI_MESSAGE + echo "----------------------------------" + echo " Promoted ODL Autorelease artifact as release candidate!" diff --git a/jjb/opendaylight-infra-push-gerrit-patch.sh b/jjb/opendaylight-infra-push-gerrit-patch.sh index 0d1a67055..f64da9cbc 100644 --- a/jjb/opendaylight-infra-push-gerrit-patch.sh +++ b/jjb/opendaylight-infra-push-gerrit-patch.sh @@ -15,10 +15,9 @@ virtualenv "/tmp/v/git-review" # shellcheck source=/tmp/v/git-review/bin/activate disable=SC1091 source "/tmp/v/git-review/bin/activate" -pip install --upgrade pip +pip install --upgrade "pip<10.0.0" setuptools pip install --upgrade git-review -pip install --upgrade pipdeptree -pipdeptree +pip freeze # shellcheck disable=SC1083 CHANGE_ID=$(ssh -p 29418 "jenkins-$SILO@git.opendaylight.org" gerrit query \ diff --git a/jjb/opendaylight-infra-stack.sh b/jjb/opendaylight-infra-stack.sh index b3afb0481..af5d2fa13 100644 --- a/jjb/opendaylight-infra-stack.sh +++ b/jjb/opendaylight-infra-stack.sh @@ -12,10 +12,11 @@ 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 +pip install --upgrade "pip<10.0.0" setuptools +# hardcoding cmd2 version as the most recent version seems to be broken. +# reference: https://pypi.org/project/cmd2/#history +pip install --upgrade cmd2==0.8.5 python-openstackclient python-heatclient +pip freeze cd /builder/openstack-hot || exit 1 diff --git a/jjb/opendaylight-infra-update-image-list.sh b/jjb/opendaylight-infra-update-image-list.sh index 20ceb396e..1122dbd60 100644 --- a/jjb/opendaylight-infra-update-image-list.sh +++ b/jjb/opendaylight-infra-update-image-list.sh @@ -12,10 +12,9 @@ virtualenv "/tmp/v/openstack" # shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091 source "/tmp/v/openstack/bin/activate" -pip install --upgrade --quiet pip -pip install --upgrade --quiet python-openstackclient python-heatclient -pip install --upgrade pipdeptree -pipdeptree +pip install --upgrade --quiet "pip<10.0.0" setuptools +pip install --upgrade --quiet python-openstackclient +pip freeze cat > "$WORKSPACE/docs/cloud-images.rst" << EOF Following are the list of published images available to be used with Jenkins jobs. diff --git a/jjb/openflowjava/openflowjava.yaml b/jjb/openflowjava/openflowjava.yaml deleted file mode 100644 index 5a921c0cb..000000000 --- a/jjb/openflowjava/openflowjava.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- project: - name: openflowjava-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'master' - mvn-settings: 'openflowjava-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a68a1507dae22 - -- project: - name: openflowjava-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'openflowjava-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[openflowjava] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a68a1507dae22 - -- project: - name: openflowjava-sonar - jobs: - - gerrit-maven-sonar - project: 'openflowjava' - project-name: 'openflowjava' - branch: 'master' - mvn-settings: 'openflowjava-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml index 00fdc9702..0dbd48791 100644 --- a/jjb/openflowplugin/openflowplugin-csit-cbench.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-cbench.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml index 045b935ad..3bdae033a 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-bulkomatic.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml index bca8ed3d6..e5014dcc9 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml index b93b67675..9dbcd65dc 100644 --- a/jjb/openflowplugin/openflowplugin-csit-clustering.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-clustering.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml index 12df50ccc..abf863557 100644 --- a/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-flow-services.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - all: diff --git a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml index 7705e08f9..936c67d83 100644 --- a/jjb/openflowplugin/openflowplugin-csit-longevity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-longevity.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml index 3d37ea451..7bf25d470 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-bulkomatic.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml index 8a65460cc..e45e444ca 100644 --- a/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-perf-stats-collection.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml index 5fe0ab123..7154b80d0 100644 --- a/jjb/openflowplugin/openflowplugin-csit-sanity.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-sanity.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml index 835926e96..32d727a13 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-link.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml index ff29a4fd9..fb43dd599 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale-switch.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-csit-scale.yaml b/jjb/openflowplugin/openflowplugin-csit-scale.yaml index 9a7c34685..ed891598f 100644 --- a/jjb/openflowplugin/openflowplugin-csit-scale.yaml +++ b/jjb/openflowplugin/openflowplugin-csit-scale.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: 'karaf3' install: - only: diff --git a/jjb/openflowplugin/openflowplugin-patch-test.yaml b/jjb/openflowplugin/openflowplugin-patch-test.yaml index 01a735dcc..6af721d6c 100644 --- a/jjb/openflowplugin/openflowplugin-patch-test.yaml +++ b/jjb/openflowplugin/openflowplugin-patch-test.yaml @@ -15,13 +15,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: 'karaf3' jdk: 'openjdk8' @@ -43,3 +36,7 @@ - cluster-netvirt: csit-list: > netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/openflowplugin/openflowplugin.yaml b/jjb/openflowplugin/openflowplugin.yaml index 356444073..e591415ce 100644 --- a/jjb/openflowplugin/openflowplugin.yaml +++ b/jjb/openflowplugin/openflowplugin.yaml @@ -4,6 +4,12 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: openflowplugin + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ + rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f - odl-maven-jobs stream: fluorine @@ -30,6 +36,12 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + doc-dir: .tox/docs/tmp/html + project-pattern: openflowplugin + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-openflowplugin/38994/ + rtd-token: 86ce095922558b890c61b1b05d682521d1d66d5f - odl-maven-jobs stream: oxygen @@ -51,59 +63,6 @@ # Used by the release job staging-profile-id: a68a76dc1b44c -- project: - name: openflowplugin-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - build-timeout: 90 - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - - # Used by the release job - staging-profile-id: a68a76dc1b44c - -- project: - name: openflowplugin-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'openflowplugin' - project-name: 'openflowplugin' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - build-timeout: 90 - karaf-version: 'karaf3' - mvn-settings: 'openflowplugin-settings' - mvn-goals: 'clean deploy javadoc:aggregate' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: > - odlparent-merge-{stream}, - yangtools-merge-{stream}, - controller-merge-{stream}, - openflowjava-merge-{stream} - email-upstream: '[openflowplugin] [odlparent] [yangtools] [controller] [openflowjava]' - - # Used by the release job - staging-profile-id: a68a76dc1b44c - - project: name: openflowplugin-sonar jobs: diff --git a/jjb/opflex/opflex-custom.yaml b/jjb/opflex/opflex-custom.yaml index 2ace6c4ad..4490a3898 100644 --- a/jjb/opflex/opflex-custom.yaml +++ b/jjb/opflex/opflex-custom.yaml @@ -16,16 +16,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - nitrogen: - branch: 'stable/nitrogen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' - - carbon: - branch: 'stable/carbon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' archive-artifacts: '**/*.tar.gz' diff --git a/jjb/opflex/opflex-dependencies.yaml b/jjb/opflex/opflex-thirdparty-dependencies.yaml similarity index 90% rename from jjb/opflex/opflex-dependencies.yaml rename to jjb/opflex/opflex-thirdparty-dependencies.yaml index b772ead2e..a0f30f724 100644 --- a/jjb/opflex/opflex-dependencies.yaml +++ b/jjb/opflex/opflex-thirdparty-dependencies.yaml @@ -2,9 +2,9 @@ - project: name: opflex-dependencies jobs: - - 'opflex-libuv-{stream}' - - 'opflex-rapidjson-{stream}' - - 'opflex-openvswitch-{stream}' + - 'opflex-thirdparty-libuv-{stream}' + - 'opflex-thirdparty-rapidjson-{stream}' + - 'opflex-thirdparty-openvswitch-{stream}' stream: - oxygen: @@ -12,16 +12,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - nitrogen: - branch: 'stable/nitrogen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' - - carbon: - branch: 'stable/carbon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' @@ -34,7 +24,7 @@ upload-files-dir: '$WORKSPACE/upload_files' - job-template: - name: 'opflex-libuv-{stream}' + name: 'opflex-thirdparty-libuv-{stream}' project-type: freestyle node: centos7-builder-2c-8g @@ -89,7 +79,7 @@ - lf-infra-publish - job-template: - name: 'opflex-rapidjson-{stream}' + name: 'opflex-thirdparty-rapidjson-{stream}' project-type: freestyle node: centos7-builder-2c-8g @@ -144,7 +134,7 @@ - lf-infra-publish - job-template: - name: 'opflex-openvswitch-{stream}' + name: 'opflex-thirdparty-openvswitch-{stream}' project-type: freestyle node: centos7-builder-2c-8g diff --git a/jjb/opflex/opflex.yaml b/jjb/opflex/opflex.yaml index 6e2100179..c3c7a6699 100644 --- a/jjb/opflex/opflex.yaml +++ b/jjb/opflex/opflex.yaml @@ -15,16 +15,6 @@ libuv-version: '1.8.0' rapidjson-version: '1.0.2' openvswitch-version: '2.6.0' - - nitrogen: - branch: 'stable/nitrogen' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' - - carbon: - branch: 'stable/carbon' - libuv-version: '1.8.0' - rapidjson-version: '1.0.2' - openvswitch-version: '2.6.0' project: 'opflex' project-name: 'opflex' diff --git a/jjb/ovsdb/ovsdb-csit-clustering.yaml b/jjb/ovsdb/ovsdb-csit-clustering.yaml index e0e4969a0..d81919881 100644 --- a/jjb/ovsdb/ovsdb-csit-clustering.yaml +++ b/jjb/ovsdb/ovsdb-csit-clustering.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/ovsdb/ovsdb-csit-southbound.yaml b/jjb/ovsdb/ovsdb-csit-southbound.yaml index b88d63f46..bb00aba5f 100644 --- a/jjb/ovsdb/ovsdb-csit-southbound.yaml +++ b/jjb/ovsdb/ovsdb-csit-southbound.yaml @@ -18,11 +18,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/ovsdb/ovsdb-full-integration.yaml b/jjb/ovsdb/ovsdb-full-integration.yaml index 0e24962d8..034696f57 100644 --- a/jjb/ovsdb/ovsdb-full-integration.yaml +++ b/jjb/ovsdb/ovsdb-full-integration.yaml @@ -9,11 +9,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 project: 'ovsdb' archive-artifacts: '*.log' diff --git a/jjb/ovsdb/ovsdb-patch-test.yaml b/jjb/ovsdb/ovsdb-patch-test.yaml index 8495123cb..b1f000bed 100644 --- a/jjb/ovsdb/ovsdb-patch-test.yaml +++ b/jjb/ovsdb/ovsdb-patch-test.yaml @@ -14,13 +14,6 @@ - oxygen: branch: 'stable/oxygen' os-branch: 'queens' - - nitrogen: - branch: 'stable/nitrogen' - os-branch: 'pike' - - carbon: - branch: 'stable/carbon' - os-branch: 'ocata' - karaf-version: karaf3 jdk: 'openjdk8' diff --git a/jjb/ovsdb/ovsdb.yaml b/jjb/ovsdb/ovsdb.yaml index 60064bd31..7fcc646ad 100644 --- a/jjb/ovsdb/ovsdb.yaml +++ b/jjb/ovsdb/ovsdb.yaml @@ -4,6 +4,11 @@ jobs: - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' + - '{project-name}-rtd-jobs': + build-node: centos7-builder-2c-2g + project-pattern: ovsdb + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-ovsdb/35667/ + rtd-token: 46030df8681cf7fc857aa80c1a7695f46ed252be - odl-maven-jobs stream: fluorine @@ -38,44 +43,3 @@ # Used by the release job staging-profile-id: a68b188166958 - -- project: - name: ovsdb-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a68b188166958 - -- project: - name: ovsdb-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'ovsdb' - project-name: 'ovsdb' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'ovsdb-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[ovsdb] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a68b188166958 diff --git a/jjb/p4plugin/p4plugin.yaml b/jjb/p4plugin/p4plugin.yaml index 90802ab73..05c04d967 100644 --- a/jjb/p4plugin/p4plugin.yaml +++ b/jjb/p4plugin/p4plugin.yaml @@ -2,7 +2,6 @@ - project: name: p4plugin-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs diff --git a/jjb/packaging/build-rpm-snap.sh b/jjb/packaging/build-rpm-snap.sh index bcb79b5f8..cffc29bdb 100644 --- a/jjb/packaging/build-rpm-snap.sh +++ b/jjb/packaging/build-rpm-snap.sh @@ -15,11 +15,7 @@ $PYTHON -m pip install --upgrade pip $PYTHON -m pip install -r "$WORKSPACE/packaging/packages/requirements.txt" # Convert stream to numeric ODL major version -if [ "$STREAM" == "carbon" ]; then - VERSION_MAJOR=6 -elif [ "$STREAM" == "nitrogen" ]; then - VERSION_MAJOR=7 -elif [ "$STREAM" == "oxygen" ]; then +if [ "$STREAM" == "oxygen" ]; then VERSION_MAJOR=8 elif [ "$STREAM" == "fluorine" ]; then VERSION_MAJOR=9 @@ -34,4 +30,3 @@ fi --changelog_email "$CHANGELOG_EMAIL" \ latest_snap \ --major "$VERSION_MAJOR" - diff --git a/jjb/packaging/packaging.yaml b/jjb/packaging/packaging.yaml index bb7add2fb..5c862b2ab 100644 --- a/jjb/packaging/packaging.yaml +++ b/jjb/packaging/packaging.yaml @@ -8,7 +8,8 @@ build-node: centos7-builder-2c-2g doc-dir: .tox/docs/tmp/html project-pattern: integration/packaging - rtd-project: odl-integrationpackaging + rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-integrationpackaging/32928/ + rtd-token: 371d63c43ad99b0745bb7779e3488c5e255c1180 - 'packaging-build-rpm-{stream}' - 'packaging-build-rpm-{distro}-snap-{stream}' - 'packaging-build-deb-{stream}' @@ -25,8 +26,6 @@ stream: - fluorine - - carbon - - nitrogen - oxygen distro: - opensuse-42 @@ -68,7 +67,7 @@ - string: name: DOWNLOAD_URL # yamllint disable-line rule:line-length - default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz' + default: 'https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz' description: 'URL to ODL tarball artifact to repackage into RPM' - string: name: CHANGELOG_NAME @@ -200,30 +199,38 @@ build-timeout: '{build-timeout}' builders: - # Test Nitrogen tarball + # Test Oxygen SR1 release tarball - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test Oxygen pre-release autorelease tarball + # Test latest Oxygen snapshot + - inject: + properties-content: 'STREAM=oxygen' + - shell: !include-raw: build-rpm-snap.sh + - install-test-uninstall-rpm + + # Test Fluorine pre-release autorelease tarball + # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2106/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test Oxygen multipatch zip (no parallel tarball available) + # Test Fluorine multipatch zip (no parallel tarball available) + # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180305.133042-180.zip' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test latest Oxygen snapshot + # Test latest Fluorine snapshot - inject: - properties-content: 'STREAM=oxygen' + properties-content: 'STREAM=fluorine' - shell: !include-raw: build-rpm-snap.sh - install-test-uninstall-rpm @@ -273,74 +280,54 @@ build-timeout: '{build-timeout}' builders: - # Test Carbon SR2 tarball + # Test Oxygen SR1 release tarball - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.6.2-Carbon/distribution-karaf-0.6.2-Carbon.tar.gz' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.8.1/karaf-0.8.1.tar.gz' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test Carbon multipatch zip (no parallel tarball available) + # Test Oxygen pre-release autorelease tarball # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/distribution-karaf/0.6.4-SNAPSHOT/distribution-karaf-0.6.4-20180305.151247-2.zip' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test latest Carbon snapshot - - inject: - properties-content: 'STREAM=carbon' - - shell: !include-raw: build-rpm-snap.sh - - install-test-uninstall-rpm - - # Test Nitrogen tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.0/karaf-0.7.0.tar.gz' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2192/org/opendaylight/integration/karaf/0.8.2/karaf-0.8.2.tar.gz' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test Nitrogen SR1 tarball - - inject: - # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/karaf/0.7.1/karaf-0.7.1.tar.gz' - - shell: !include-raw-escape: build-rpm.sh - - install-test-uninstall-rpm - - # Test Nitrogen multipatch zip (no parallel tarball available) + # Test Oxygen multipatch zip (no parallel tarball available) # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.7.3-SNAPSHOT/karaf-0.7.3-20180305.153647-3.zip' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.2-SNAPSHOT/karaf-0.8.2-20180524.145206-1.zip' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test latest Nitrogen snapshot + # Test latest Oxygen snapshot - inject: - properties-content: 'STREAM=nitrogen' + properties-content: 'STREAM=oxygen' - shell: !include-raw: build-rpm-snap.sh - install-test-uninstall-rpm - # Test Oxygen pre-release autorelease tarball + # Test Fluorine pre-release autorelease tarball # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2106/org/opendaylight/integration/karaf/0.8.0/karaf-0.8.0.tar.gz' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/autorelease-2191/org/opendaylight/integration/karaf/0.9.0/karaf-0.9.0.tar.gz' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test Oxygen multipatch zip (no parallel tarball available) + # Test Fluorine multipatch zip (no parallel tarball available) # NB: This will need to be updated as old builds expire - inject: # yamllint disable-line rule:line-length - properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.0-SNAPSHOT/karaf-0.8.0-20180305.133042-180.zip' + properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180531.192226-59.zip' - shell: !include-raw-escape: build-rpm.sh - install-test-uninstall-rpm - # Test latest Oxygen snapshot + # Test latest Fluorine snapshot - inject: - properties-content: 'STREAM=oxygen' + properties-content: 'STREAM=fluorine' - shell: !include-raw: build-rpm-snap.sh - install-test-uninstall-rpm @@ -377,7 +364,7 @@ - string: name: URL # yamllint disable-line rule:line-length - default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-8-devel.repo' + default: 'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo' description: 'Link to .repo or .rpm file' scm: @@ -431,12 +418,12 @@ - string: name: URL # yamllint disable-line rule:line-length - default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-release.repo' + default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-8-release.repo' description: 'Link to .repo or .rpm file' - string: name: UPGRADE_URL # yamllint disable-line rule:line-length - default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-7-devel.repo' + default: 'https://raw.githubusercontent.com/opendaylight/integration-packaging/master/packages/rpm/example_repo_configs/opendaylight-8-devel.repo' description: 'Link to .repo or .rpm file' scm: @@ -483,7 +470,7 @@ artifacts: '{archive-artifacts}' - string: name: PACKAGE - default: 'ppa:odl-team/nitrogen' + default: 'ppa:odl-team/oxygen' description: 'Link to .deb package or name of PPA repo' scm: diff --git a/jjb/packaging/puppet.yaml b/jjb/packaging/puppet.yaml index 0ec0a7b38..0fd69b51c 100644 --- a/jjb/packaging/puppet.yaml +++ b/jjb/packaging/puppet.yaml @@ -15,10 +15,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - job-template: name: '{project-name}-test-sanity-{stream}' diff --git a/jjb/packaging/test-ports-nofeature.sh b/jjb/packaging/test-ports-nofeature.sh index a6cc205e1..84f4a6968 100644 --- a/jjb/packaging/test-ports-nofeature.sh +++ b/jjb/packaging/test-ports-nofeature.sh @@ -13,8 +13,7 @@ set -ex -o pipefail declare -a expected_ports=("1099" "8101" "44444") # Ports that should only be open after odl-nevirt-openstack is installed -# 8080 is Nitrogen and Carbon only, not Oxygen -declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8080" "8181" "8185") +declare -a unexpected_ports=("2550" "6633" "6640" "6644" "6653" "8181" "8185") # Make sure expected ports open COUNT="0" diff --git a/jjb/packetcable/packetcable-csit-pcmm.yaml b/jjb/packetcable/packetcable-csit-pcmm.yaml index 13eb0eb1f..44a7263f0 100644 --- a/jjb/packetcable/packetcable-csit-pcmm.yaml +++ b/jjb/packetcable/packetcable-csit-pcmm.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/packetcable/packetcable.yaml b/jjb/packetcable/packetcable.yaml index 14a83cd22..ebf860f78 100644 --- a/jjb/packetcable/packetcable.yaml +++ b/jjb/packetcable/packetcable.yaml @@ -2,7 +2,6 @@ - project: name: packetcable-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a68ca4a24655c -- project: - name: packetcable-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/nitrogen' - mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - - # Used by the release job - staging-profile-id: a68ca4a24655c - -- project: - name: packetcable-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'packetcable' - project-name: 'packetcable' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'packetcable-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[packetcable]' - - # Used by the release job - staging-profile-id: a68ca4a24655c - - project: name: packetcable-sonar jobs: diff --git a/jjb/persistence/persistence.yaml b/jjb/persistence/persistence.yaml index c745e2178..4d6d1ff38 100644 --- a/jjb/persistence/persistence.yaml +++ b/jjb/persistence/persistence.yaml @@ -35,43 +35,6 @@ # Used by the release job staging-profile-id: a68d3c2bb44d1 -- project: - name: persistence-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'persistence' - project-name: 'persistence' - branch: 'stable/nitrogen' - jdk: openjdk7 - mvn-settings: 'persistence-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[persistence]' - - # Used by the release job - staging-profile-id: a68d3c2bb44d1 - -- project: - name: persistence-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'persistence' - project-name: 'persistence' - branch: 'stable/carbon' - karaf-version: karaf3 - jdk: openjdk7 - mvn-settings: 'persistence-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[persistence]' - - # Used by the release job - staging-profile-id: a68d3c2bb44d1 - - project: name: persistence-sonar jobs: diff --git a/jjb/releng-defaults.yaml b/jjb/releng-defaults.yaml index cc31c2a77..f2a600d00 100644 --- a/jjb/releng-defaults.yaml +++ b/jjb/releng-defaults.yaml @@ -13,6 +13,7 @@ build-timeout: 360 build-node: centos7-builder-4c-4g schedule: '' + schedule-daily: 'H H * * *' schedule-saturday: 'H H * * 6' schedule-weekly: 'H 23 * * 6' schedule-high-frequency: 'H H/4 * * *' @@ -67,25 +68,29 @@ # Distribution bundle URL bundle-url: 'last' + repo-url: '' + install-features: '' + sm-repos: '' + sm-features: '' # CSIT images configuration openstack_system_image_ocata: ZZCI - CentOS 7 - devstack-ocata - 20171208-1649 openstack_system_image_pike: ZZCI - CentOS 7 - devstack-pike - 20171208-1649 stack-template: csit-2-instance-type.yaml docker_system_count: 1 - docker_system_flavor: v2-standard-1 - docker_system_image: ZZCI - CentOS 7 - docker - 20180109-0346 + docker_system_flavor: odl-standard-1 + docker_system_image: ZZCI - CentOS 7 - docker - 20180417-0311 odl_system_count: 1 - odl_system_flavor: v2-highcpu-4 + odl_system_flavor: odl-highcpu-4 odl_system_image: ZZCI - CentOS 7 - builder - 20180201-2139 openstack_system_count: 1 - openstack_system_flavor: v2-standard-4 + openstack_system_flavor: odl-standard-4 openstack_system_image: ZZCI - CentOS 7 - devstack - 20171208-1648 openstack_system2_count: 0 - openstack_system2_flavor: v2-standard-1 + openstack_system2_flavor: odl-standard-1 openstack_system2_image: ZZCI - CentOS 7 - devstack - 20171208-1648 tools_system_count: 1 - tools_system_flavor: v2-highcpu-2 + tools_system_flavor: odl-highcpu-2 tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 # Default Robot framework options @@ -96,10 +101,10 @@ # Data for csit-verify jobs # Branch for "last" version detection - verify-branch: stable/carbon + verify-branch: stable/oxygen # Value for ODL_STREAM - verify-stream: carbon - verify-karaf-version: karaf3 + verify-stream: oxygen + verify-karaf-version: karaf4 verify-jdkversion: openjdk8 # Maven / Java @@ -185,18 +190,12 @@ netvirt-csit-1node-openstack-queens-upstream-stateful-fluorine csit-high-frequency-list-oxygen: > netvirt-csit-1node-openstack-queens-upstream-stateful-oxygen - csit-high-frequency-list-nitrogen: > - netvirt-csit-1node-openstack-pike-upstream-stateful-nitrogen - csit-high-frequency-list-carbon: > - netvirt-csit-1node-openstack-ocata-upstream-stateful-carbon csit-sanity-list-fluorine: > - openflowplugin-csit-1node-sanity-only-fluorine + openflowplugin-csit-1node-sanity-only-fluorine, + distribution-sanity-fluorine csit-sanity-list-oxygen: > - openflowplugin-csit-1node-sanity-only-oxygen - csit-sanity-list-nitrogen: > - openflowplugin-csit-1node-sanity-only-nitrogen - csit-sanity-list-carbon: > - openflowplugin-csit-1node-sanity-only-carbon + openflowplugin-csit-1node-sanity-only-oxygen, + distribution-sanity-oxygen csit-weekly-list-fluorine: > controller-csit-1node-notifications-longevity-only-fluorine, controller-csit-3node-drb-partnheal-longevity-only-fluorine, @@ -215,23 +214,3 @@ distribution-deploy-oxygen, distribution-offline-oxygen, openflowplugin-csit-1node-longevity-only-oxygen - csit-weekly-list-nitrogen: > - controller-csit-1node-notifications-longevity-only-nitrogen, - controller-csit-3node-drb-partnheal-longevity-only-nitrogen, - controller-csit-3node-drb-precedence-longevity-only-nitrogen, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-nitrogen, - bgpcep-csit-3node-bgpclustering-longevity-only-nitrogen, - distribution-deploy-nitrogen, - distribution-offline-nitrogen, - openflowplugin-csit-1node-longevity-only-nitrogen - csit-weekly-list-carbon: > - controller-csit-1node-notifications-longevity-only-carbon, - controller-csit-3node-cs-chasing-leader-longevity-only-carbon, - controller-csit-3node-cs-partnheal-longevity-only-carbon, - controller-csit-3node-drb-partnheal-longevity-only-carbon, - controller-csit-3node-drb-precedence-longevity-only-carbon, - controller-csit-3node-ddb-expl-lead-movement-longevity-only-carbon, - bgpcep-csit-3node-bgpclustering-longevity-only-carbon, - distribution-deploy-carbon, - distribution-offline-carbon, - openflowplugin-csit-1node-longevity-only-carbon diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index f0af74ad6..9fad16fc8 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -4,7 +4,8 @@ jobs: - '{project-name}-rtd-jobs': project-pattern: releng/builder - rtd-project: opendaylight-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 @@ -28,7 +29,7 @@ build-node: centos7-builder-2c-2g archive-artifacts: '**/*.log' build-timeout: 30 - jjb-version: 2.0.3 + jjb-version: 2.0.6 jenkins-urls: > https://jenkins.opendaylight.org/releng https://jenkins.opendaylight.org/sandbox @@ -165,6 +166,7 @@ name: builder-openstack-cron project-type: freestyle node: '{build-node}' + concurrent: true properties: - lf-infra-properties: @@ -179,7 +181,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}' @@ -202,17 +209,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 - odl-openstack-cleanup-orphaned-nodes + # Volumes + - odl-openstack-cleanup-stale-volumes # Images - odl-openstack-check-image-protection - odl-openstack-cleanup-old-images @@ -256,10 +268,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: diff --git a/jjb/releng-macros.yaml b/jjb/releng-macros.yaml index 1a38abbcd..6487231cb 100644 --- a/jjb/releng-macros.yaml +++ b/jjb/releng-macros.yaml @@ -83,13 +83,30 @@ default: '' description: | Ordered list of patches to build in the format of project=changeset (checkout) or - project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47 + project:changeset (cherry-pick) for example: genius=32/53632/9,netvirt:59/50259/47. + A topic is also allowed, for example: topic=binding-tlc-rpc + +- parameter: + name: build-order-parameter + parameters: + - string: + name: BUILD_ORDER + default: '{build-order}' + description: 'Build order for multipatch test when topic is used' + +- parameter: + name: build-fast-parameter + parameters: + - string: + name: BUILD_FAST + default: '{build-fast}' + description: 'Set true to build fast -Pq' - parameter: name: run-test-parameter parameters: - string: - name: RUNTEST + name: RUN_TEST default: '{run-test}' description: 'Set true to run test after build' @@ -314,6 +331,11 @@ builders: - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh +- builder: + name: odl-openstack-cleanup-stale-volumes + builders: + - shell: !include-raw: odl-openstack-cleanup-stale-volumes.sh + - builder: # Deploys a maven site to Nexus using lftools nexus-zip command name: opendaylight-infra-deploy-maven-site @@ -336,24 +358,6 @@ - shell: !include-raw: opendaylight-infra-stack.sh - shell: !include-raw-escape: opendaylight-infra-copy-ssh-keys.sh -- builder: - name: opendaylight-infra-push-gerrit-patch - # opendaylight-infra-push-gerrit-patch.sh allows a job to push a patch to - # Gerrit in an automated fashion. This is meant for tasks that creates - # the same patch regularly and needs the ability to detect if an unreviewed - # patch already exists. In which case it will update the existing patch. - # - # Note: This patch assumes the $WORKSPACE contains the project repo with - # the files changed already "git add" and waiting for a "git commit" call. - # - # This script requires the following JJB variables to be passed in: - # {project} Gerrit project-name - # {gerrit-topic} Gerrit topic, please make a unique topic. - # {gerrit-commit-message} Commit message to assign to commit. - # NOTE: Requires git review to be installed on node. - builders: - - shell: !include-raw: opendaylight-infra-push-gerrit-patch.sh - - builder: name: distribute-build-url # Place URL of the current run of a build job to a file at given path. @@ -449,6 +453,25 @@ settings: '{settings}' global-settings: '{global-settings}' +- publisher: + name: releng-openstack-stack-delete + publishers: + - postbuildscript: + builders: + - role: BOTH + build-on: + - ABORTED + - FAILURE + - SUCCESS + - UNSTABLE + build-steps: + - shell: | + #!/bin/bash + echo "Deleting $STACK_NAME" + source "/tmp/v/openstack/bin/activate" + openstack stack delete --yes "$STACK_NAME" + mark-unstable-if-failed: false + - builder: name: releng-stage-release builders: diff --git a/jjb/releng-packer-jobs.yaml b/jjb/releng-packer-jobs.yaml index 72007f085..6e876dd01 100644 --- a/jjb/releng-packer-jobs.yaml +++ b/jjb/releng-packer-jobs.yaml @@ -61,3 +61,19 @@ platforms: centos-7 templates: robot + +- project: + name: packer-kubernetes-jobs + jobs: + - gerrit-packer-merge + + project: releng/builder + project-name: builder + branch: master + archive-artifacts: '**/*.log' + + build-node: centos7-builder-2c-1g + build-timeout: 90 + + platforms: ubuntu-16.04 + templates: kubernetes diff --git a/jjb/releng-templates-java.yaml b/jjb/releng-templates-java.yaml index 89869dccd..3f001989e 100644 --- a/jjb/releng-templates-java.yaml +++ b/jjb/releng-templates-java.yaml @@ -76,7 +76,7 @@ global-settings-file: 'global-settings' settings-file: '{mvn-settings}' - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn35' goals: | {mvn-goals} {opendaylight-infra-mvn-opts} @@ -108,8 +108,9 @@ **/target/**/feature.xml **/target/failsafe-reports/failsafe-summary.xml **/target/surefire-reports/*-output.txt + cron: 'H H * * 0' mvn-opts: '' - mvn-version: mvn33 + mvn-version: mvn35 java-version: openjdk8 ##################### @@ -150,7 +151,7 @@ build-timeout: '{build-timeout}' triggers: - - timed: 'H H * * 0' + - timed: '{obj:cron}' - gerrit-trigger-patch-merged: gerrit-server-name: '{gerrit-server-name}' name: '{project}' diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml index 4a5eef8b1..d830b59a8 100644 --- a/jjb/releng-templates.yaml +++ b/jjb/releng-templates.yaml @@ -45,7 +45,7 @@ global-settings-file: 'global-settings' settings-file: 'autorelease-settings' - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn35' pom: 'pom.xml' goals: > clean deploy -V -B @@ -94,12 +94,12 @@ - wipe-org-opendaylight-repo - jacoco-nojava-workaround - releng-fetch-p2zip-if-necessary: - maven-version: 'mvn33' + maven-version: 'mvn35' settings: '{mvn-settings}' global-settings: 'global-settings' - releng-generate-p2pom - maven-target: - maven-version: 'mvn33' + maven-version: 'mvn35' pom: 'pom.xml' goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r' settings: '{mvn-settings}' @@ -107,7 +107,7 @@ global-settings: 'global-settings' global-settings-type: cfp - releng-update-p2composite-metadata: - maven-version: 'mvn33' + maven-version: 'mvn35' settings: '{mvn-settings}' global-settings: 'global-settings' diff --git a/jjb/releng-views.yaml b/jjb/releng-views.yaml new file mode 100644 index 000000000..551d4486f --- /dev/null +++ b/jjb/releng-views.yaml @@ -0,0 +1,695 @@ +--- +- releng_view: &releng_view_common + name: releng-view-common + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + recurse: false + +# Note: most-recent Job Filter requires JJB 2.1 to be released. +- view: + name: 01-recent + regex: '.*' + description: 'List of most recent jobs' + job-filters: + most-recent: + max-to-include: 25 + check-start-time: true + <<: *releng_view_common + +- view: + name: All-Sonar + regex: '.*-sonar$' + description: 'List of Sonar jobs' + <<: *releng_view_common + +- view: + name: CLM + description: 'List of CLM jobs' + regex: '.*-clm-.*' + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - policy-violations + recurse: false + +- view: + name: CSIT-1node + description: 'List of CSIT 1node jobs' + regex: '^.*-csit-1node.*' + <<: *releng_view_common + +- view: + name: CSIT-3node + description: 'List of CSIT 3node jobs' + regex: '^.*-csit-3node.*' + <<: *releng_view_common + +- view: + name: CSIT + description: 'List of CSIT jobs' + regex: '^.*-csit-.*' + <<: *releng_view_common + +- view: + name: CSIT-Verify + description: 'List of CSIT Verify jobs' + regex: '^.*-csit-verify.*' + <<: *releng_view_common + +- view: + name: Distribution-Check + description: 'List of Distribution Check jobs' + regex: '.*-distribution.*-check-.*' + <<: *releng_view_common + +- view: + name: Distribution-Jobs + description: 'List of Distribution jobs (test, check, merge, deploy, offline, verify)' + regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*' + <<: *releng_view_common + +- view: + name: Gate + description: 'List of Gate jobs' + regex: '.*-gate-.*' + <<: *releng_view_common + +# Note: column plugins implementations requires JJB 2.1 to be released. +- view: + name: Integration + description: 'List of Integration jobs' + regex: '.*-integration-.*' + view-type: list + filter-executors: false + filter-queue: false + columns: + - status + - weather + - job + - last-success + - last-failure + - last-duration + - build-button + - jacoco + - find-bugs + - robot-list + recurse: false + +- view: + name: Merge-Jobs + description: 'List of Merge jobs' + regex: '.*-merge-.*' + <<: *releng_view_common + +- view: + name: Patch-Test + description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin' + regex: '.*-patch-test-.*' + <<: *releng_view_common + +- view: + name: Periodic + description: 'List of Periodic jobs' + regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+' + <<: *releng_view_common + +- view: + name: Release + description: 'List of Release jobs' + regex: '.*-release-.*' + <<: *releng_view_common + +- view: + name: Sanity + description: 'List of Sanity jobs' + regex: '.*-sanity-.*' + <<: *releng_view_common + +- view: + name: Thirdparty + description: 'List of ODL Nexus Thirdparty dependencies jobs' + regex: '.*-thirdparty-.*' + <<: *releng_view_common + +- view: + name: Validate + description: 'List of Validate jobs' + regex: '.*-validate-autorelease-.*' + <<: *releng_view_common + +- view: + name: Verify + description: 'List of Verify jobs, exluding CSIT jobs' + regex: '^(?!.*-csit).*-verify-.*' + <<: *releng_view_common + +- view: + name: aaa + description: 'List of aaa jobs' + regex: '^aaa-.*' + <<: *releng_view_common + +- view: + name: alto + description: 'List of alto jobs' + regex: '^alto-.*' + <<: *releng_view_common + +- view: + name: archetypes + regex: '^archetypes-.*' + description: 'List of archetypes jobs' + <<: *releng_view_common + +- view: + name: atrium + description: 'List of atrium jobs' + regex: '^atrium-.*' + <<: *releng_view_common + +- view: + name: autorelease + description: 'List of autorelease jobs' + regex: '^autorelease-.*' + <<: *releng_view_common + +- view: + name: bgpcep + description: 'List of bgpcep jobs' + regex: '^bgpcep-.*' + <<: *releng_view_common + +- view: + name: bier + description: 'List of bier jobs' + regex: '^bier-.*' + <<: *releng_view_common + +- view: + name: builder + description: 'List of builder jobs' + regex: '^(builder|lf-infra)-.*' + <<: *releng_view_common + +- view: + name: capwap + description: 'List of capwap jobs' + regex: '^capwap-.*' + <<: *releng_view_common + +- view: + name: cardinal + description: 'List of cardinal jobs' + regex: '^cardinal-.*' + <<: *releng_view_common + +- view: + name: centinel + description: 'List of centinel jobs' + regex: '^centinel-.*' + <<: *releng_view_common + +- view: + name: circuitsw + description: 'List of circuitsw jobs' + regex: '^circuitsw-.*' + <<: *releng_view_common + +- view: + name: coe + description: 'List of coe jobs' + regex: '^coe-.*' + <<: *releng_view_common + +- view: + name: controller + description: 'List of controller jobs' + regex: '^controller-.*' + <<: *releng_view_common + +- view: + name: coretutorials + description: 'List of coretutorials jobs' + regex: '^coretutorials-.*' + <<: *releng_view_common + +- view: + name: daexim + description: 'List of daexim jobs' + regex: '^daexim-.*' + <<: *releng_view_common + +- view: + name: didm + description: 'List of didm jobs' + regex: '^didm-.*' + <<: *releng_view_common + +- view: + name: distribution + description: 'List of distribution jobs' + regex: '^(integration-)?distribution-.*' + <<: *releng_view_common + +- view: + name: dlux + description: 'List of dlux jobs' + regex: '^dlux-.*' + <<: *releng_view_common + +- view: + name: dluxapps + description: 'List of dluxapps jobs' + regex: '^dluxapps-.*' + <<: *releng_view_common + +- view: + name: docs + description: 'List of docs jobs' + regex: '^docs-.*' + <<: *releng_view_common + +- view: + name: eman + description: 'List of eman jobs' + regex: '^eman-.*' + <<: *releng_view_common + +- view: + name: epc + description: 'List of epc jobs' + regex: '^epc-.*' + <<: *releng_view_common + +- view: + name: faas + description: 'List of faas jobs' + regex: '^faas-.*' + <<: *releng_view_common + +- view: + name: federation + description: 'List of federation jobs' + regex: '^federation-.*' + <<: *releng_view_common + +- view: + name: fpc + description: 'List of fpc jobs' + regex: '^fpc-.*' + <<: *releng_view_common + +- view: + name: genius + description: 'List of genius jobs' + regex: '^genius-.*' + <<: *releng_view_common + +- view: + name: gnt + description: 'List of gnt jobs' + regex: '^gnt-.*' + <<: *releng_view_common + +- view: + name: groupbasedpolicy + description: 'List of groupbasedpolicy jobs' + regex: '^groupbasedpolicy-.*' + <<: *releng_view_common + +- view: + name: intrautils + description: 'List of infrautils jobs' + regex: '^infrautils-.*' + <<: *releng_view_common + +- view: + name: integration + description: 'List of integration jobs' + regex: '^integration-.*' + <<: *releng_view_common + +- view: + name: iotdm + description: 'List of iotdm jobs' + regex: '^iotdm-.*' + <<: *releng_view_common + +- view: + name: jsonrpc + description: 'List of jsonrpc jobs' + regex: '^jsonrpc-.*' + <<: *releng_view_common + +- view: + name: kafkaproducer + description: 'List of kafkaproducer jobs' + regex: '^kafkaproducer-.*' + <<: *releng_view_common + +- view: + name: l2switch + description: 'List of l2switch jobs' + regex: '^l2switch-.*' + <<: *releng_view_common + +- view: + name: lacp + description: 'List of lacp jobs' + regex: '^lacp-.*' + <<: *releng_view_common + +- view: + name: lispflowmapping + description: 'List of lispflowmapping jobs' + regex: '^lispflowmapping-.*' + <<: *releng_view_common + +- view: + name: mdsal + description: 'List of mdsal jobs' + regex: '^mdsal-.*' + <<: *releng_view_common + +- view: + name: messaging4transport + description: 'List of messaging4transport jobs' + regex: '^messaging4transport-.*' + <<: *releng_view_common + +- view: + name: natapp + description: 'List of natapp jobs' + regex: '^natapp-.*' + <<: *releng_view_common + +- view: + name: nemo + description: 'List of nemo jobs' + regex: '^nemo-.*' + <<: *releng_view_common + +- view: + name: netconf + description: 'List of netconf jobs' + regex: '^netconf-.*' + <<: *releng_view_common + +- view: + name: netide + description: 'List of netide jobs' + regex: '^netide-.*' + <<: *releng_view_common + +- view: + name: netvirt + description: 'List of netvirt jobs' + regex: '^netvirt-.*' + <<: *releng_view_common + +- view: + name: netvirt-csit + description: 'List of netvirt-csit jobs' + regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*' + <<: *releng_view_common + +- view: + name: neutron + description: 'List of neutron jobs' + regex: '^neutron-.*' + <<: *releng_view_common + +- view: + name: next + description: 'List of next jobs' + regex: '^next-.*' + <<: *releng_view_common + +- view: + name: nic + description: 'List of nic jobs' + regex: '^nic-.*' + <<: *releng_view_common + +- view: + name: ocpplugin + description: 'List of ocpplugin jobs' + regex: '^ocpplugin-.*' + <<: *releng_view_common + +- view: + name: odlparent + description: 'List of odlparent jobs' + regex: '^odlparent-.*' + <<: *releng_view_common + +- view: + name: of-config + description: 'List of of-config jobs' + regex: '^of-config-.*' + <<: *releng_view_common + +- view: + name: openci + description: 'List of openci jobs' + regex: '^openci-.*' + <<: *releng_view_common + +- view: + name: openflowjava + description: 'List of openflowjava jobs' + regex: '^openflowjava-.*' + <<: *releng_view_common + +- view: + name: openflowplugin + description: 'List of openflowplugin jobs' + regex: '^openflowplugin-.*' + <<: *releng_view_common + +- view: + name: openflowplugin-oxygen + description: 'List of openflowplugin oxygen jobs' + regex: 'openflowplugin-.*-oxygen' + <<: *releng_view_common + +- view: + name: opflex + description: 'List of opflex jobs' + regex: '^opflex-.*' + <<: *releng_view_common + +- view: + name: ovil + description: 'List of ovil jobs' + regex: '^ovil-.*' + <<: *releng_view_common + +- view: + name: ovsdb + description: 'List of ovsdb jobs' + regex: '^ovsdb-.*' + <<: *releng_view_common + +- view: + name: p4plugin + description: 'List of p4plugin jobs' + regex: '^p4plugin-.*' + <<: *releng_view_common + +- view: + name: packaging + description: 'List of packaging, ansible and puppet jobs' + regex: '^packaging.*|ansible.*|puppet.*' + <<: *releng_view_common + +- view: + name: packer + description: 'List of packer jobs' + regex: '^builder-.*packer.*' + <<: *releng_view_common + +- view: + name: packetcable + description: 'List of packetcable jobs' + regex: '^packetcable-.*' + <<: *releng_view_common + +- view: + name: persistence + description: 'List of persistence jobs' + regex: '^persistence-.*' + <<: *releng_view_common + +- view: + name: potn + description: 'List of potn jobs' + regex: '^potn-.*' + <<: *releng_view_common + +- view: + name: reservation + description: 'List of reservation jobs' + regex: '^reservation-.*' + <<: *releng_view_common + +- view: + name: sdninterfaceapp + description: 'List of sdninterfaceapp jobs' + regex: '^sdninterfaceapp-.*' + <<: *releng_view_common + +- view: + name: sfc + description: 'List of sfc jobs' + regex: '^sfc-.*' + <<: *releng_view_common + +- view: + name: snbi + description: 'List of snbi jobs' + regex: '^snbi-.*' + <<: *releng_view_common + +- view: + name: snmp + description: 'List of snmp jobs' + regex: '^snmp-.*' + <<: *releng_view_common + +- view: + name: snmp4sdn + description: 'List of snmp4sdn jobs' + regex: '^snmp4sdn-.*' + <<: *releng_view_common + +- view: + name: spectrometer + description: 'List of spectrometer jobs' + regex: '^spectrometer-.*' + <<: *releng_view_common + +- view: + name: sptn + description: 'List of sptn jobs' + regex: '^sptn-.*' + <<: *releng_view_common + +- view: + name: spx + description: 'List of spx jobs' + regex: '^sxp-.*' + <<: *releng_view_common + +- view: + name: systemmetrics + description: 'List of systemmetrics jobs' + regex: '^systemmetrics-.*' + <<: *releng_view_common + +- view: + name: telemetry + description: 'List of telemetry jobs' + regex: '^telemetry-.*' + <<: *releng_view_common + +- view: + name: topoprocessing + description: 'List of topoprocessing jobs' + regex: '^topoprocessing-.*' + <<: *releng_view_common + +- view: + name: transportpce + description: 'List of transportpce jobs' + regex: '^transportpce-.*' + <<: *releng_view_common + +- view: + name: tsdr + description: 'List of tsdr jobs' + regex: '^tsdr-.*' + <<: *releng_view_common + +- view: + name: ttp + description: 'List of ttp jobs' + regex: '^ttp-.*' + <<: *releng_view_common + +- view: + name: unimgr + description: 'List of unimgr jobs' + regex: '^unimgr-.*' + <<: *releng_view_common + +- view: + name: usc + description: 'List of usc jobs' + regex: '^usc-.*' + <<: *releng_view_common + +- view: + name: uscplugin + description: 'List of uscplugin jobs' + regex: '^usecplugin-.*' + <<: *releng_view_common + +- view: + name: vbd + description: 'List of vbd jobs' + regex: '^vbd-.*' + <<: *releng_view_common + +- view: + name: verify-python + description: 'List of pyhton-verify jobs' + regex: '.*-python-.*' + <<: *releng_view_common + +- view: + name: vpnservice + description: 'List of vpnservice jobs' + regex: '^vpnservice-.*' + <<: *releng_view_common + +- view: + name: vtn + description: 'List of vtn jobs' + regex: '^vtn-.*' + <<: *releng_view_common + +- view: + name: yang-push + description: 'List of yang-push jobs' + regex: '^yang-push-.*' + <<: *releng_view_common + +- view: + name: yangide + description: 'List of yangide jobs' + regex: '^yangide-.*' + <<: *releng_view_common + +- view: + name: yangtools + description: 'List of yangtools jobs' + regex: '^yangtools-.*' + <<: *releng_view_common diff --git a/jjb/requirements.txt b/jjb/requirements.txt index 61d8a1356..b6e748b49 100644 --- a/jjb/requirements.txt +++ b/jjb/requirements.txt @@ -1 +1 @@ -jenkins-job-builder==2.0.3 +jenkins-job-builder==2.0.6 diff --git a/jjb/reservation/reservation.yaml b/jjb/reservation/reservation.yaml index 47b06b04e..33c6313e2 100644 --- a/jjb/reservation/reservation.yaml +++ b/jjb/reservation/reservation.yaml @@ -33,41 +33,6 @@ # Used by the release job staging-profile-id: a68d9bc504037 -- project: - name: reservation-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'reservation' - project-name: 'reservation' - branch: 'stable/nitrogen' - mvn-settings: 'reservation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[reservation]' - - # Used by the release job - staging-profile-id: a68d9bc504037 - -- project: - name: reservation-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'reservation' - project-name: 'reservation' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'reservation-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[reservation]' - - # Used by the release job - staging-profile-id: a68d9bc504037 - - project: name: reservation-sonar jobs: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml index da2df481e..91b9e89bc 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp-csit-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/sdninterfaceapp/sdninterfaceapp.yaml b/jjb/sdninterfaceapp/sdninterfaceapp.yaml index d14de6265..664877e84 100644 --- a/jjb/sdninterfaceapp/sdninterfaceapp.yaml +++ b/jjb/sdninterfaceapp/sdninterfaceapp.yaml @@ -2,7 +2,6 @@ - project: name: sdninterfaceapp-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: a68e3d1ff55e3 -- project: - name: sdninterfaceapp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - branch: 'stable/nitrogen' - build-node: centos7-builder-2c-8g - mvn-settings: 'sdninterfaceapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'bgpcep-merge-{stream}' - email-upstream: '[sdninterfaceapp] [bgpcep]' - - # Used by the release job - staging-profile-id: a68e3d1ff55e3 - -- project: - name: sdninterfaceapp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sdninterfaceapp' - project-name: 'sdninterfaceapp' - branch: 'stable/carbon' - build-node: centos7-builder-2c-8g - karaf-version: karaf3 - mvn-settings: 'sdninterfaceapp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'bgpcep-merge-{stream}' - email-upstream: '[sdninterfaceapp] [bgpcep]' - - # Used by the release job - staging-profile-id: a68e3d1ff55e3 - - project: name: sdninterfaceapp-sonar jobs: diff --git a/jjb/sfc/sfc-csit-full-deploy.yaml b/jjb/sfc/sfc-csit-full-deploy.yaml index c050efa8c..56d49f563 100644 --- a/jjb/sfc/sfc-csit-full-deploy.yaml +++ b/jjb/sfc/sfc-csit-full-deploy.yaml @@ -16,11 +16,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sfc/sfc-csit-rest-basic.yaml b/jjb/sfc/sfc-csit-rest-basic.yaml index a0dc38318..e085c8e68 100644 --- a/jjb/sfc/sfc-csit-rest-basic.yaml +++ b/jjb/sfc/sfc-csit-rest-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sfc/sfc-patch-test.yaml b/jjb/sfc/sfc-patch-test.yaml index d3da13233..2ee117d46 100644 --- a/jjb/sfc/sfc-patch-test.yaml +++ b/jjb/sfc/sfc-patch-test.yaml @@ -13,11 +13,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 feature: - basic: diff --git a/jjb/sfc/sfc-python.yaml b/jjb/sfc/sfc-python.yaml index 331afd100..ec17b9949 100644 --- a/jjb/sfc/sfc-python.yaml +++ b/jjb/sfc/sfc-python.yaml @@ -9,10 +9,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' project: 'sfc' project-name: 'sfc' diff --git a/jjb/sfc/sfc.yaml b/jjb/sfc/sfc.yaml index ab58e449b..cb3c8a874 100644 --- a/jjb/sfc/sfc.yaml +++ b/jjb/sfc/sfc.yaml @@ -39,45 +39,6 @@ # Used by the release job staging-profile-id: a68eb361ca48a -- project: - name: sfc-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'sfc' - project-name: 'sfc' - branch: 'stable/nitrogen' - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: a68eb361ca48a - -- project: - name: sfc-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sfc' - project-name: 'sfc' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'sfc-settings' - mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true' - dependencies: 'openflowplugin-merge-{stream},ovsdb-merge-{stream},lispflowmapping-merge-{stream}' - email-upstream: '[sfc] [openflowplugin] [ovsdb] [lispflowmapping]' - build-node: centos7-builder-8c-8g - - # Used by the release job - staging-profile-id: a68eb361ca48a - - project: name: sfc-sonar jobs: diff --git a/jjb/snbi/snbi.yaml b/jjb/snbi/snbi.yaml index f9ecd01f6..84a9ca9fe 100644 --- a/jjb/snbi/snbi.yaml +++ b/jjb/snbi/snbi.yaml @@ -2,7 +2,6 @@ - project: name: snbi-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a68f328cefed6 -- project: - name: snbi-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'snbi' - project-name: 'snbi' - branch: 'stable/nitrogen' - mvn-settings: 'snbi-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[snbi]' - - # Used by the release job - staging-profile-id: a68f328cefed6 - -- project: - name: snbi-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'snbi' - project-name: 'snbi' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'snbi-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[snbi]' - - # Used by the release job - staging-profile-id: a68f328cefed6 - - project: name: snbi-sonar jobs: diff --git a/jjb/snmp/snmp.yaml b/jjb/snmp/snmp.yaml index 4a5c47d15..c959329d8 100644 --- a/jjb/snmp/snmp.yaml +++ b/jjb/snmp/snmp.yaml @@ -2,7 +2,6 @@ - project: name: snmp-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a68fb236b93a6 -- project: - name: snmp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'snmp' - project-name: 'snmp' - branch: 'stable/nitrogen' - mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - - # Used by the release job - staging-profile-id: a68fb236b93a6 - -- project: - name: snmp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'snmp' - project-name: 'snmp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'snmp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[snmp] [odlparent]' - - # Used by the release job - staging-profile-id: a68fb236b93a6 - - project: name: snmp-sonar jobs: diff --git a/jjb/snmp4sdn/snmp4sdn.yaml b/jjb/snmp4sdn/snmp4sdn.yaml index 1ad2b6a86..87431891b 100644 --- a/jjb/snmp4sdn/snmp4sdn.yaml +++ b/jjb/snmp4sdn/snmp4sdn.yaml @@ -2,7 +2,6 @@ - project: name: snmp4sdn-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a69034a4b6ef5 -- project: - name: snmp4sdn-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/nitrogen' - mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a69034a4b6ef5 - -- project: - name: snmp4sdn-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'snmp4sdn' - project-name: 'snmp4sdn' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'snmp4sdn-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[snmp4sdn] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a69034a4b6ef5 - - project: name: snmp4sdn-sonar jobs: diff --git a/jjb/spectrometer/spectrometer-jobs.yaml b/jjb/spectrometer/spectrometer-jobs.yaml index 2b0ebb671..740850818 100644 --- a/jjb/spectrometer/spectrometer-jobs.yaml +++ b/jjb/spectrometer/spectrometer-jobs.yaml @@ -6,6 +6,8 @@ - '{project-name}-python-jobs' - '{project-name}-rtd-jobs': project-pattern: spectrometer + rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight-spectrometer/32925/ + rtd-token: 383146c345ca41b9e36859b6dcd57ffca38f21c7 - spectrometer-deploy-webapp-master stream: @@ -14,7 +16,6 @@ project: spectrometer project-name: spectrometer - rtd-project: opendaylight-spectrometer tox-dir: server node-dir: web node-version: 6.11.4 diff --git a/jjb/sxp/sxp-csit-basic.yaml b/jjb/sxp/sxp-csit-basic.yaml index 00cbb34b5..4c3271bc6 100644 --- a/jjb/sxp/sxp-csit-basic.yaml +++ b/jjb/sxp/sxp-csit-basic.yaml @@ -16,14 +16,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-cluster-routing.yaml b/jjb/sxp/sxp-csit-cluster-routing.yaml index 36f1dd602..71d140be3 100644 --- a/jjb/sxp/sxp-csit-cluster-routing.yaml +++ b/jjb/sxp/sxp-csit-cluster-routing.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-routing jobs: - - inttest-csit-3node-periodic + - inttest-csit-3node # The project name project: 'sxp' @@ -16,15 +16,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - install-features: 'odl-restconf,odl-sxp-controller,odl-sxp-route' install: - all: diff --git a/jjb/sxp/sxp-csit-clustering.yaml b/jjb/sxp/sxp-csit-clustering.yaml index e337efc73..f4488e247 100644 --- a/jjb/sxp/sxp-csit-clustering.yaml +++ b/jjb/sxp/sxp-csit-clustering.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-clustering jobs: - - inttest-csit-3node-periodic + - inttest-csit-3node # The project name project: 'sxp' @@ -16,14 +16,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-filtering.yaml b/jjb/sxp/sxp-csit-filtering.yaml index 5325dea6d..922b78895 100644 --- a/jjb/sxp/sxp-csit-filtering.yaml +++ b/jjb/sxp/sxp-csit-filtering.yaml @@ -16,14 +16,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-performance.yaml b/jjb/sxp/sxp-csit-performance.yaml index 377d24949..9a4f59331 100644 --- a/jjb/sxp/sxp-csit-performance.yaml +++ b/jjb/sxp/sxp-csit-performance.yaml @@ -2,7 +2,7 @@ - project: name: sxp-csit-performance jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # The project name project: 'sxp' @@ -16,14 +16,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp-csit-topology.yaml b/jjb/sxp/sxp-csit-topology.yaml index 74147dfdd..3db08c412 100644 --- a/jjb/sxp/sxp-csit-topology.yaml +++ b/jjb/sxp/sxp-csit-topology.yaml @@ -16,14 +16,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/sxp/job/sxp-merge-fluorine/lastBuild/org.opendaylight.sxp$sxp-karaf/artifact/org.opendaylight.sxp/sxp-karaf/1.7.0-SNAPSHOT/sxp-karaf-1.7.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.sxp/features-sxp/1.7.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/sxp/sxp.yaml b/jjb/sxp/sxp.yaml index 08b5b7556..e8b6c02b5 100644 --- a/jjb/sxp/sxp.yaml +++ b/jjb/sxp/sxp.yaml @@ -2,7 +2,6 @@ - project: name: sxp-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a6909c75719b7 -- project: - name: sxp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'sxp' - project-name: 'sxp' - branch: 'stable/nitrogen' - mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a6909c75719b7 - -- project: - name: sxp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'sxp' - project-name: 'sxp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'sxp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[sxp] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a6909c75719b7 - - project: name: sxp-sonar jobs: diff --git a/jjb/systemmetrics/systemmetrics.yaml b/jjb/systemmetrics/systemmetrics.yaml index f6b280bb9..d3bd28873 100644 --- a/jjb/systemmetrics/systemmetrics.yaml +++ b/jjb/systemmetrics/systemmetrics.yaml @@ -16,58 +16,6 @@ # Used by the release job staging-profile-id: a69113575458e -- project: - name: systemmetrics-oxygen - jobs: - - odl-maven-jobs - - project: 'systemmetrics' - project-name: 'systemmetrics' - stream: oxygen - branch: 'stable/oxygen' - mvn-settings: 'systemmetrics-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a69113575458e - -- project: - name: systemmetrics-nitrogen - jobs: - - odl-maven-jobs - - project: 'systemmetrics' - project-name: 'systemmetrics' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'systemmetrics-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a69113575458e - -- project: - name: systemmetrics-carbon - jobs: - - odl-maven-jobs - - project: 'systemmetrics' - project-name: 'systemmetrics' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'systemmetrics-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[systemmetrics] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a69113575458e - - project: name: systemmetrics-sonar jobs: diff --git a/jjb/telemetry/telemetry.yaml b/jjb/telemetry/telemetry.yaml index 75a34f5a7..c28c14e24 100644 --- a/jjb/telemetry/telemetry.yaml +++ b/jjb/telemetry/telemetry.yaml @@ -3,7 +3,6 @@ name: telemetry-fluorine jobs: - 'odl-maven-jobs' - - '{project-name}-distribution-check-{stream}' - '{project-name}-integration-{stream}' stream: fluorine diff --git a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml b/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml deleted file mode 100644 index a9def51b8..000000000 --- a/jjb/topoprocessing/topoprocessing-csit-topology-operation.yaml +++ /dev/null @@ -1,30 +0,0 @@ ---- -- project: - name: topoprocessing-csit-topology-operations - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'topoprocessing' - - # The functionality under test - functionality: 'topology-operations' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Features to install - install-features: 'odl-restconf' - - # Robot custom options - robot-options: '' diff --git a/jjb/topoprocessing/topoprocessing.yaml b/jjb/topoprocessing/topoprocessing.yaml index 8aacb5041..8ee0a78fb 100644 --- a/jjb/topoprocessing/topoprocessing.yaml +++ b/jjb/topoprocessing/topoprocessing.yaml @@ -2,7 +2,6 @@ - project: name: topoprocessing-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a691bbe2328cb -- project: - name: topoprocessing-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/nitrogen' - mvn-settings: 'topoprocessing-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a691bbe2328cb - -- project: - name: topoprocessing-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'topoprocessing' - project-name: 'topoprocessing' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'topoprocessing-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},controller-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[topoprocessing] [odlparent] [controller] [yangtools]' - - # Used by the release job - staging-profile-id: a691bbe2328cb - - project: name: topoprocessing-sonar jobs: diff --git a/jjb/transportpce/transportpce.yaml b/jjb/transportpce/transportpce.yaml index 30ab98e93..d1ab65f8d 100644 --- a/jjb/transportpce/transportpce.yaml +++ b/jjb/transportpce/transportpce.yaml @@ -33,41 +33,6 @@ # Used by the release job staging-profile-id: a6927323fa3d4 -- project: - name: transportpce-nitrogen - jobs: - - odl-maven-jobs - - project: 'transportpce' - project-name: 'transportpce' - stream: nitrogen - branch: 'stable/nitrogen' - mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a6927323fa3d4 - -- project: - name: transportpce-carbon - jobs: - - odl-maven-jobs - - project: 'transportpce' - project-name: 'transportpce' - stream: carbon - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'transportpce-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream},controller-merge-{stream}' - email-upstream: '[transportpce] [odlparent] [yangtools] [controller]' - - # Used by the release job - staging-profile-id: a6927323fa3d4 - - project: name: transportpce-sonar jobs: diff --git a/jjb/tsdr/tsdr-csit-cassandra.yaml b/jjb/tsdr/tsdr-csit-cassandra.yaml index 0abf934ed..e173dc988 100644 --- a/jjb/tsdr/tsdr-csit-cassandra.yaml +++ b/jjb/tsdr/tsdr-csit-cassandra.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/tsdr/tsdr-csit-elasticsearch.yaml b/jjb/tsdr/tsdr-csit-elasticsearch.yaml index 02e9df3cd..ad5229bae 100644 --- a/jjb/tsdr/tsdr-csit-elasticsearch.yaml +++ b/jjb/tsdr/tsdr-csit-elasticsearch.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/tsdr/tsdr-csit-hbase.yaml b/jjb/tsdr/tsdr-csit-hbase.yaml index c574684ae..6b1c235c4 100644 --- a/jjb/tsdr/tsdr-csit-hbase.yaml +++ b/jjb/tsdr/tsdr-csit-hbase.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/tsdr/tsdr-csit-hsqldb.yaml b/jjb/tsdr/tsdr-csit-hsqldb.yaml index 8c251df84..a9fbd4761 100644 --- a/jjb/tsdr/tsdr-csit-hsqldb.yaml +++ b/jjb/tsdr/tsdr-csit-hsqldb.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/tsdr/tsdr.yaml b/jjb/tsdr/tsdr.yaml index 04bd66db3..564849dd8 100644 --- a/jjb/tsdr/tsdr.yaml +++ b/jjb/tsdr/tsdr.yaml @@ -2,7 +2,6 @@ - project: name: tsdr-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a69373036303c -- project: - name: tsdr-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/nitrogen' - mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - - # Used by the release job - staging-profile-id: a69373036303c - -- project: - name: tsdr-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'tsdr' - project-name: 'tsdr' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'tsdr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[tsdr]' - - # Used by the release job - staging-profile-id: a69373036303c - - project: name: tsdr-sonar jobs: diff --git a/jjb/ttp/ttp.yaml b/jjb/ttp/ttp.yaml index 323a75b8a..b52b0245c 100644 --- a/jjb/ttp/ttp.yaml +++ b/jjb/ttp/ttp.yaml @@ -2,7 +2,6 @@ - project: name: ttp-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a693f948563d5 -- project: - name: ttp-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'ttp' - project-name: 'ttp' - branch: 'stable/nitrogen' - mvn-settings: 'ttp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[ttp] [odlparent]' - - # Used by the release job - staging-profile-id: a693f948563d5 - -- project: - name: ttp-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'ttp' - project-name: 'ttp' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'ttp-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[ttp] [odlparent]' - - # Used by the release job - staging-profile-id: a693f948563d5 - - project: name: ttp-sonar jobs: diff --git a/jjb/unimgr/unimgr-csit-basic.yaml b/jjb/unimgr/unimgr-csit-basic.yaml deleted file mode 100644 index f8e2542a5..000000000 --- a/jjb/unimgr/unimgr-csit-basic.yaml +++ /dev/null @@ -1,33 +0,0 @@ ---- -- project: - name: unimgr-csit-basic - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'unimgr' - - # The functionality under test - functionality: 'basic' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Mininet configuration - tools_system_count: 2 - - # Features to install - install-features: 'odl-unimgr-ui' - - # Robot custom options - robot-options: '' diff --git a/jjb/unimgr/unimgr-csit-legato.yaml b/jjb/unimgr/unimgr-csit-legato.yaml deleted file mode 100644 index 4e74f0421..000000000 --- a/jjb/unimgr/unimgr-csit-legato.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- project: - name: unimgr-csit-legato - jobs: - - inttest-csit-1node - - inttest-csit-verify-1node - - # The project name - project: 'unimgr' - - # The functionality under test - functionality: 'legato' - - # Project branches - stream: - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - install: - - all: - scope: 'all' - - # Mininet configuration - tools_system_count: 2 - - # Features to install - install-features: 'odl-unimgr-ui,odl-unimgr-netvirt' - - # Robot custom options - robot-options: '' - - # mininet image - tools_system_image: ZZCI - Ubuntu 16.04 - mininet-ovs-25 - 20171208-1847 diff --git a/jjb/unimgr/unimgr.yaml b/jjb/unimgr/unimgr.yaml index e53712d93..4c63ee1e6 100644 --- a/jjb/unimgr/unimgr.yaml +++ b/jjb/unimgr/unimgr.yaml @@ -2,7 +2,6 @@ - project: name: unimgr-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: a695d0a0b8d51 -- project: - name: unimgr-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/nitrogen' - mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: a695d0a0b8d51 - -- project: - name: unimgr-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'unimgr' - project-name: 'unimgr' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'unimgr-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'ovsdb-merge-{stream}' - email-upstream: '[unimgr] [ovsdb]' - build-node: centos7-builder-4c-16g - - # Used by the release job - staging-profile-id: a695d0a0b8d51 - - project: name: unimgr-sonar jobs: diff --git a/jjb/usc/usc-csit-channel.yaml b/jjb/usc/usc-csit-channel.yaml index 4c418656e..72846d311 100644 --- a/jjb/usc/usc-csit-channel.yaml +++ b/jjb/usc/usc-csit-channel.yaml @@ -17,14 +17,9 @@ branch: 'master' trigger-jobs: '{project}-merge-{stream}' # yamllint disable-line rule:line-length - bundle-url: 'https://jenkins.opendaylight.org/releng/view/usc/job/usc-merge-fluorine/lastBuild/org.opendaylight.usc$usc-karaf/artifact/org.opendaylight.usc/usc-karaf/1.6.0-SNAPSHOT/usc-karaf-1.6.0-SNAPSHOT.zip' + repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/usc/usc-csit-tcp.yaml b/jjb/usc/usc-csit-tcp.yaml index 46781e36c..c0a3cf701 100644 --- a/jjb/usc/usc-csit-tcp.yaml +++ b/jjb/usc/usc-csit-tcp.yaml @@ -15,13 +15,10 @@ stream: - fluorine: branch: 'master' + # yamllint disable-line rule:line-length + repo-url: 'mvn:org.opendaylight.usc/usc-features/1.6.0-SNAPSHOT/xml/features' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/usc/usc.yaml b/jjb/usc/usc.yaml index 772a8d932..f7dfeb8c5 100644 --- a/jjb/usc/usc.yaml +++ b/jjb/usc/usc.yaml @@ -2,7 +2,6 @@ - project: name: usc-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - '{project-name}-maven-javadoc-jobs' - odl-maven-jobs @@ -37,45 +36,6 @@ # Used by the release job staging-profile-id: a697b633b3ffe -- project: - name: usc-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'usc' - project-name: 'usc' - branch: 'stable/nitrogen' - mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - - # Used by the release job - staging-profile-id: a697b633b3ffe - -- project: - name: usc-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'usc' - project-name: 'usc' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'usc-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'controller-merge-{stream},yangtools-merge-{stream},odlparent-merge-{stream}' - email-upstream: '[usc] [controller] [yangtools] [odlparent]' - - # Used by the release job - staging-profile-id: a697b633b3ffe - - project: name: usc-sonar jobs: diff --git a/jjb/usecplugin/usecplugin-csit-basic.yaml b/jjb/usecplugin/usecplugin-csit-basic.yaml index ff278048d..edbf3601e 100644 --- a/jjb/usecplugin/usecplugin-csit-basic.yaml +++ b/jjb/usecplugin/usecplugin-csit-basic.yaml @@ -17,11 +17,6 @@ branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - all: diff --git a/jjb/usecplugin/usecplugin.yaml b/jjb/usecplugin/usecplugin.yaml index 459dccd32..1b017719b 100644 --- a/jjb/usecplugin/usecplugin.yaml +++ b/jjb/usecplugin/usecplugin.yaml @@ -2,7 +2,6 @@ - project: name: usecplugin-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a69902281e037 -- project: - name: usecplugin-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'usecplugin' - project-name: 'usecplugin' - branch: 'stable/nitrogen' - mvn-settings: 'usecplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[usecplugin] [openflowplugin]' - - # Used by the release job - staging-profile-id: a69902281e037 - -- project: - name: usecplugin-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'usecplugin' - project-name: 'usecplugin' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'usecplugin-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'openflowplugin-merge-{stream}' - email-upstream: '[usecplugin] [openflowplugin]' - - # Used by the release job - staging-profile-id: a69902281e037 - - project: name: usecplugin-sonar jobs: diff --git a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml b/jjb/vtn/vtn-manager-csit-1node-openstack.yaml deleted file mode 100644 index 6fd69d820..000000000 --- a/jjb/vtn/vtn-manager-csit-1node-openstack.yaml +++ /dev/null @@ -1,49 +0,0 @@ ---- -- project: - name: vtn-manager-csit-openstack-integration - jobs: - - inttest-csit-openstack - - # The project name - project: 'vtn' - - topology: - - 1node: - openstack_system_count: 1 - odl_system_count: 1 - enable-haproxy: 'no' - install-features: 'odl-vtn-manager-neutron,odl-restconf-all' - - testplan: '{project}-{topology}-openstack.txt' - - # The project name - functionality: 'neutron' - - stream: - - fluorine: - branch: 'master' - - oxygen: - branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - - openstack: - - pike: - openstack-branch: 'stable/pike' - odl-ml2-branch: 'stable/pike' - openstack_system_image: '{openstack_system_image_pike}' - openstack_system2_image: '{openstack_system_image_pike}' - enable-openstack-services: 'n-cpu,placement-api,placement-client,tempest' - enable-openstack-network-services: '{openstack_legacy_default_network_services}' - odl-ml2-port-binding: 'legacy-port-binding' - - odl-enable-l3: 'no' - public-bridge: 'br-ex' - disable-openstack-services: 'n-net,q-l3' - tenant-network-type: 'local' - odl_system_flavor: v2-standard-8 - openstack_system_flavor: v2-standard-8 - odl-ml2-driver-version: 'v2' diff --git a/jjb/vtn/vtn-patch-test.yaml b/jjb/vtn/vtn-patch-test.yaml deleted file mode 100644 index eceaf80aa..000000000 --- a/jjb/vtn/vtn-patch-test.yaml +++ /dev/null @@ -1,34 +0,0 @@ ---- -- project: - name: vtn-patch-test - jobs: - - inttest-patch-test - - # The project name - project: 'vtn' - - feature: 'all' - - # Project branches - stream: - - fluorine: - branch: 'master' - csit-list: > - vtn-csit-1node-manager-all-{stream}, - vtn-csit-3node-manager-all-{stream} - - oxygen: - branch: 'stable/oxygen' - csit-list: > - vtn-csit-1node-manager-all-{stream}, - vtn-csit-3node-manager-all-{stream} - - nitrogen: - branch: 'stable/nitrogen' - csit-list: > - vtn-csit-1node-manager-all-{stream}, - vtn-csit-3node-manager-all-{stream} - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 - csit-list: > - vtn-csit-1node-manager-all-{stream}, - vtn-csit-3node-manager-all-{stream} diff --git a/jjb/vtn/vtn.yaml b/jjb/vtn/vtn.yaml deleted file mode 100644 index 9d47eaf4c..000000000 --- a/jjb/vtn/vtn.yaml +++ /dev/null @@ -1,112 +0,0 @@ ---- -- project: - name: vtn-fluorine - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: fluorine - project: 'vtn' - project-name: 'vtn' - branch: 'master' - mvn-settings: 'vtn-settings' - mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' - email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' - - # Please do not archive maven sites!!! - # Maven sites are published to Nexus at: - # https://nexus.opendaylight.org/content/sites/site/ - archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' - - # Used by the release job - staging-profile-id: a699799dd6fc9 - -- project: - name: vtn-oxygen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: oxygen - project: 'vtn' - project-name: 'vtn' - branch: 'stable/oxygen' - mvn-settings: 'vtn-settings' - mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' - email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' - - # Please do not archive maven sites!!! - # Maven sites are published to Nexus at: - # https://nexus.opendaylight.org/content/sites/site/ - archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' - - # Used by the release job - staging-profile-id: a699799dd6fc9 - -- project: - name: vtn-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'vtn' - project-name: 'vtn' - branch: 'stable/nitrogen' - mvn-settings: 'vtn-settings' - mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' - email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' - - # Please do not archive maven sites!!! - # Maven sites are published to Nexus at: - # https://nexus.opendaylight.org/content/sites/site/ - archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' - - # Used by the release job - staging-profile-id: a699799dd6fc9 - -- project: - name: vtn-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'vtn' - project-name: 'vtn' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'vtn-settings' - mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'neutron-merge-{stream},openflowplugin-merge-{stream},ovsdb-merge-{stream}' - email-upstream: '[vtn] [neutron] [openflowplugin] [ovsdb]' - - # Please do not archive maven sites!!! - # Maven sites are published to Nexus at: - # https://nexus.opendaylight.org/content/sites/site/ - archive-artifacts: 'manager/dist/*/target/*.zip coordinator/dist/target/*.bz2' - - # Used by the release job - staging-profile-id: a699799dd6fc9 - -- project: - name: vtn-sonar - jobs: - - gerrit-maven-sonar - project: 'vtn' - project-name: 'vtn' - branch: 'master' - mvn-settings: 'vtn-settings' - mvn-goals: 'clean deploy -V -Pintegrationtests,strictcheck,docs -Dvtn.build.jobs=2' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/yang-push/yang-push.yaml b/jjb/yang-push/yang-push.yaml index da08c4bdd..5083bbfae 100644 --- a/jjb/yang-push/yang-push.yaml +++ b/jjb/yang-push/yang-push.yaml @@ -2,7 +2,6 @@ - project: name: yang-push-fluorine jobs: - - '{project-name}-distribution-check-{stream}' - odl-maven-jobs stream: fluorine @@ -35,43 +34,6 @@ # Used by the release job staging-profile-id: a69aae2832869 -- project: - name: yang-push-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: nitrogen - project: 'yang-push' - project-name: 'yang-push' - branch: 'stable/nitrogen' - mvn-settings: 'yang-push-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[yang-push]' - - # Used by the release job - staging-profile-id: a69aae2832869 - -- project: - name: yang-push-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - odl-maven-jobs - - stream: carbon - project: 'yang-push' - project-name: 'yang-push' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'yang-push-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: '' - email-upstream: '[yang-push]' - - # Used by the release job - staging-profile-id: a69aae2832869 - - project: name: yang-push-sonar jobs: diff --git a/jjb/yangide/yangide.yaml b/jjb/yangide/yangide.yaml index 2e8ec0ae2..be65fd219 100644 --- a/jjb/yangide/yangide.yaml +++ b/jjb/yangide/yangide.yaml @@ -33,41 +33,6 @@ # Used by the release job staging-profile-id: fba306956f98 -- project: - name: yangide-nitrogen - jobs: - - odl-maven-jobs - - stream: nitrogen - project: 'yangide' - project-name: 'yangide' - branch: 'stable/nitrogen' - mvn-settings: 'yangide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[yangide] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: fba306956f98 - -- project: - name: yangide-carbon - jobs: - - odl-maven-jobs - - stream: carbon - project: 'yangide' - project-name: 'yangide' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'yangide-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}' - email-upstream: '[yangide] [odlparent] [yangtools]' - - # Used by the release job - staging-profile-id: fba306956f98 - - project: name: yangide-sonar jobs: diff --git a/jjb/yangtools/yangtools-csit-system.yaml b/jjb/yangtools/yangtools-csit-system.yaml index f27bc5f50..5a68f2b1e 100644 --- a/jjb/yangtools/yangtools-csit-system.yaml +++ b/jjb/yangtools/yangtools-csit-system.yaml @@ -2,7 +2,7 @@ - project: name: yangtools-csit-system jobs: - - inttest-csit-1node-periodic + - inttest-csit-1node # The project name project: 'yangtools' @@ -12,16 +12,10 @@ # Project branches. stream: - # The tested component was only introduced in Carbon. - fluorine: branch: 'master' - oxygen: branch: 'stable/oxygen' - - nitrogen: - branch: 'stable/nitrogen' - - carbon: - branch: 'stable/carbon' - karaf-version: karaf3 install: - only: diff --git a/jjb/yangtools/yangtools-patch-test.yaml b/jjb/yangtools/yangtools-patch-test.yaml new file mode 100644 index 000000000..87921261a --- /dev/null +++ b/jjb/yangtools/yangtools-patch-test.yaml @@ -0,0 +1,30 @@ +--- +- project: + name: yangtools-patch-test + jobs: + - inttest-patch-test + + project: 'yangtools' + + stream: + - fluorine: + branch: 'master' + os-branch: 'queens' + - oxygen: + branch: 'stable/oxygen' + os-branch: 'queens' + + jdk: 'openjdk8' + + feature: + - netvirt: + csit-list: > + netvirt-csit-1node-openstack-{os-branch}-gate-stateful-{stream} + + - cluster-netvirt: + csit-list: > + netvirt-csit-3node-openstack-{os-branch}-gate-stateful-{stream} + + - genius: + csit-list: > + genius-csit-1node-gate-all-{stream} diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml index 2812b50aa..0e5ccb848 100644 --- a/jjb/yangtools/yangtools.yaml +++ b/jjb/yangtools/yangtools.yaml @@ -26,62 +26,6 @@ # Used by the release job staging-profile-id: 1271cf710cc09d -- project: - name: yangtools-nitrogen - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: nitrogen - project: 'yangtools' - project-name: 'yangtools' - branch: 'v1.2.x' - distribution_branch: 'stable/nitrogen' - mvn-settings: 'yangtools-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[yangtools] [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 - staging-profile-id: 1271cf710cc09d - -- project: - name: yangtools-carbon - jobs: - - '{project-name}-distribution-check-{stream}' - - '{project-name}-maven-javadoc-jobs' - - odl-maven-jobs - - stream: carbon - project: 'yangtools' - project-name: 'yangtools' - branch: 'stable/carbon' - karaf-version: karaf3 - mvn-settings: 'yangtools-settings' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - - dependencies: 'odlparent-merge-{stream}' - email-upstream: '[yangtools] [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 - staging-profile-id: 1271cf710cc09d - - project: name: yangtools-sonar jobs: diff --git a/openstack-hot/generic-server.yaml b/openstack-hot/generic-server.yaml index f4cbb5cdd..6fbab522c 100644 --- a/openstack-hot/generic-server.yaml +++ b/openstack-hot/generic-server.yaml @@ -39,17 +39,11 @@ resources: allowed_address_pairs: - ip_address: 10.250.0.0/24 network: odlci - volume: - type: "OS::Cinder::Volume" - properties: - image: {get_param: vm_image} - size: 40 instance: type: "OS::Nova::Server" properties: + image: {get_param: vm_image} flavor: {get_param: vm_flavor} - block_device_mapping_v2: - - volume_id: {get_resource: volume} name: str_replace: template: SILO-JOB_NAME-GROUP-VM_TYPE-INDEX diff --git a/packer/common-packer b/packer/common-packer index e3344fc74..54119a666 160000 --- a/packer/common-packer +++ b/packer/common-packer @@ -1 +1 @@ -Subproject commit e3344fc74b1fc3e40cf8f4f7e713047373d9b177 +Subproject commit 54119a6668c212276639e556ce36ba54c0960f2b diff --git a/packer/provision/examples/apache-e-w.yaml b/packer/provision/examples/apache-e-w.yaml new file mode 100644 index 000000000..bb84fa1b9 --- /dev/null +++ b/packer/provision/examples/apache-e-w.yaml @@ -0,0 +1,15 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + name: apacheservice + role: service + name: apacheservice +spec: + ports: + - port: 8800 + targetPort: 80 + protocol: TCP + name: tcp + selector: + name: webserver diff --git a/packer/provision/examples/apache-n-s.yaml b/packer/provision/examples/apache-n-s.yaml new file mode 100644 index 000000000..7b774e404 --- /dev/null +++ b/packer/provision/examples/apache-n-s.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + labels: + name: apacheexternal + role: service + name: apacheexternal +spec: + ports: + - port: 8800 + targetPort: 80 + protocol: TCP + name: tcp + selector: + name: webserver + type: NodePort diff --git a/packer/provision/examples/apache-pod.yaml b/packer/provision/examples/apache-pod.yaml new file mode 100644 index 000000000..cb97d1359 --- /dev/null +++ b/packer/provision/examples/apache-pod.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Pod +metadata: + name: apachetwin + labels: + name: webserver +spec: + containers: + - name: apachetwin + image: fedora/apache diff --git a/packer/provision/examples/busybox.yaml b/packer/provision/examples/busybox.yaml new file mode 100644 index 000000000..babb7652f --- /dev/null +++ b/packer/provision/examples/busybox.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: Pod +metadata: + name: busybox + namespace: default +spec: + containers: + - image: busybox + command: + - sleep + - "3600" + imagePullPolicy: IfNotPresent + name: busybox + restartPolicy: Always diff --git a/packer/provision/examples/nginx-pod.yaml b/packer/provision/examples/nginx-pod.yaml new file mode 100644 index 000000000..d72959ee7 --- /dev/null +++ b/packer/provision/examples/nginx-pod.yaml @@ -0,0 +1,10 @@ +apiVersion: v1 +kind: Pod +metadata: + name: nginxtwin + labels: + name: webserver +spec: + containers: + - name: nginxtwin + image: nginx diff --git a/packer/provision/kubernetes.yaml b/packer/provision/kubernetes.yaml new file mode 100644 index 000000000..ecf9e5f21 --- /dev/null +++ b/packer/provision/kubernetes.yaml @@ -0,0 +1,36 @@ +--- +- import_playbook: ../common-packer/provision/baseline.yaml + +- hosts: all + vars: + openvswitch_version: 2.8.2 + openvswitch_checksum: sha256:87b4a7e7134a44ce1f808d3415a2244b4518c2b0b2a42fa2f8231e592f13103d + k8s_version: 1.9.4 + + pre_tasks: + - include_role: name=lfit.system-update + + roles: + - lfit.docker-install + - fkautz.bridge-utils-install + - fkautz.golang-install + - fkautz.kubernetes-install + - fkautz.openvswitch-install + +- hosts: all + tasks: + - name: Make example directory + file: + path: /opt/k8s-examples + state: directory + become: true + - name: Copy example files to example directory + synchronize: + src: ../provision/examples/ + dest: /opt/k8s-examples/ + become: true + + post_tasks: + - name: System Reseal + script: ../common-packer/provision/system-reseal.sh + become: true diff --git a/packer/provision/local-builder.yaml b/packer/provision/local-builder.yaml index 7881b1306..00fa332a7 100644 --- a/packer/provision/local-builder.yaml +++ b/packer/provision/local-builder.yaml @@ -13,10 +13,10 @@ hbase_version: 0.94.27 pre_tasks: - - include_role: name=system-update + - include_role: name=lfit.system-update roles: - - mono-install + - lfit.mono-install tasks: - name: Install Cassandra Server diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index 919ba279a..0d0e1142c 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -6,7 +6,7 @@ become_method: sudo pre_tasks: - - include_role: name=system-update + - include_role: name=lfit.system-update post_tasks: - name: System Reseal diff --git a/packer/provision/mininet-ovs-2.8.yaml b/packer/provision/mininet-ovs-2.8.yaml index e85baf21e..f07daa8a1 100644 --- a/packer/provision/mininet-ovs-2.8.yaml +++ b/packer/provision/mininet-ovs-2.8.yaml @@ -9,7 +9,7 @@ ovs_version: 2.8.1 pre_tasks: - - include_role: name=system-update + - include_role: name=lfit.system-update tasks: - name: 'Install OpenVSwitch {{ovs_version}}' diff --git a/packer/provision/robot.yaml b/packer/provision/robot.yaml index 88509d60c..9ab7610d8 100644 --- a/packer/provision/robot.yaml +++ b/packer/provision/robot.yaml @@ -6,7 +6,7 @@ become_method: sudo pre_tasks: - - include_role: name=system-update + - include_role: name=lfit.system-update tasks: - name: Install robot dependencies diff --git a/packer/provision/roles/coe/requirements.yaml b/packer/provision/roles/coe/requirements.yaml new file mode 100644 index 000000000..c4e1b217b --- /dev/null +++ b/packer/provision/roles/coe/requirements.yaml @@ -0,0 +1,5 @@ +--- +- src: fkautz.bridge-utils-install +- src: fkautz.openvswitch-install +- src: fkautz.kubernetes-install +- src: fkautz.golang-install diff --git a/packer/provision/templates/odlovs-cni.conf.j2 b/packer/provision/templates/odlovs-cni.conf.j2 new file mode 100644 index 000000000..37829085c --- /dev/null +++ b/packer/provision/templates/odlovs-cni.conf.j2 @@ -0,0 +1,22 @@ +{ + "cniVersion": "0.3.0", + "name": "odl-cni", + "type": "odlovs-cni", + "mgrPort": {{ manager_port }}, + "mgrActive": true, + "manager": "{{ manager_ip }}", + "ovsBridge": "br-int", + "ctlrPort": {{ controller_port }}, + "ctlrActive": true, + "controller": "{{ controller_ip }}", + "externalIntf": "{{ external_interface }}", + "externalIp": "{{ external_ip }}", + "ipam": { + "type": "host-local", + "subnet": "{{ subnet }}", + "routes": [{ + "dst": "0.0.0.0/0" + }], + "gateway": "{{ gateway }}" + } +} diff --git a/packer/templates/kubernetes.json b/packer/templates/kubernetes.json new file mode 100644 index 000000000..bce854de6 --- /dev/null +++ b/packer/templates/kubernetes.json @@ -0,0 +1,64 @@ +{ + "variables": { + "ansible_roles_path": "roles/coe", + "base_image": null, + "distro": null, + "cloud_auth_url": null, + "cloud_user": null, + "cloud_pass": null, + "cloud_network": null, + "cloud_tenant": null, + "cloud_user_data": null, + "ssh_user": null, + "ssh_proxy_host": "" + }, + "builders": [ + { + "name": "vexxhost", + "image_name": "ZZCI - {{user `distro`}} - kubernetes - {{isotime \"20060102-1504\"}}", + "source_image_name": "{{user `base_image`}}", + "type": "openstack", + "identity_endpoint": "{{user `cloud_auth_url`}}", + "username": "{{user `cloud_user`}}", + "password": "{{user `cloud_pass`}}", + "tenant_name": "{{user `cloud_tenant`}}", + "domain_name": "Default", + "region": "ca-ymq-1", + "availability_zone": "ca-ymq-2", + "networks": [ + "{{user `cloud_network`}}" + ], + "user_data_file": "{{user `cloud_user_data`}}", + "ssh_username": "{{user `ssh_user`}}", + "ssh_proxy_host": "{{user `ssh_proxy_host`}}", + "flavor": "v1-standard-1", + "metadata": { + "ci_managed": "yes" + } + } + ], + "provisioners": [ + { + "type": "shell", + "scripts": [ + "common-packer/provision/install-python.sh" + ], + "execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi" + }, + { + "type": "shell-local", + "command": "./common-packer/ansible-galaxy.sh {{user `ansible_roles_path`}} provision/roles/coe/requirements.yaml" + }, + { + "type": "ansible", + "playbook_file": "provision/kubernetes.yaml", + "ansible_env_vars": [ + "ANSIBLE_NOCOWS=1", + "ANSIBLE_PIPELINING=True", + "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", + "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", + "ANSIBLE_STDOUT_CALLBACK=debug" + ] + } + ] +} diff --git a/packer/templates/mininet-ovs-2.8.json b/packer/templates/mininet-ovs-2.8.json index 142d492e3..c79db5556 100644 --- a/packer/templates/mininet-ovs-2.8.json +++ b/packer/templates/mininet-ovs-2.8.json @@ -1,5 +1,6 @@ { "variables": { + "ansible_roles_path": ".galaxy", "base_image": null, "distro": null, "cloud_auth_url": null, @@ -50,7 +51,7 @@ "ansible_env_vars": [ "ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH=../lf-ansible/roles", + "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug" ] diff --git a/packer/templates/robot.json b/packer/templates/robot.json index 33aa9f654..33a85ef03 100644 --- a/packer/templates/robot.json +++ b/packer/templates/robot.json @@ -1,5 +1,6 @@ { "variables": { + "ansible_roles_path": ".galaxy", "base_image": null, "distro": null, "cloud_auth_url": null, @@ -50,7 +51,7 @@ "ansible_env_vars": [ "ANSIBLE_NOCOWS=1", "ANSIBLE_PIPELINING=True", - "ANSIBLE_ROLES_PATH=../lf-ansible/roles", + "ANSIBLE_ROLES_PATH={{user `ansible_roles_path`}}", "ANSIBLE_CALLBACK_WHITELIST=profile_tasks", "ANSIBLE_STDOUT_CALLBACK=debug" ] diff --git a/packer/vars/ubuntu-14.04.json b/packer/vars/ubuntu-14.04.json index 882d9598d..ffee4da39 100644 --- a/packer/vars/ubuntu-14.04.json +++ b/packer/vars/ubuntu-14.04.json @@ -1,5 +1,5 @@ { - "base_image": "LF - Ubuntu 14.04 LTS (2017-12-01)", + "base_image": "Ubuntu 14.04.5 LTS (2017-12-05) - LF upload", "distro": "Ubuntu 14.04", "ssh_user": "ubuntu", "cloud_user_data": "provision/null_data.sh" diff --git a/tox.ini b/tox.ini index 1f08557af..ad3eb3188 100644 --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] minversion = 1.6 -envlist = coala,docs,pep8,robot +envlist = coala,docs,pep8,prefix,robot skipsdist = true [testenv:coala]