Merge "Fix SC2059 for ShellCheck 0.4.4, printf formatting"
authorSam Hague <shague@redhat.com>
Thu, 29 Nov 2018 21:21:56 +0000 (21:21 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Thu, 29 Nov 2018 21:21:56 +0000 (21:21 +0000)
126 files changed:
global-jjb
jjb/aaa/aaa.yaml
jjb/alto/alto.yaml
jjb/ansible/ansible.yaml [new file with mode: 0644]
jjb/archetypes/archetypes.yaml
jjb/autorelease/autorelease-macros.yaml
jjb/autorelease/autorelease-projects.yaml
jjb/autorelease/autorelease-templates.yaml
jjb/autorelease/version-bump.sh
jjb/bgpcep/bgpcep.yaml
jjb/bier/bier.yaml
jjb/capwap/capwap.yaml
jjb/cardinal/cardinal.yaml
jjb/centinel/centinel.yaml
jjb/coe/coe-csit.yaml
jjb/coe/coe-patch-test.yaml
jjb/coe/coe.yaml
jjb/controller/controller.yaml
jjb/coretutorials/coretutorials.yaml
jjb/daexim/daexim.yaml
jjb/defaults.yaml
jjb/didm/didm.yaml
jjb/dlux/dlux.yaml
jjb/dluxapps/dluxapps.yaml
jjb/docs/docs-rtd.yaml
jjb/eman/eman.yaml
jjb/faas/faas.yaml
jjb/federation/federation.yaml
jjb/generate-p2pom.sh [deleted file]
jjb/genius/genius-csit-genius.yaml
jjb/genius/genius.yaml
jjb/groupbasedpolicy/groupbasedpolicy-csit-1node-openstack.yaml
jjb/groupbasedpolicy/groupbasedpolicy.yaml
jjb/honeycomb/vbd/vbd.yaml
jjb/infrautils/infrautils-patch-test.yaml
jjb/infrautils/infrautils.yaml
jjb/integration/common-functions.sh
jjb/integration/csit-jobs-fluorine.lst
jjb/integration/csit-jobs-neon.lst
jjb/integration/csit-jobs-oxygen.lst
jjb/integration/distribution/distribution-jobs.yaml
jjb/integration/distribution/distribution-templates.yaml
jjb/integration/integration-apex-run-tests.sh
jjb/integration/integration-deploy-controller-run-test.sh
jjb/integration/integration-deploy-openstack-run-test.sh
jjb/integration/integration-start-cluster-run-test.sh
jjb/integration/integration-templates.yaml
jjb/integration/integration-test-jobs.yaml
jjb/iotdm/iotdm.yaml
jjb/jsonrpc/jsonrpc.yaml
jjb/l2switch/l2switch.yaml
jjb/lacp/lacp.yaml
jjb/lf-infra/lf-infra-jobs.yaml
jjb/lfn/lfn.yaml
jjb/lispflowmapping/lispflowmapping.yaml
jjb/mdsal/mdsal.yaml
jjb/natapp/natapp.yaml
jjb/nemo/nemo.yaml
jjb/netconf/netconf-cluster-stress.yaml [deleted file]
jjb/netconf/netconf-clustering-scale.yaml
jjb/netconf/netconf-clustering.yaml
jjb/netconf/netconf.yaml
jjb/netide/netide.yaml
jjb/netvirt/netvirt-csit-hwvtep-openstack.yaml
jjb/netvirt/netvirt-csit-multi-apex.yaml
jjb/netvirt/netvirt-csit-multi-openstack-upgrade.yaml
jjb/netvirt/netvirt-csit-multi-openstack.yaml
jjb/netvirt/netvirt-patch-test.yaml
jjb/netvirt/netvirt.yaml
jjb/neutron/neutron.yaml
jjb/next/next.yaml
jjb/nic/nic.yaml
jjb/ocpplugin/ocpplugin.yaml
jjb/odl-openstack-check-image-protection.sh [deleted file]
jjb/odl-openstack-cleanup-old-images.sh [deleted file]
jjb/odl-openstack-cleanup-orphaned-nodes.sh [deleted file]
jjb/odl-openstack-cleanup-stale-nodes.sh [deleted file]
jjb/odl-openstack-cleanup-stale-stacks.sh [deleted file]
jjb/odl-openstack-cleanup-stale-volumes.sh [deleted file]
jjb/odl-openstack-install.sh [deleted file]
jjb/odlparent/odlparent.yaml
jjb/odltools/odltools-csit.yaml
jjb/odltools/odltools.yaml
jjb/of-config/of-config.yaml
jjb/openci/openci-odl-daily-jobs.yaml
jjb/openflowplugin/openflowplugin-csit-cbench.yaml
jjb/openflowplugin/openflowplugin-csit-clustering-perf-bulkomatic.yaml
jjb/openflowplugin/openflowplugin.yaml
jjb/opflex/opflex-macros.yaml
jjb/opflex/opflex.yaml
jjb/opflex/scripts/deploy-opflex.sh
jjb/ovil/ovil.yaml
jjb/ovsdb/ovsdb-full-integration.yaml
jjb/ovsdb/ovsdb-sonar.yaml
jjb/ovsdb/ovsdb.yaml
jjb/p4plugin/p4plugin.yaml
jjb/packaging/packaging-ansible.yaml [moved from jjb/packaging/ansible.yaml with 89% similarity]
jjb/packaging/packaging-puppet.yaml [moved from jjb/packaging/puppet.yaml with 93% similarity]
jjb/packaging/packaging.yaml
jjb/packaging/test-ansible-rpm-upgrade.sh [new file with mode: 0644]
jjb/packetcable/packetcable.yaml
jjb/releng-jobs.yaml
jjb/releng-macros.yaml
jjb/releng-templates-java.yaml
jjb/releng-templates.yaml [deleted file]
jjb/releng-views.yaml
jjb/sdninterfaceapp/sdninterfaceapp.yaml
jjb/serviceutils/serviceutils.yaml
jjb/sfc/sfc.yaml
jjb/snbi/snbi.yaml
jjb/snmp/snmp.yaml
jjb/snmp4sdn/snmp4sdn.yaml
jjb/stage-release.sh [deleted file]
jjb/sxp/sxp.yaml
jjb/systemmetrics/systemmetrics.yaml
jjb/telemetry/telemetry.yaml
jjb/transportpce/transportpce.yaml
jjb/tsdr/tsdr.yaml
jjb/ttp/ttp.yaml
jjb/unimgr/unimgr.yaml
jjb/update-p2composite-metadata.sh [deleted file]
jjb/usc/usc.yaml
jjb/usecplugin/usecplugin.yaml
jjb/yangtools/yangtools.yaml
packer/common-packer
scripts/check-unicode.sh [deleted file]

index 5d1ddb578a5253fc360a73be6ceea89d65af043e..8b56734eada742094399d6e52cbc2ddef7b39b2c 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5d1ddb578a5253fc360a73be6ceea89d65af043e
+Subproject commit 8b56734eada742094399d6e52cbc2ddef7b39b2c
index 01390c0781c228430f59c6b0d86ee19350b17cbf..7284ed1988c230664000acf7a765e426b4231a74 100644 (file)
 - project:
     name: aaa-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
     project: 'aaa'
     project-name: 'aaa'
@@ -74,8 +77,8 @@
     mvn-settings: 'aaa-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: aaa
-    description: 'List of aaa jobs'
-    regex: '^aaa-.*'
-    <<: *releng_view_common
+- project:
+    name: aaa-view
+    views:
+      - project-view
+    project-name: aaa
index 2c06d8482bd62e28db47c0d8ca0926129f0665a7..bde65374976126bafbe24f0718023f3025e4d5d9 100644 (file)
@@ -66,8 +66,8 @@
     mvn-settings: 'alto-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: alto
-    description: 'List of alto jobs'
-    regex: '^alto-.*'
-    <<: *releng_view_common
+- project:
+    name: alto-view
+    views:
+      - project-view
+    project-name: alto
diff --git a/jjb/ansible/ansible.yaml b/jjb/ansible/ansible.yaml
new file mode 100644 (file)
index 0000000..0295d49
--- /dev/null
@@ -0,0 +1,28 @@
+---
+- project:
+    name: ansible
+    jobs:
+      - '{project-name}-distribution-check-{stream}'
+      - '{project-name}-maven-javadoc-jobs'
+      - gerrit-tox-verify
+      - odl-maven-jobs
+
+    stream:
+      - neon:
+          branch: 'master'
+      - fluorine:
+          branch: 'stable/fluorine'
+
+    project: ansible
+    project-name: ansible
+    mvn-settings: 'netvirt-settings'
+    mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m'
+    build-node: centos7-builder-2c-2g
+    build-timeout: 60
+    staging-profile-id: 'da5a90345bd62'
+
+- project:
+    name: ansible-view
+    views:
+      - project-view
+    project-name: ansible
index 2f7052779831a133e8d8f4165b2c71e820222f76..b9a9761215044ce3f932877d849dacc86e2ddf94 100644 (file)
@@ -57,8 +57,8 @@
     branch: 'master'
     mvn-settings: 'archetypes-settings'
 
-- view:
-    name: archetypes
-    regex: '^archetypes-.*'
-    description: 'List of archetypes jobs'
-    <<: *releng_view_common
+- project:
+    name: archetypes-view
+    views:
+      - project-view
+    project-name: archetypes
index 60e3cfd9da0e5137d6161e0c56528d5d6f61beed..e66dc54b666d246aed896307430c97457daf16f5 100644 (file)
           settings-type: cfp
           global-settings: '{global-settings}'
           global-settings-type: cfp
-
-- builder:
-    name: autorelease-maven-sources-post-process
-    builders:
       - shell: |
           awk '/The following files have NOT been resolved:/,/^$/' sources.log > missing-sources.log
 
index 7818f8045d759551a6b5cb73e8667c8a73c21e2a..f0a200402575c3fbb1e9f102e66f7745318671b9 100644 (file)
@@ -43,8 +43,8 @@
         **/target/feature/feature.xml
     # TODO: **/*.hprof is too large, compress with xz first
 
-- view:
-    name: autorelease
-    description: 'List of autorelease jobs'
-    regex: '^autorelease-.*'
-    <<: *releng_view_common
+- project:
+    name: autorelease-view
+    views:
+      - project-view
+    project-name: autorelease
index 3d5bd1d66ee4feb1d9153d7f1aa3747d81b93a1d..50a23191e5080fa7f000a29415e6238eb7447310 100644 (file)
@@ -38,6 +38,7 @@
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
@@ -78,7 +79,7 @@
 
     parameters:
       - maven-exec:
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
       - lf-infra-parameters:
           project: '{project}'
           stream: '{stream}'
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - wipe-local-maven-repo
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - autorelease-cfp:
       # to enable building in a single maven reactor afterwards.
       - autorelease-fix-relative-paths
       - maven-target:
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
           pom: 'pom.xml'
           goals: |
               clean deploy
       - autorelease-get-integration-test-variables
       - autorelease-maven-sources:
           opendaylight-infra-mvn-opts: '{opendaylight-infra-mvn-opts}'
-          maven-version: 'mvn35'
+          maven-version: '{mvn-version}'
           settings: 'autorelease-settings'
           global-settings: 'global-settings'
-      - autorelease-maven-sources-post-process
       - shell: |
           mkdir -p archives/
           cp *.log *.prop $_
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
           refspec: 'refs/heads/master'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     triggers:
           refspec: 'refs/heads/{branch}'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
           refspec: '$GERRIT_REFSPEC'
           jenkins-ssh-credential: opendaylight-jenkins-ssh
           submodule-recursive: true
+          submodule-timeout: 10
           choosing-strategy: default
 
     wrappers:
       - lf-infra-pre-build
       - autorelease-checkout-gerrit-patch
       - autorelease-compare-projects
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
       - shell: "./scripts/list-project-dependencies.sh"
       - autorelease-determine-merge-order
       - autorelease-generate-release-patches
index 682d0fb6d292886e61ed343885b92a0f024ca417..7d81b33a24929ef7a53ff149ac14ad594bef943f 100644 (file)
@@ -58,6 +58,11 @@ if [ "$BRANCH_CUT" = "false" ]; then
 fi
 lftools version bump "$RELEASE_TAG"
 
+# Ignore changes to Final distribution since that will be released separately
+pushd integration/distribution || exit 1
+    git checkout -f opendaylight/pom.xml
+popd || exit 1
+
 git submodule foreach "git commit -asm 'Bump versions by x.y.(z+1)'"
 # Only submodules need to be bumped, we can ignore autorelease's bump information
 git checkout -f
index 2018d4e0752927dee689aad7419b2be443280ae4..aa10d9a1e481d0a4852c0375a276eec0bc4eb908 100644 (file)
@@ -99,8 +99,8 @@
     mvn-settings: 'bgpcep-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: bgpcep
-    description: 'List of bgpcep jobs'
-    regex: '^bgpcep-.*'
-    <<: *releng_view_common
+- project:
+    name: bgpcep-view
+    views:
+      - project-view
+    project-name: bgpcep
index 953bfee2def412af6c2c00779c20d090e075c5a5..bbebe4c86fc43af4aed1c8831cf10cbbf09eb048 100644 (file)
@@ -69,8 +69,8 @@
     mvn-settings: 'bier-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: bier
-    description: 'List of bier jobs'
-    regex: '^bier-.*'
-    <<: *releng_view_common
+- project:
+    name: bier-view
+    views:
+      - project-view
+    project-name: bier
index 3ecfeb5f1d20b904ce10d75ee8cf67494200764c..55af0a842e071011dcf3ebf8f056b88913ca5a62 100644 (file)
@@ -62,8 +62,9 @@
     mvn-settings: 'capwap-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: capwap
-    description: 'List of capwap jobs'
-    regex: '^capwap-.*'
-    <<: *releng_view_common
+
+- project:
+    name: capwap-view
+    views:
+      - project-view
+    project-name: capwap
index e13cf73b3ee6c38babbe7cf70a22a4e86d01bd0a..24fad7f9afe868017b985e3869cc864a4fdbb070 100644 (file)
@@ -62,8 +62,8 @@
     mvn-settings: 'cardinal-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: cardinal
-    description: 'List of cardinal jobs'
-    regex: '^cardinal-.*'
-    <<: *releng_view_common
+- project:
+    name: cardinal-view
+    views:
+      - project-view
+    project-name: cardinal
index ac2a045fb4051adf13953806a62cbd54e8361ae9..fc12a575bfa3aa4012dba3a14634398e5e73db52 100644 (file)
@@ -62,8 +62,8 @@
     mvn-settings: 'centinel-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: centinel
-    description: 'List of centinel jobs'
-    regex: '^centinel-.*'
-    <<: *releng_view_common
+- project:
+    name: centinel-view
+    views:
+      - project-view
+    project-name: centinel
index 2acda6eb014512dd691e81b8d153e0ea9b7b0e37..f7d21c7adaab4a5039bd9dc288d758f6c35182e7 100644 (file)
@@ -5,9 +5,10 @@
       - inttest-csit-1node
 
     project: 'coe'
-    functionality: 'container-networking'
-
     install-features: 'odl-netvirt-coe'
+    testplan: '{project}-container-networking.txt'
+    tools_system_count: 5
+    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
 
     stream:
       - neon:
@@ -18,8 +19,9 @@
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
-    tools_system_count: 5
-    tools_system_image: ZZCI - Ubuntu 16.04 - kubernetes - 20180723-235526.580
+    functionality:
+      - 'gate-container-networking'
+      - 'container-networking'
index e79ddf59b82ac8d2000d6d40c380cc0ef085b2b2..c22ec726c7f9175cb68356f2fcabd37ebd97658b 100644 (file)
@@ -19,4 +19,4 @@
     feature:
       - coe:
           csit-list: >
-              coe-csit-1node-container-networking-all-{stream}
+              coe-csit-1node-gate-container-networking-only-{stream}
index e18132ae8b474fe008620c888a092e85f6433fc4..8b01c9e56ca5c8b2082bb95ccd5d44cf8eec1bfa 100644 (file)
@@ -82,8 +82,8 @@
     mvn-settings: 'coe-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: coe
-    description: 'List of coe jobs'
-    regex: '^coe-.*'
-    <<: *releng_view_common
+- project:
+    name: coe-view
+    views:
+      - project-view
+    project-name: coe
index 0fe1d192014eac704d6256aa237525f86aef9b4e..0a16ec99ad9883c675f10003098d23aa6223f1a9 100644 (file)
 - project:
     name: controller-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
 
     project: 'controller'
     project-name: 'controller'
@@ -88,8 +91,8 @@
     mvn-goals: 'clean deploy -Pintegrationtests,docs'
     mvn-opts: '-Xmx4096m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
 
-- view:
-    name: controller
-    description: 'List of controller jobs'
-    regex: '^controller-.*'
-    <<: *releng_view_common
+- project:
+    name: controller-view
+    views:
+      - project-view
+    project-name: controller
index c62b1b4079c3a609859d44bf968f34d4a3be1e53..98897a155f893277985cbf567c45a8e55828de34 100644 (file)
@@ -65,8 +65,8 @@
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     build-timeout: 120
 
-- view:
-    name: coretutorials
-    description: 'List of coretutorials jobs'
-    regex: '^coretutorials-.*'
-    <<: *releng_view_common
+- project:
+    name: coretutorials-view
+    views:
+      - project-view
+    project-name: coretutorials
index 9852536a235b52a198035ea3c0dc4ef527ad7b77..99057ec6fb5dc56681ef72d5f0b3f420b3c72890 100644 (file)
@@ -74,8 +74,8 @@
     mvn-settings: 'daexim-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: daexim
-    description: 'List of daexim jobs'
-    regex: '^daexim-.*'
-    <<: *releng_view_common
+- project:
+    name: daexim-view
+    views:
+      - project-view
+    project-name: daexim
index dd99e39df603f00ef8f8790c0f9b1813a32c10a9..8f91a7f7b4ff7e733724e2f3d5ff98041c85aa01 100644 (file)
@@ -3,14 +3,8 @@
 
 - defaults:
     name: global
-    functionality: global
-    stream: global
     prefix: ''  # A prefix for job names sandbox for example: user-
 
-    scriptplan: '{project}.txt'
-    configplan: '{project}.txt'
-    testplan: '{project}-{functionality}.txt'
-    streamtestplan: '{project}-{functionality}-{stream}.txt'
     karaf-version: karaf4
     build-days-to-keep: 30
     use-features-boot: 'True'
     opendaylight-infra-mvn-opts: |
         --show-version
         --batch-mode
-        -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn
         -Djenkins
         -Dmaven.repo.local=/tmp/r
         -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
index 11a7b2cd01a0128694173fb016f5536af94d9ba2..baf62c47e26c3a165113693ace6c69b9c239f388 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'didm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: didm
-    description: 'List of didm jobs'
-    regex: '^didm-.*'
-    <<: *releng_view_common
+- project:
+    name: didm-view
+    views:
+      - project-view
+    project-name: didm
index 4308da7d41a7a9ecec40f2e39d6ef81c4fcb9a1b..d3aa75ecfa05e85b56152f9f50f3074b74e89201 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'dlux-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: dlux
-    description: 'List of dlux jobs'
-    regex: '^dlux-.*'
-    <<: *releng_view_common
+- project:
+    name: dlux-view
+    views:
+      - project-view
+    project-name: dlux
index 85aefe9de3fafb1b6dd2f4859b6ae895c812c598..14e23e2dfd65002e687655620fc21a40f56802bd 100644 (file)
@@ -66,8 +66,8 @@
     mvn-settings: 'dluxapps-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: dluxapps
-    description: 'List of dluxapps jobs'
-    regex: '^dluxapps-.*'
-    <<: *releng_view_common
+- project:
+    name: dluxapps-view
+    views:
+      - project-view
+    project-name: dluxapps
index 7ce8b8cc3712bdcb1ada11df28be85e6afaaf248..53ed32f95cd24cd7fe9bb056a4e57c57951e1ad5 100644 (file)
@@ -21,8 +21,8 @@
     rtd-build-url: https://readthedocs.org/api/v2/webhook/opendaylight/32322/
     rtd-token: 86e54dd38c651e2164ea63c183ae601d19cd1f3c
 
-- view:
-    name: docs
-    description: 'List of docs jobs'
-    regex: '^docs-.*'
-    <<: *releng_view_common
+- project:
+    name: docs-view
+    views:
+      - project-view
+    project-name: docs
index 919c4719b1b4fcde7d78f5c6d302692cacea6f42..be113bbe2615604d97cbf5e22235764b6fcb5667 100644 (file)
@@ -67,8 +67,8 @@
     mvn-settings: 'eman-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: eman
-    description: 'List of eman jobs'
-    regex: '^eman-.*'
-    <<: *releng_view_common
+- project:
+    name: eman-view
+    views:
+      - project-view
+    project-name: eman
index bf762128ab8c9aab115a1c2a6226952b06f254df..1cc73c323edef59132bb845863b42ff1dc3a3198 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'faas-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: faas
-    description: 'List of faas jobs'
-    regex: '^faas-.*'
-    <<: *releng_view_common
+- project:
+    name: faas-view
+    views:
+      - project-view
+    project-name: faas
index 114719cb31352821c6ac40a033cc577a77fd74c6..1769fe85d5882e4b8f53b640dd71e0a4fde49765 100644 (file)
@@ -65,8 +65,8 @@
     mvn-settings: 'federation-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: federation
-    description: 'List of federation jobs'
-    regex: '^federation-.*'
-    <<: *releng_view_common
+- project:
+    name: federation-view
+    views:
+      - project-view
+    project-name: federation
diff --git a/jjb/generate-p2pom.sh b/jjb/generate-p2pom.sh
deleted file mode 100644 (file)
index 05f54ef..0000000
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2016 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
-##############################################################################
-
-if [[ "$P2ZIP_URL" == "" ]]; then
-    P2ZIP_URL=opendaylight.snapshot/$(find . -name "*.zip" -type f -exec ls "{}" + | head -1)
-    FILE_NAME=$(echo "$P2ZIP_URL" | awk -F'/' '{ print $NF }')
-    RELEASE_PATH="snapshot"
-else
-    FILE_NAME=$(echo "$P2ZIP_URL" | awk -F'/' '{ print $NF }')
-    VERSION=$(echo "$P2ZIP_URL" | awk -F'/' '{ print $(NF-1) }')
-    RELEASE_PATH="release/$VERSION"
-    wget --quiet "$P2ZIP_URL" -O "$FILE_NAME"
-fi
-
-# If we detect a snapshot build then release to a snapshot repo
-# YangIDE has indicated that the only want the latest snapshot released to
-# the snapshot directory.
-if echo "$P2ZIP_URL" | grep opendaylight.snapshot; then
-    RELEASE_PATH="snapshot"
-fi
-
-cat > "${WORKSPACE}/pom.xml" <<EOF
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.$PROJECT</groupId>
-  <artifactId>p2repo</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>maven-upload-plugin</artifactId>
-        <version>0.0.1</version>
-        <executions>
-          <execution>
-            <id>publish-site</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>upload-file</goal>
-            </goals>
-            <configuration>
-              <serverId>opendaylight-p2</serverId>
-              <repositoryUrl>https://nexus.opendaylight.org/service/local/repositories/p2repos/content-compressed</repositoryUrl>
-              <file>$FILE_NAME</file>
-              <repositoryPath>org.opendaylight.$PROJECT/$RELEASE_PATH</repositoryPath>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-EOF
index 3986e83cc3720ed5767ec180629320bb263c2159..46315bb4b09d9bdde34ed71345342177d91a1428 100644 (file)
@@ -2,8 +2,8 @@
 - project:
     name: genius-csit-genius-oxygen-fluorine
     jobs:
-      - inttest-csit-1node
-      - inttest-csit-3node
+      - inttest-csit-1node-custom
+      - inttest-csit-3node-custom
 
     project: 'genius'
 
@@ -13,6 +13,8 @@
       - 'tdd-wip':
           testplan: '{project}-tdd-wip.txt'
 
+    testplan: '{project}-{functionality}.txt'
+
     stream:
       - neon:
           branch: 'master'
index 6461944d360e8373e671587ac4907dedf51941e8..4036ef22cef63f6121736caa746a13d2946decf2 100644 (file)
     mvn-settings: 'genius-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: genius
-    description: 'List of genius jobs'
-    regex: '^genius-.*'
-    <<: *releng_view_common
+- project:
+    name: genius-view
+    views:
+      - project-view
+    project-name: genius
index 6b33561b93d8f4454f90d24cf641402fe58cd379..732faf41eecfd4210190392bb47318bfba7dbefd 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: groupbasedpolicy-csit-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     # The project name
     project: 'groupbasedpolicy'
index 607b26b738692e0676e517b5a28c11fd54c85153..25cbca1dc9b00f088e6d585210da657e3825ebaf 100644 (file)
@@ -87,8 +87,8 @@
     mvn-goals: '-U clean deploy findbugs:findbugs'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: groupbasedpolicy
-    description: 'List of groupbasedpolicy jobs'
-    regex: '^groupbasedpolicy-.*'
-    <<: *releng_view_common
+- project:
+    name: groupbasedpolicy-view
+    views:
+      - project-view
+    project-name: groupbasedpolicy
index ff6d95171693d78e337f3e82a6351e84818bdde8..659a5765527f5d883be8afeced29d28d5c32fbee 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'honeycomb-vbd-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: vbd
-    description: 'List of vbd jobs'
-    regex: '^vbd-.*'
-    <<: *releng_view_common
+- project:
+    name: vbd-view
+    views:
+      - project-view
+    project-name: vbd
index 9b7a01ac030a6010a93fa5b214659d676d01ae57..b584fff798d72c56743f40865683a0e6d113176b 100644 (file)
@@ -31,3 +31,7 @@
       - genius:
           csit-list: >
               genius-csit-1node-gate-only-{stream}
+
+      - genius-cluster:
+          csit-list: >
+              genius-csit-3node-gate-only-{stream}
index 6ccd941b0e96a5a5bfcfda659a26b1b0e2705381..563eb54f694c76975d65e6893f9b79035c5ae694 100644 (file)
@@ -84,8 +84,8 @@
     mvn-settings: 'infrautils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: infrautils
-    description: 'List of infrautils jobs'
-    regex: '^infrautils-.*'
-    <<: *releng_view_common
+- project:
+    name: infrautils-view
+    views:
+      - project-view
+    project-name: infrautils
index ced2cc36e17028ad4be5186eeb9994d517c8c6c8..2c466d220a3f8c8052102af87620be5fc1e0396d 100644 (file)
@@ -133,6 +133,40 @@ function get_os_deploy() {
     export OPENSTACK_TOPO
 }
 
+function get_test_suites() {
+
+    #let the caller pick the name of the variable we will assign the suites to
+    local __suite_list=$1
+
+    echo "Locating test plan to use..."
+    testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
+    if [ ! -f "${testplan_filepath}" ]; then
+        testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
+    fi
+
+    echo "Changing the testplan path..."
+    cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
+    cat testplan.txt
+
+    # Use the testplan if specific SUITES are not defined.
+    if [ -z "${SUITES}" ]; then
+        suite_list=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
+    else
+        suite_list=""
+        workpath="${WORKSPACE}/test/csit/suites"
+        for suite in ${SUITES}; do
+            fullsuite="${workpath}/${suite}"
+            if [ -z "${suite_list}" ]; then
+                suite_list+=${fullsuite}
+            else
+                suite_list+=" "${fullsuite}
+            fi
+        done
+    fi
+
+    eval $__suite_list="'$suite_list'"
+}
+
 function run_plan() {
     local -r type=$1
 
index f81028f5db850c9bd02061061f923cc0c7c1dc77..43a7c9faa9425ddeb2bbbab772b38c129dca7f9b 100644 (file)
@@ -28,9 +28,8 @@ mdsal-csit-1node-bindingv1-only-fluorine,
 netconf-csit-1node-callhome-only-fluorine,
 netconf-csit-1node-scale-only-fluorine,
 netconf-csit-1node-userfeatures-all-fluorine,
-netconf-csit-3node-cluster-stress-all-fluorine,
-netconf-csit-3node-clustering-all-fluorine,
-netconf-csit-3node-clustering-scale-all-fluorine,
+netconf-csit-3node-clustering-only-fluorine,
+netconf-csit-3node-clustering-scale-only-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-fluorine,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-fluorine,
index 67fd3eca790c6daedfb7f96d923937df868a94e9..624bd5ea2f2d51b9e168307288ac2f9d45639c19 100644 (file)
@@ -28,9 +28,8 @@ mdsal-csit-1node-bindingv1-only-neon,
 netconf-csit-1node-callhome-only-neon,
 netconf-csit-1node-scale-only-neon,
 netconf-csit-1node-userfeatures-all-neon,
-netconf-csit-3node-cluster-stress-all-neon,
-netconf-csit-3node-clustering-all-neon,
-netconf-csit-3node-clustering-scale-all-neon,
+netconf-csit-3node-clustering-only-neon,
+netconf-csit-3node-clustering-scale-only-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-sfc-neon,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upgrade-neon,
index be4b4d8b4e8b4f9d6141a315750bdc425cbdae79..07703374698ad0dc851b5c781bb3dbdbb410b05c 100644 (file)
@@ -39,9 +39,8 @@ nemo-csit-1node-engine-all-oxygen,
 netconf-csit-1node-callhome-only-oxygen,
 netconf-csit-1node-scale-only-oxygen,
 netconf-csit-1node-userfeatures-all-oxygen,
-netconf-csit-3node-cluster-stress-all-oxygen,
-netconf-csit-3node-clustering-all-oxygen,
-netconf-csit-3node-clustering-scale-all-oxygen,
+netconf-csit-3node-clustering-only-oxygen,
+netconf-csit-3node-clustering-scale-only-oxygen,
 netvirt-csit-1node-0cmb-1ctl-1cmp-openstack-queens-sfc-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-apex-queens-upstream-snat-conntrack-oxygen,
 netvirt-csit-1node-0cmb-1ctl-2cmp-openstack-queens-upstream-stateful-itm-direct-tunnels-oxygen,
index 30cfc318aa8ff8b17510854ad2c97e0081b9bcf5..b01f86ccb4e96d76364c9f16ebb1b5923c9fc059 100644 (file)
@@ -25,8 +25,7 @@
           # Self-Managed projects repos and features:
           sm-repos: >
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
-              mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
-              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features,
+              mvn:org.opendaylight.tsdr/features-tsdr//xml/features
           sm-features: >
               odl-sxp-routing,
               odl-tsdr-core,
               odl-tsdr-cassandra,
               odl-tsdr-hbase,
               odl-tsdr-hsqldb,
-              odl-tsdr-elasticsearch,
-              odl-unimgr,
-              odl-unimgr-template-driver,
-              odl-unimgr-cisco-xr-driver,
-              odl-unimgr-ovs-driver,
+              odl-tsdr-elasticsearch
       - fluorine:
           branch: 'stable/fluorine'
           karaf-version: odl
           # Self-Managed projects repos and features:
           sm-repos: >
-              mvn:org.opendaylight.snmp4sdn/features-snmp4sdn//xml/features,
               mvn:org.opendaylight.sxp/features-sxp//xml/features,
               mvn:org.opendaylight.transportpce/features-transportpce//xml/features,
-              mvn:org.opendaylight.tsdr/features-tsdr//xml/features,
-              mvn:org.opendaylight.unimgr/features4-unimgr//xml/features,
           sm-features: >
-              odl-snmp4sdn-snmp4sdn
               odl-sxp-routing,
               odl-transportpce,
               odl-transportpce-api,
               odl-transportpce-ordmodels,
-              odl-transportpce-stubmodels,
-              odl-tsdr-core,
-              odl-tsdr-openflow-statistics-collector,
-              odl-tsdr-netflow-statistics-collector,
-              odl-tsdr-restconf-collector,
-              odl-tsdr-syslog-collector,
-              odl-tsdr-controller-metrics-collector,
-              odl-tsdr-cassandra,
-              odl-tsdr-hbase,
-              odl-tsdr-hsqldb,
-              odl-tsdr-elasticsearch,
-              odl-unimgr,
-              odl-unimgr-template-driver,
-              odl-unimgr-cisco-xr-driver,
-              odl-unimgr-ovs-driver,
+              odl-transportpce-stubmodels
+
       - oxygen:
           branch: 'stable/oxygen'
           karaf-version: karaf4
     mvn-goals: clean install dependency:tree -DoutputFile=dependency_tree.txt
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: distribution
-    description: 'List of distribution jobs'
-    regex: '^(integration-)?distribution-.*'
-    <<: *releng_view_common
+- project:
+    name: distribution-view
+    views:
+      - common-view
+    view-name: distribution
+    view-regex: '^(integration-)?distribution-.*'
index fb4237169d7b7c143a9362775207699c05df6905..dff504740b240d78381e39281870f373dd464a55 100644 (file)
@@ -1,7 +1,4 @@
 ---
-- project:
-    name: distribution-templates
-
 - job-template:
     name: '{project-name}-distribution-check-{stream}'
 
 
     builders:
       - wipe-org-opendaylight-repo
-      - provide-maven-settings:
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
 
     prebuilders:
       - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
+      - lf-jacoco-nojava-workaround
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - integration-set-variables
           email-prefix: '[{project-name}]'
       - integration-csit-archive-build
       - lf-infra-publish
-
index e7875281b03c5ada6f8c7a9b871f287b50643888..7b7d128fbd83861be7d8dbca51fe3f84b897580a 100644 (file)
@@ -8,6 +8,8 @@ source /tmp/common-functions.sh ${BUNDLEFOLDER}
 # Ensure we fail the job if any steps fail.
 set -ex -o pipefail
 
+print_job_parameters
+
 get_os_deploy
 
 # Swap out the ODL distribution
@@ -98,22 +100,7 @@ ssh ${OPENSTACK_CONTROL_NODE_1_IP} "sudo ovs-vsctl show"
 ssh ${OPENSTACK_COMPUTE_NODE_1_IP} "sudo ovs-vsctl show"
 ssh ${OPENSTACK_COMPUTE_NODE_2_IP} "sudo ovs-vsctl show"
 
-# Use the testplan if specific SUITES are not defined.
-if [ -z "${SUITES}" ]; then
-    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
-else
-    newsuites=""
-    workpath="${WORKSPACE}/test/csit/suites"
-    for suite in ${SUITES}; do
-        fullsuite="${workpath}/${suite}"
-        if [ -z "${newsuites}" ]; then
-            newsuites+=${fullsuite}
-        else
-            newsuites+=" "${fullsuite}
-        fi
-    done
-    SUITES=${newsuites}
-fi
+get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
 # please add pybot -v arguments on a single line and alphabetized
@@ -165,6 +152,7 @@ for suite in ${SUITES}; do
     -v RESTCONFPORT:8081 \
     -v SECURITY_GROUP_MODE:${SECURITY_GROUP_MODE} \
     -v SSH_KEY:robot_id_rsa \
+    -v TOOLS_SYSTEM_IP: \
     -v USER_HOME:${HOME} \
     -v WORKSPACE:/tmp \
     ${TESTOPTIONS} ${suite} || true
index 20a536a4553ec25d2813478b3963123fe5e31bf6..3cac8e115eb0871e537ac5c4f55d2a4c726aea7d 100755 (executable)
@@ -45,32 +45,7 @@ do
     tools_variables=${tools_variables}" -v ${MININETIP}:${!MININETIP}"
 done
 
-echo "Locating test plan to use..."
-testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
-if [ ! -f "${testplan_filepath}" ]; then
-    testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
-fi
-
-echo "Changing the testplan path..."
-cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
-cat testplan.txt
-
-# Use the testplan if specific SUITES are not defined.
-if [ -z "${SUITES}" ]; then
-    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
-else
-    newsuites=""
-    workpath="${WORKSPACE}/test/csit/suites"
-    for suite in ${SUITES}; do
-        fullsuite="${workpath}/${suite}"
-        if [ -z "${newsuites}" ]; then
-            newsuites+=${fullsuite}
-        else
-            newsuites+=" "${fullsuite}
-        fi
-    done
-    SUITES=${newsuites}
-fi
+get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} \
@@ -79,6 +54,8 @@ pybot -N ${TESTPLAN} \
       -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
       -v CONTROLLER:${ODL_SYSTEM_IP} \
       -v CONTROLLER_USER:${USER} \
+      -v GERRIT_BRANCH:${GERRIT_BRANCH} \
+      -v GERRIT_REFSPEC:${GERRIT_REFSPEC} \
       -v JAVA_HOME:${JAVA_HOME} \
       -v JDKVERSION:${JDKVERSION} \
       -v JENKINS_WORKSPACE:${WORKSPACE} \
index 6c6ecbd699c936ebf12673d4bfdd967fdfb2c2b9..277e488ef5797e59daae8b2a35f84daf6e996056 100644 (file)
@@ -1075,32 +1075,7 @@ else
     HA_PROXY_3_IP=${ODL_SYSTEM_3_IP}
 fi
 
-echo "Locating test plan to use..."
-testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
-if [ ! -f "${testplan_filepath}" ]; then
-    testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
-fi
-
-echo "Changing the testplan path..."
-cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
-cat testplan.txt
-
-# Use the testplan if specific SUITES are not defined.
-if [ -z "${SUITES}" ]; then
-    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
-else
-    newsuites=""
-    workpath="${WORKSPACE}/test/csit/suites"
-    for suite in ${SUITES}; do
-        fullsuite="${workpath}/${suite}"
-        if [ -z "${newsuites}" ]; then
-            newsuites+=${fullsuite}
-        else
-            newsuites+=" "${fullsuite}
-        fi
-    done
-    SUITES=${newsuites}
-fi
+get_test_suites SUITES
 
 #install all client versions required for this job testing
 install_openstack_clients_in_robot_vm
index e11908bb618150350189b2a421b7f7f4c1f229d5..c4260c71114b0f6386d5363c3447d14016de22ce 100644 (file)
@@ -4,6 +4,9 @@
 # script.
 # shellcheck source=${ROBOT_VENV}/bin/activate disable=SC1091
 source ${ROBOT_VENV}/bin/activate
+source /tmp/common-functions.sh ${BUNDLEFOLDER}
+# Ensure we fail the job if any steps fail.
+set -ex -o pipefail
 
 echo "#################################################"
 echo "##         Verify Cluster is UP                ##"
@@ -102,32 +105,7 @@ do
     tools_variables=${tools_variables}" -v ${MININETIP}:${!MININETIP}"
 done
 
-echo "Locating test plan to use..."
-testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
-if [ ! -f "${testplan_filepath}" ]; then
-    testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
-fi
-
-echo "Changing the testplan path..."
-cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
-cat testplan.txt
-
-# Use the testplan if specific SUITES are not defined.
-if [ -z "${SUITES}" ]; then
-    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
-else
-    newsuites=""
-    workpath="${WORKSPACE}/test/csit/suites"
-    for suite in ${SUITES}; do
-        fullsuite="${workpath}/${suite}"
-        if [ -z "${newsuites}" ]; then
-            newsuites+=${fullsuite}
-        else
-            newsuites+=" "${fullsuite}
-        fi
-    done
-    SUITES=${newsuites}
-fi
+get_test_suites SUITES
 
 echo "Starting Robot test suites ${SUITES} ..."
 pybot -N ${TESTPLAN} \
index 33fd72b7fa08ef78f947e0a8ff63f0a28efccc1a..266782c128804495ce8ad8c33e21e8ef9898bd2d 100644 (file)
@@ -63,9 +63,9 @@
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
-- job-template:
-    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
-    id: inttest-csit-1node
+
+######################
+# inttest-csit-1node #
+######################
+
+- inttest_csit_1node: &inttest_csit_1node
+    name: inttest-csit-1node
+
+    #####################
+    # Default variables #
+    #####################
+
     disable-job: false
-    disabled: '{disable-job}'
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
+    concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-stream-test-plan:
-          stream-test-plan: '{streamtestplan}'
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
+- job-template:
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node
+    <<: *inttest_csit_1node
+
+- job-template:
+    name: '{prefix}{project}-csit-1node-{functionality}-{install}-{stream}'
+    id: inttest-csit-1node-custom
+    <<: *inttest_csit_1node
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-controller-scope:
+          controller-scope: '{scope}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{project}.txt'
+      - integration-config-plan:
+          config-plan: '{project}.txt'
+      - integration-stream-test-plan:
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
+
+
 - job-template:
     name: '{prefix}{project}-csit-verify-3node-{functionality}'
     id: inttest-csit-verify-3node
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{verify-stream}.txt'
       - integration-test-plan:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
-- job-template:
-    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
-    id: inttest-csit-3node
-    disabled: false
+
+######################
+# inttest-csit-3node #
+######################
+
+- inttest_csit_3node: &inttest_csit_3node
+    name: inttest-csit-3node
+
+    #####################
+    # Default variables #
+    #####################
+
+    disable-job: false
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
+    concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-stream-test-plan:
-          stream-test-plan: '{streamtestplan}'
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
+- job-template:
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node
+    <<: *inttest_csit_3node
+
+- job-template:
+    name: '{prefix}{project}-csit-3node-{functionality}-{install}-{stream}'
+    id: inttest-csit-3node-custom
+    <<: *inttest_csit_3node
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-controller-scope:
+          controller-scope: '{scope}'
+      - integration-controller-features:
+          controller-features: 'odl-jolokia,{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{project}.txt'
+      - integration-config-plan:
+          config-plan: '{project}.txt'
+      - integration-stream-test-plan:
+          stream-test-plan: '{project}-{functionality}-{stream}.txt'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: 'True'
+
+
 - job-template:
     name: '{prefix}{project}-csit-3node-docker-{functionality}-{install}-{stream}'
     id: inttest-csit-3node-docker
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-stream-test-plan:
           stream-test-plan: '{project}-{functionality}-{stream}.txt'
       - integration-test-plan:
       - releng-openstack-stack-delete
       - lf-infra-publish
 
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
-    id: inttest-csit-hwvtep-openstack
-    disabled: false
+
+#################################
+# inttest-csit-hwvtep-openstack #
+#################################
+
+- inttest_csit_hwvtep_openstack: &inttest_csit_hwvtep_openstack
+    name: inttest-csit-hwvtep-openstack
+
+    #####################
+    # Default variables #
+    #####################
+
+    disable-job: false
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
           default: '{ovs-install}'
           description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
           repo url to pull from.'
+
     scm:
       - integration-gerrit-scm:
           basedir: 'test'
 
 - job-template:
     # yamllint disable-line rule:line-length
-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
-    id: inttest-csit-openstack
-    disabled: false
-
-    project-type: freestyle
-    node: centos7-robot-2c-8g
-    concurrent: true
+    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack
+    <<: *inttest_csit_hwvtep_openstack
 
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: '{build-days-to-keep}'
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-hwvtep-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-hwvtep-openstack-custom
+    <<: *inttest_csit_hwvtep_openstack
 
     parameters:
       - opendaylight-infra-parameters:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-script-plan:
-          script-plan: '{scriptplan}'
+          script-plan: '{project}.txt'
       - integration-config-plan:
-          config-plan: '{configplan}'
+          config-plan: '{project}.txt'
       - integration-test-plan:
           test-plan: '{testplan}'
       - integration-test-suites:
           default: '{odl-ml2-port-binding}'
           description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
           network-topology)'
-      - string:
-          name: ENABLE_GRE_TYPE_DRIVERS
-          default: '{enable-gre-type-driver}'
-          description: 'Enable gre tunnel'
       - string:
           name: DEVSTACK_KUBERNETES_PLUGIN_REPO
           default: '{devstack-kubernetes-plugin-repo}'
       - string:
           name: ENABLE_OS_SERVICES
           default: '{enable-openstack-services}'
-          description: 'comma seperated list of services to enable'
+          description: 'comma separated list of services to enable on controller nodes'
       - string:
           name: ENABLE_OS_COMPUTE_SERVICES
           default: '{enable-openstack-compute-services}'
           default: '{ovs-install}'
           description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
           repo url to pull from.'
-    scm:
-      - integration-gerrit-scm:
-          basedir: 'test'
-          refspec: '$PATCHREFSPEC'
-          branch: 'master'
 
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
 
-    triggers:
-      - timed: '{schedule}'
+##########################
+# inttest-csit-openstack #
+##########################
 
-    builders:
-      - lf-infra-pre-build
-      - integration-infra-stack-4-type:
-          stack-template: '{stack-template}'
-          vm_0_count: '{odl_system_count}'
-          vm_0_flavor: '{odl_system_flavor}'
-          vm_0_image: '{odl_system_image}'
-          vm_1_count: '{openstack_system_count}'
-          vm_1_flavor: '{openstack_system_flavor}'
-          vm_1_image: '{openstack_system_image}'
-          vm_2_count: '{openstack_system2_count}'
-          vm_2_flavor: '{openstack_system2_flavor}'
-          vm_2_image: '{openstack_system2_image}'
-          vm_3_count: '{tools_system_count}'
-          vm_3_flavor: '{tools_system_flavor}'
-          vm_3_image: '{tools_system_image}'
-      - integration-install-robotframework
-      - inject:
-          properties-file: 'env.properties'
-      - integration-get-slave-addresses
-      - inject:
-          properties-file: 'slave_addresses.txt'
-      - integration-detect-variables
-      - integration-install-common-functions
-      - integration-deploy-controller-run-test
-      - integration-deploy-openstack-run-test
-      - integration-cleanup-tmp
+- inttest_csit_openstack: &inttest_csit_openstack
+    name: inttest-csit-openstack
 
-    publishers:
-      - integration-robot-tempest:
-          unstable-if: 0.0
-          pass-if: 100.0
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[{project}]'
-      - integration-csit-collect-netvirt-logs
-      - integration-csit-archive-build
-      - integration-csit-run-postscript
-      - releng-openstack-stack-delete
-      - lf-infra-publish
+    #####################
+    # Default variables #
+    #####################
 
-# Template: {project}-patch-test-{stream}
-# Goal: Build a patch and run project specific system test on a distribution containing the change
-# Operation: This job template builds a patch, creates a distribution containing the patch, and
-# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
+    disable-job: false
 
-- job-template:
-    name: '{prefix}{project}-patch-test-{feature}-{stream}'
-    id: inttest-patch-test
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
-    node: centos7-builder-2c-8g
+    node: centos7-robot-2c-8g
     concurrent: true
-    jdk: '{java-version}'
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
     parameters:
       - opendaylight-infra-parameters:
           os-cloud: '{os-cloud}'
-          project: '{project}'
+          project: 'integration/test'
           branch: '{branch}'
           refspec: 'refs/heads/{branch}'
           artifacts: '{archive-artifacts}'
       - integration-distribution-branch:
           branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{project}.txt'
+      - integration-config-plan:
+          config-plan: '{project}.txt'
+      - integration-test-plan:
+          test-plan: '{project}-{functionality}.txt'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
       - distribution-karaf-version:
           karaf-version: '{karaf-version}'
-      - integration-distribution-git-url:
-          git-url: '{git-url}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
       - string:
-          name: feature
-          default: 'all'
-          description: 'Specific feature test for patch'
-      - maven-exec:
-          maven-version: mvn35
-
+          name: OPENSTACK_BRANCH
+          default: '{openstack-branch}'
+          description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
+      - string:
+          name: ODL_ML2_DRIVER_REPO
+          default: '{odl-ml2-driver-repo}'
+          description: 'URL to fetch networking-odl driver'
+      - string:
+          name: ODL_ML2_BRANCH
+          default: '{odl-ml2-branch}'
+          description: 'Version of networking-odl to checkout from the repo'
+      - string:
+          name: ODL_ML2_DRIVER_VERSION
+          default: '{odl-ml2-driver-version}'
+          description: 'Mode of networking-odl (v1 or v2)'
+      - string:
+          name: ODL_ML2_PORT_BINDING
+          default: '{odl-ml2-port-binding}'
+          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
+          network-topology)'
+      - string:
+          name: ENABLE_GRE_TYPE_DRIVERS
+          default: '{enable-gre-type-driver}'
+          description: 'Enable gre tunnel'
+      - string:
+          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
+          default: '{devstack-kubernetes-plugin-repo}'
+          description: 'URL to fetch kubernetes devstack plugin'
+      - string:
+          name: DEVSTACK_LBAAS_PLUGIN_REPO
+          default: '{devstack-lbaas-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: IPSEC_VXLAN_TUNNELS_ENABLED
+          default: '{ipsec-vxlan-tunnels-enabled}'
+          description: 'Enable ipsec over vxlan support for all controllers and computes'
+      - string:
+          name: PUBLIC_BRIDGE
+          default: '{public-bridge}'
+          description: 'Specifies public bridge for provider and external networking'
+      - string:
+          name: ENABLE_HAPROXY_FOR_NEUTRON
+          default: '{enable-haproxy}'
+          description: 'Enable HAProxy for using neutron interface as HA'
+      - string:
+          name: ENABLE_OS_SERVICES
+          default: '{enable-openstack-services}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_COMPUTE_SERVICES
+          default: '{enable-openstack-compute-services}'
+          description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
+      - string:
+          name: ENABLE_OS_PLUGINS
+          default: '{enable-openstack-plugins}'
+          description: 'comma seperated list of plugins to enable'
+      - string:
+          name: DISABLE_OS_SERVICES
+          default: '{disable-openstack-services}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: TENANT_NETWORK_TYPE
+          default: '{tenant-network-type}'
+          description: 'Tenant Network Type supported by the implementation'
+      - string:
+          name: SECURITY_GROUP_MODE
+          default: '{security-group-mode}'
+          description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
+      - string:
+          name: PUBLIC_PHYSICAL_NETWORK
+          default: '{public-physical-network}'
+          description: 'provider physical network used for flat/vlan networks'
+      - string:
+          name: ENABLE_NETWORKING_L2GW
+          default: '{enable-networking-l2gw}'
+          description: 'Enable networking L2gw'
+      - string:
+          name: NETWORKING_L2GW_DRIVER
+          default: '{networking-l2gw-repo}'
+          description: 'URL to fetch networking-l2gw driver'
+      - string:
+          name: CREATE_INITIAL_NETWORKS
+          default: '{create-initial-networks}'
+          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+      - string:
+          name: LBAAS_SERVICE_PROVIDER
+          default: '{lbaas-service-provider}'
+          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
+          neutron-lbaas'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
+
+    scm:
+      - integration-gerrit-scm:
+          basedir: 'test'
+          refspec: '$PATCHREFSPEC'
+          branch: 'master'
+
+    wrappers:
+      - opendaylight-infra-wrappers:
+          build-timeout: '{build-timeout}'
+
+    triggers:
+      - timed: '{schedule}'
+
+    builders:
+      - lf-infra-pre-build
+      - integration-infra-stack-4-type:
+          stack-template: '{stack-template}'
+          vm_0_count: '{odl_system_count}'
+          vm_0_flavor: '{odl_system_flavor}'
+          vm_0_image: '{odl_system_image}'
+          vm_1_count: '{openstack_system_count}'
+          vm_1_flavor: '{openstack_system_flavor}'
+          vm_1_image: '{openstack_system_image}'
+          vm_2_count: '{openstack_system2_count}'
+          vm_2_flavor: '{openstack_system2_flavor}'
+          vm_2_image: '{openstack_system2_image}'
+          vm_3_count: '{tools_system_count}'
+          vm_3_flavor: '{tools_system_flavor}'
+          vm_3_image: '{tools_system_image}'
+      - integration-install-robotframework
+      - inject:
+          properties-file: 'env.properties'
+      - integration-get-slave-addresses
+      - inject:
+          properties-file: 'slave_addresses.txt'
+      - integration-detect-variables
+      - integration-install-common-functions
+      - integration-deploy-controller-run-test
+      - integration-deploy-openstack-run-test
+      - integration-cleanup-tmp
+
+    publishers:
+      - integration-robot-tempest:
+          unstable-if: 0.0
+          pass-if: 100.0
+      - email-notification:
+          email-recipients: '{email-recipients}'
+          email-prefix: '[{project}]'
+      - integration-csit-collect-netvirt-logs
+      - integration-csit-archive-build
+      - integration-csit-run-postscript
+      - releng-openstack-stack-delete
+      - lf-infra-publish
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack
+    <<: *inttest_csit_openstack
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-openstack-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-openstack-custom
+    <<: *inttest_csit_openstack
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - integration-script-plan:
+          script-plan: '{project}.txt'
+      - integration-config-plan:
+          config-plan: '{project}.txt'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
+      - string:
+          name: OPENSTACK_BRANCH
+          default: '{openstack-branch}'
+          description: 'Openstack version to use with devstack'
+      - string:
+          name: DEVSTACK_HASH
+          default: '{devstack-hash}'
+          description: 'devstack hash to checkout'
+      - string:
+          name: ODL_ML2_DRIVER_REPO
+          default: '{odl-ml2-driver-repo}'
+          description: 'URL to fetch networking-odl driver'
+      - string:
+          name: ODL_ML2_BRANCH
+          default: '{odl-ml2-branch}'
+          description: 'Version of networking-odl to checkout from the repo'
+      - string:
+          name: ODL_ML2_DRIVER_VERSION
+          default: '{odl-ml2-driver-version}'
+          description: 'Mode of networking-odl (v1 or v2)'
+      - string:
+          name: ODL_ML2_PORT_BINDING
+          default: '{odl-ml2-port-binding}'
+          description: 'Method of networking-odl port-binding (pseudo-agentdb-binding or legacy-port-binding or
+          network-topology)'
+      - string:
+          name: ENABLE_GRE_TYPE_DRIVERS
+          default: '{enable-gre-type-driver}'
+          description: 'Enable gre tunnel'
+      - string:
+          name: DEVSTACK_KUBERNETES_PLUGIN_REPO
+          default: '{devstack-kubernetes-plugin-repo}'
+          description: 'URL to fetch kubernetes devstack plugin'
+      - string:
+          name: DEVSTACK_LBAAS_PLUGIN_REPO
+          default: '{devstack-lbaas-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: DEVSTACK_NETWORKING_SFC_PLUGIN_REPO
+          default: '{devstack-networking-sfc-plugin-repo}'
+          description: 'URL to fetch neutron-lbaas devstack plugin'
+      - string:
+          name: IPSEC_VXLAN_TUNNELS_ENABLED
+          default: '{ipsec-vxlan-tunnels-enabled}'
+          description: 'Enable ipsec over vxlan support for all controllers and computes'
+      - string:
+          name: PUBLIC_BRIDGE
+          default: '{public-bridge}'
+          description: 'Specifies public bridge for provider and external networking'
+      - string:
+          name: ENABLE_HAPROXY_FOR_NEUTRON
+          default: '{enable-haproxy}'
+          description: 'Enable HAProxy for using neutron interface as HA'
+      - string:
+          name: ENABLE_OS_SERVICES
+          default: '{enable-openstack-services}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: ENABLE_OS_COMPUTE_SERVICES
+          default: '{enable-openstack-compute-services}'
+          description: 'comma separated list of services to enable on compute nodes'
+      - string:
+          name: ENABLE_OS_NETWORK_SERVICES
+          default: '{enable-openstack-network-services}'
+          description: 'comma seperated list of network services to enable'
+      - string:
+          name: ENABLE_OS_PLUGINS
+          default: '{enable-openstack-plugins}'
+          description: 'comma seperated list of plugins to enable'
+      - string:
+          name: DISABLE_OS_SERVICES
+          default: '{disable-openstack-services}'
+          description: 'comma seperated list of services to enable'
+      - string:
+          name: TENANT_NETWORK_TYPE
+          default: '{tenant-network-type}'
+          description: 'Tenant Network Type supported by the implementation'
+      - string:
+          name: SECURITY_GROUP_MODE
+          default: '{security-group-mode}'
+          description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
+      - string:
+          name: PUBLIC_PHYSICAL_NETWORK
+          default: '{public-physical-network}'
+          description: 'provider physical network used for flat/vlan networks'
+      - string:
+          name: ENABLE_NETWORKING_L2GW
+          default: '{enable-networking-l2gw}'
+          description: 'Enable networking L2gw'
+      - string:
+          name: NETWORKING_L2GW_DRIVER
+          default: '{networking-l2gw-repo}'
+          description: 'URL to fetch networking-l2gw driver'
+      - string:
+          name: CREATE_INITIAL_NETWORKS
+          default: '{create-initial-networks}'
+          description: 'Toggles the option of letting devstack create initial networks (True/False)'
+      - string:
+          name: LBAAS_SERVICE_PROVIDER
+          default: '{lbaas-service-provider}'
+          description: 'The NEUTRON_LBAAS_SERVICE_PROVIDERV2 value to be used in local.conf - only relevant when using
+          neutron-lbaas'
+      - string:
+          name: ODL_SFC_DRIVER
+          default: '{odl-sfc-driver}'
+          description: 'The SFC driver to be used in local.conf - only relevant when using networking-sfc'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
+      - string:
+          name: OVS_INSTALL
+          default: '{ovs-install}'
+          description: 'Install a custom OVS. It can be an OVS version to build (like v2.9.2 or v2.6.1-nsh) or a yum
+          repo url to pull from.'
+
+# Template: {project}-patch-test-{stream}
+# Goal: Build a patch and run project specific system test on a distribution containing the change
+# Operation: This job template builds a patch, creates a distribution containing the patch, and
+# triggers the project system test defined in {csit-list} when gerrit receives test-{project} keyword
+
+- job-template:
+    name: '{prefix}{project}-patch-test-{feature}-{stream}'
+    id: inttest-patch-test
+
+    project-type: freestyle
+    node: centos7-builder-2c-8g
+    concurrent: true
+    jdk: '{java-version}'
+
+    properties:
+      - opendaylight-infra-properties:
+          build-days-to-keep: '{build-days-to-keep}'
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: '{project}'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-distribution-git-url:
+          git-url: '{git-url}'
+      - string:
+          name: feature
+          default: 'all'
+          description: 'Specific feature test for patch'
+      - maven-exec:
+          maven-version: mvn35
+
     scm:
       - integration-gerrit-scm:
           basedir: '{project}'
             block: true
             predefined-parameters: |
               BUNDLE_URL=$BUNDLE_URL
+              GERRIT_BRANCH=$GERRIT_BRANCH
+              GERRIT_REFSPEC=$GERRIT_REFSPEC
               KARAF_VERSION=$KARAF_VERSION
 
     publishers:
           email-recipients: '{email-recipients}'
           email-prefix: '[{project}]'
 
-- job-template:
-    # yamllint disable-line rule:line-length
-    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
-    id: inttest-csit-apex
-    disabled: false
+
+#####################
+# inttest-csit-apex #
+#####################
+
+- inttest_csit_apex: &inttest_csit_apex
+    name: inttest-csit-apex
+
+    #####################
+    # Default variables #
+    #####################
+
+    disable-job: false
+
+    #####################
+    # Job configuration #
+    #####################
 
     project-type: freestyle
     node: centos7-robot-2c-8g
     concurrent: true
+    disabled: '{disable-job}'
 
     properties:
       - opendaylight-infra-properties:
       - integration-test-options:
           test-options: '{robot-options}'
       - integration-test-plan:
-          test-plan: '{testplan}'
+          test-plan: '{project}-{functionality}.txt'
       - integration-test-suites:
           test-suites: '{test-suites}'
       - integration-patch-refspec:
       - integration-csit-run-postscript
       - releng-openstack-stack-delete
       - lf-infra-publish
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-apex
+    <<: *inttest_csit_apex
+
+- job-template:
+    # yamllint disable-line rule:line-length
+    name: '{prefix}{project}-csit-{topology}-{os-cmb-cnt}cmb-{os-ctl-cnt}ctl-{os-cmp-cnt}cmp-apex-{openstack}-{functionality}-{stream}'
+    id: inttest-csit-apex-custom
+    <<: *inttest_csit_apex
+
+    parameters:
+      - opendaylight-infra-parameters:
+          os-cloud: '{os-cloud}'
+          project: 'integration/test'
+          branch: '{branch}'
+          refspec: 'refs/heads/{branch}'
+          artifacts: '{archive-artifacts}'
+      - integration-distribution-branch:
+          branch: '{branch}'
+      - integration-distribution-stream:
+          stream: '{stream}'
+      - integration-bundle-url:
+          bundle-url: '{bundle-url}'
+      - integration-repo-url:
+          repo-url: '{repo-url}'
+      - integration-controller-features:
+          controller-features: '{install-features}'
+      - integration-controller-debug-map:
+          controller-debug-map: '{debug-map}'
+      - integration-test-options:
+          test-options: '{robot-options}'
+      - integration-test-plan:
+          test-plan: '{testplan}'
+      - integration-test-suites:
+          test-suites: '{test-suites}'
+      - integration-patch-refspec:
+          branch: 'master'
+      - integration-jdk-version:
+          jdkversion: '{jre}'
+      - distribution-karaf-version:
+          karaf-version: '{karaf-version}'
+      - integration-use-features-boot:
+          use-features-boot: '{use-features-boot}'
+      - string:
+          name: OPENSTACK_BRANCH
+          default: '{openstack-branch}'
+          description: 'Openstack version to use with devstack'
+      - string:
+          name: IPSEC_VXLAN_TUNNELS_ENABLED
+          default: '{ipsec-vxlan-tunnels-enabled}'
+          description: 'Enable ipsec over vxlan support for all controllers and computes'
+      - string:
+          name: PUBLIC_BRIDGE
+          default: '{public-bridge}'
+          description: 'Specifies public bridge for provider and external networking'
+      - string:
+          name: SECURITY_GROUP_MODE
+          default: '{security-group-mode}'
+          description: 'Security Group Mode to be used in netvirt aclservice config'
+      - string:
+          name: ENABLE_ITM_DIRECT_TUNNELS
+          default: '{enable-itm-direct-tunnels}'
+          description: 'Tunnel Configuration mode to be used in genius ifm config'
+      - string:
+          name: PUBLIC_PHYSICAL_NETWORK
+          default: '{public-physical-network}'
+          description: 'provider physical network used for flat/vlan networks'
+      - string:
+          name: ODL_SNAT_MODE
+          default: '{odl-snat-mode}'
+          description: 'The SNAT mode to be configured - options are conntrack/controller.'
index 43fa3a267b97b23369038d120615bb979df1bf23..40475f69a85b6de2c82b215a08cc4141ff4d6710 100644 (file)
     builders:
       - integration-rebase-gerrit-patch
       - wipe-org-opendaylight-repo
-      - provide-maven-settings:
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-settings'
       - maven-target:
       - wipe-org-opendaylight-repo
       - lf-maven-install:
           mvn-version: '{mvn-version}'
-      - provide-maven-settings:
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: 'integration-distribution-settings'
       - integration-multipatch-builder
 
     git-url: '$GIT_URL/$PROJECT'
     submodule-recursive: true
+    submodule-timeout: 10
 
     #####################
     # Job Configuration #
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
+          submodule-timeout: '{submodule-timeout}'
           choosing-strategy: default
 
     wrappers:
     publishers:
       - lf-infra-publish
 
-- view:
-    name: integration
-    description: 'List of integration jobs'
-    regex: '^integration-.*'
-    <<: *releng_view_common
+- project:
+    name: integration-view
+    views:
+      - project-view
+    project-name: integration
 
 - view:
     name: csit-stable-f
     job-name:
       - aaa-csit-1node-authn-all-fluorine
       - bgpcep-csit-1node-throughpcep-all-fluorine
-      - coe-csit-1node-container-networking-all-fluorine
+      - coe-csit-1node-container-networking-only-fluorine
       - controller-csit-1node-akka1-all-fluorine
       - controller-csit-1node-benchmark-all-fluorine
       - controller-csit-1node-notifications-longevity-only-fluorine
     job-name:
       - aaa-csit-1node-authn-all-neon
       - bgpcep-csit-1node-throughpcep-all-neon
-      - coe-csit-1node-container-networking-all-neon
+      - coe-csit-1node-container-networking-only-neon
       - controller-csit-1node-akka1-all-neon
       - controller-csit-1node-benchmark-all-neon
       - controller-csit-1node-notifications-longevity-only-neon
index 6a2589070424896f3d512e0855056781ade7f12b..784e75ccdf80c98491c313e240b44d3edb694ef0 100644 (file)
@@ -65,8 +65,8 @@
     mvn-settings: 'iotdm-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: iotdm
-    description: 'List of iotdm jobs'
-    regex: '^iotdm-.*'
-    <<: *releng_view_common
+- project:
+    name: iotdm-view
+    views:
+      - project-view
+    project-name: iotdm
index 400b6d7f341fd05a8f6f74940697d5da92059f9a..5059f3172e785d9f8fb0f37b675e0fcb9672b436 100644 (file)
@@ -62,8 +62,8 @@
     mvn-settings: 'jsonrpc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: jsonrpc
-    description: 'List of jsonrpc jobs'
-    regex: '^jsonrpc-.*'
-    <<: *releng_view_common
+- project:
+    name: jsonrpc-view
+    views:
+      - project-view
+    project-name: jsonrpc
index 4f14ebcbdb303423dd44d38dcf31fbde46ceae24..176de3580dfcb6f6e5ea164abb657c99bf8f19e0 100644 (file)
@@ -76,8 +76,8 @@
     mvn-settings: 'l2switch-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
 
-- view:
-    name: l2switch
-    description: 'List of l2switch jobs'
-    regex: '^l2switch-.*'
-    <<: *releng_view_common
+- project:
+    name: l2switch-view
+    views:
+      - project-view
+    project-name: l2switch
index 4a81fba6db65e924fae1d907f1bdde5e41716ea1..67ac76291d9bfa7b6248aa95e2eb55a5186a1aa4 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'lacp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: lacp
-    description: 'List of lacp jobs'
-    regex: '^lacp-.*'
-    <<: *releng_view_common
+- project:
+    name: lacp-view
+    views:
+      - project-view
+    project-name: lacp
index 1f9c0d23b01b7d60a5cabe4edd6c33c7b41b5596..f232f2ec0ef18d0a3495fee8e1bd9ba7acd0e91e 100644 (file)
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
-- view:
-    name: lf-infra
-    description: 'List of lf-infra jobs'
-    regex: '^lf-infra-.*'
-    <<: *releng_view_common
+- project:
+    name: lf-infra-view
+    views:
+      - project-view
+    project-name: lf-infra
index 505a86a53a0cf70bb60ec0fba134bbf892e25721..68d53961661a562b2456f9ad660cf2fea53d5bc3 100644 (file)
@@ -17,8 +17,8 @@
     git-url: https://gerrit.linuxfoundation.org/infra/$GERRIT_PROJECT
     gerrit-server-name: lf-releng
 
-- view:
-    name: lfn
-    description: 'List of LF Networking jobs'
-    regex: '^lfn-.*'
-    <<: *releng_view_common
+- project:
+    name: lfn-view
+    views:
+      - project-view
+    project-name: lfn-process
index 5420877901a9813b0d9198f16717ebbdc14062de..1ff72034e717507d25fa35c936403f8c5a75fab1 100644 (file)
@@ -95,8 +95,8 @@
     mvn-goals: 'clean deploy findbugs:findbugs javadoc:aggregate -DrepoBuild'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=512m -Dmaven.compile.fork=true'
 
-- view:
-    name: lispflowmapping
-    description: 'List of lispflowmapping jobs'
-    regex: '^lispflowmapping-.*'
-    <<: *releng_view_common
+- project:
+    name: lispflowmapping-view
+    views:
+      - project-view
+    project-name: lispflowmapping
index 8e4973e3edeb95511957650e16698427cb255df5..5daecab3c7850bcb342a44451a1244a32f7b9b64 100644 (file)
@@ -18,7 +18,6 @@
 
     mvn-settings: 'mdsal-settings'
     mvn-opts: '-Xmx2048m'
-    sign-artifacts: true
 
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     email-upstream: '[mdsal] [odlparent] [yangtools]'
@@ -55,7 +54,6 @@
     mvn-settings: 'mdsal-settings'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
-    sign-artifacts: true
     build-node: centos7-builder-8c-8g
     build-timeout: 90
     dependencies: 'odlparent-merge-{stream},yangtools-merge-{stream}'
     mvn-goals: '-Dmaven.compile.fork=true clean deploy -Dintegrationtests'
     mvn-opts: '-Xmx2048m'
 
-- view:
-    name: mdsal
-    description: 'List of mdsal jobs'
-    regex: '^mdsal-.*'
-    <<: *releng_view_common
+- project:
+    name: mdsal-view
+    views:
+      - project-view
+    project-name: mdsal
index 84ceac995803467618d3021d95302b558734f20e..26098a6fa192febcd89e504112696e2b99fba5a8 100644 (file)
@@ -64,8 +64,8 @@
     mvn-settings: 'natapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: natapp
-    description: 'List of natapp jobs'
-    regex: '^natapp-.*'
-    <<: *releng_view_common
+- project:
+    name: natapp-view
+    views:
+      - project-view
+    project-name: natapp
index 531c603dca933b61a1a37c06a3e067dc37550565..dc24a888f044c146c914ec86b0d7a2224bea8e76 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'nemo-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: nemo
-    description: 'List of nemo jobs'
-    regex: '^nemo-.*'
-    <<: *releng_view_common
+- project:
+    name: nemo-view
+    views:
+      - project-view
+    project-name: nemo
diff --git a/jjb/netconf/netconf-cluster-stress.yaml b/jjb/netconf/netconf-cluster-stress.yaml
deleted file mode 100644 (file)
index c2dbc53..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
----
-- project:
-    name: netconf-csit-cluster-stress
-    jobs:
-      - inttest-csit-3node
-
-    # The project name
-    project: 'netconf'
-
-    # The functionality under test
-    functionality: 'cluster-stress'
-
-    # Project branches
-    stream:
-      - neon:
-          branch: 'master'
-      - fluorine:
-          branch: 'stable/fluorine'
-      - oxygen:
-          branch: 'stable/oxygen'
-
-    install:
-      - all:
-          scope: 'all'
-
-    # Features to install
-    install-features: >
-        odl-restconf,
-        odl-jolokia,
-        odl-netconf-clustered-topology
-
-    # Robot custom options
-    # TODO: Make sure every suite has this as default, then remove this value from here.
-    robot-options: '-v USE_NETCONF_CONNECTOR:False'
index 18da27dc561db0f1efee8be8d9c8f9b1d98cce90..7652b068fb23f96001147d23bbee74f793fae30d 100644 (file)
@@ -20,8 +20,8 @@
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     # Features to install
     install-features: >
index 1aa626f0a79d32079fedc4e71af20ba27cd57bd3..85766f77d4235bb6ceee02633e9bb1de3e63e6a7 100644 (file)
@@ -20,8 +20,8 @@
           branch: 'stable/oxygen'
 
     install:
-      - all:
-          scope: 'all'
+      - only:
+          scope: 'only'
 
     # Features to install
     install-features: >
index 33024be2af76dad57165b3df94ec384d2dacb283..e3f6be7f604a87e9d8b680190eaebfaa608727db 100644 (file)
 - project:
     name: netconf-sonar
     jobs:
-      - gerrit-maven-sonar
+      - gerrit-maven-sonar:
+          mvn-params: >
+            -Dodl.jacoco.aggregateFile=$WORKSPACE/target/jacoco.exec
+            -Dsonar.jacoco.reportPath=$WORKSPACE/target/jacoco.exec
+
     project: 'netconf'
     project-name: 'netconf'
     branch: 'master'
     mvn-settings: 'netconf-settings'
     mvn-goals: 'clean deploy -Pintegrationtests'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=1024m -Dmaven.compile.fork=true'
+    build-timeout: 90
 
-- view:
-    name: netconf
-    description: 'List of netconf jobs'
-    regex: '^netconf-.*'
-    <<: *releng_view_common
+- project:
+    name: netconf-view
+    views:
+      - project-view
+    project-name: netconf
index 44281fe5f01ec75d1444e96400b5845dff09133c..4a6e1609b68e7cdee5a87f3ef7c7ce43b0ea8196 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'netide-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: netide
-    description: 'List of netide jobs'
-    regex: '^netide-.*'
-    <<: *releng_view_common
+- project:
+    name: netide-view
+    views:
+      - project-view
+    project-name: netide
index 934f43578de03cb0dd7cac0735f7ecec85e118af..7e34fe6b3414fc3453551bbf7ca4cd229c2f6f46 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-neon
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
     stream: 'neon'
@@ -31,7 +31,7 @@
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
@@ -51,7 +51,7 @@
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-fluorine
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
     stream: 'fluorine'
@@ -80,7 +80,7 @@
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
 - project:
     name: netvirt-csit-hwvtep-openstack-integration-oxygen
     jobs:
-      - inttest-csit-hwvtep-openstack
+      - inttest-csit-hwvtep-openstack-custom
 
     project: 'netvirt'
     stream: 'oxygen'
           enable-haproxy: 'no'
           install-features: 'odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
       - 3node:
-          openstack_system2_count: 2
+          openstack_system2_count: 3
           odl_system_count: 3
           enable-haproxy: 'yes'
           install-features: 'odl-jolokia,odl-netvirt-openstack,decanter-collector-jmx,decanter-appender-elasticsearch'
index e43dae519e3d4e2be20c5689e04e07d262086451..9647cc22f8b64797498eb80d70600d4d60690d9d 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-apex-integration-oxygen
     jobs:
-      - inttest-csit-apex
+      - inttest-csit-apex-custom
 
     project: 'netvirt'
     stream:
index e6364a413785a06de4d6e9d82851fc7accbdcba2..d4a244d316f531c1d484f453a04aa2bb4ce8ddaa 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-upgrade-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
 
index 69be4f84a6c3c56de73422e80349ad8b17d0ce64..4548ca50c7494ec24774d652cf44f12cedeb219f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: netvirt-csit-openstack-integration-neon
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     stream: 'neon'
@@ -79,7 +79,7 @@
 - project:
     name: netvirt-csit-openstack-integration-fluorine
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     stream: 'fluorine'
 - project:
     name: netvirt-csit-openstack-integration-oxygen
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     stream: 'oxygen'
 - project:
     name: netvirt-csit-sfc-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     security-group-mode: 'stateful'
 - project:
     name: netvirt-csit-1cmb-0ctl-0cmp-openstack-integration
     jobs:
-      - inttest-csit-openstack
+      - inttest-csit-openstack-custom
 
     project: 'netvirt'
     testplan: '{project}-{topology}-openstack.txt'
index a4cc536712423a390c9f06f01caf8f611e338a8d..1827b80726242b112e1c9cab4a6545bc55eab102 100644 (file)
@@ -43,7 +43,7 @@
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-tdd-wip-{stream}
       - coe:
           csit-list: >
-              coe-csit-1node-container-networking-all-{stream}
+              coe-csit-1node-gate-container-networking-only-{stream}
       - itm-direct-tunnels:
           csit-list: >
               netvirt-csit-1node-{os-std-topo}-openstack-{os-branch}-gate-stateful-itm-direct-tunnels-{stream}
index 104af96941c508b26704bafb0fb1fbe48db63455..02039887a075ee64bde7ed607e474077a6383b7c 100644 (file)
     name: netvirt-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'netvirt'
     project-name: 'netvirt'
     branch: 'master'
     mvn-settings: 'netvirt-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: netvirt
-    description: 'List of netvirt jobs'
-    regex: '^netvirt-.*'
-    <<: *releng_view_common
+- project:
+    name: netvirt-csit-view
+    views:
+      - csit-view
+    view-name: netvirt-csit
+    view-description: 'List of netvirt-csit jobs'
+    view-regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
 
-- view:
-    name: netvirt-csit
-    description: 'List of netvirt-csit jobs'
-    regex: 'netvirt-csit(?!(.*gate)|(.*hwvtep)).*'
-    <<: *integration_view_csit
+- project:
+    name: netvirt-view
+    views:
+      - project-view
+    project-name: netvirt
index f4f348edc26745d876e2a0421dfe222a5d44c86b..20e835ed5e4028bb0178bbec050beca6dd4f1030 100644 (file)
@@ -69,8 +69,8 @@
     mvn-settings: 'neutron-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: neutron
-    description: 'List of neutron jobs'
-    regex: '^neutron-.*'
-    <<: *releng_view_common
+- project:
+    name: neutron-view
+    views:
+      - project-view
+    project-name: neutron
index 2a29e6dcdaf2bda1358ac17dbc4a0d994873ae8a..ed3e16aed51e31693c130171103a8418895597a8 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'next-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: next
-    description: 'List of next jobs'
-    regex: '^next-.*'
-    <<: *releng_view_common
+- project:
+    name: next-view
+    views:
+      - project-view
+    project-name: next
index 77176cfab30c76024c7a938ba9457a4c5c0c31e0..c8421b900d5d1f0497d3ae1208951dd13584c6b1 100644 (file)
@@ -65,8 +65,8 @@
     mvn-settings: 'nic-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: nic
-    description: 'List of nic jobs'
-    regex: '^nic-.*'
-    <<: *releng_view_common
+- project:
+    name: nic-view
+    views:
+      - project-view
+    project-name: nic
index 36dc2f892a8ee32ac99096d564678dc155805528..c07b59a6581e8490d059045a9f98556c07c1c98c 100644 (file)
     name: ocpplugin-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'ocpplugin'
     project-name: 'ocpplugin'
     branch: 'master'
     mvn-settings: 'ocpplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: ocpplugin
-    description: 'List of ocpplugin jobs'
-    regex: '^ocpplugin-.*'
-    <<: *releng_view_common
+- project:
+    name: ocpplugin-view
+    views:
+      - project-view
+    project-name: ocpplugin
diff --git a/jjb/odl-openstack-check-image-protection.sh b/jjb/odl-openstack-check-image-protection.sh
deleted file mode 100644 (file)
index 76a68e5..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -l
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-# Checks the image "protected" value and set "True" marker
-#
-# The script is involked by 'builder-verify-image-protection', searches
-# the jjb source code for the images presently used and verifies protection
-# setting. If the image protect setting is not "True", sets the
-# image protect setting to "True" to prevent the image from getting purged
-# by the cleanup old images job.
-echo "---> Check image protection"
-
-declare -a yaml_images
-readarray -t yaml_images <<< "$(grep -r _system_image: --include \*.yaml \
-    | awk -F": " -e '{print $3}' | sed "s:'::;s:'$::;/^$/d" | sort -u)"
-declare -a cfg_images
-readarray -t cfg_images <<< "$(grep -r IMAGE_NAME --include \*.cfg \
-    | awk -F'=' -e '{print $2}' | sort -u)"
-combined=("${yaml_images[@]}" "${cfg_images[@]}")
-declare -a images
-readarray -t images <<< "$(printf '%s\n' "${combined[@]}" | sort -u)"
-
-for image in "${images[@]}"; do
-    os_image_protected=$(openstack --os-cloud "$OS_CLOUD" image show "$image" -f value -c protected)
-    echo "Protected setting for $image: $os_image_protected"
-    if [[ $os_image_protected != True ]]; then
-        echo "Image: $image NOT set as protected, changing the protected value."
-        openstack --os-cloud "$OS_CLOUD" image set --protected "$image"
-    fi
-done
diff --git a/jjb/odl-openstack-cleanup-old-images.sh b/jjb/odl-openstack-cleanup-old-images.sh
deleted file mode 100644 (file)
index 9cc82cd..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash -l
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 - 2018 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-# Removes openstack images older than 30 days in the cloud
-echo "---> Cleanup old images"
-
-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
deleted file mode 100644 (file)
index df598b4..0000000
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash -l
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 - 2018 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-echo "---> Cleanup orphaned servers"
-
-minion_in_jenkins() {
-    # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
-    # Returns: 0 If stack is in Jenkins and 1 if stack is not in Jenkins.
-
-    MINION="${1}"
-
-    minions=()
-    for jenkins in "${@:2}"; do
-        JENKINS_URL="$jenkins/computer/api/json?tree=computer[displayName]"
-        resp=$(curl -s -w "\\n\\n%{http_code}" --globoff -H "Content-Type:application/json" "$JENKINS_URL")
-        json_data=$(echo "$resp" | head -n1)
-        #status=$(echo "$resp" | awk 'END {print $NF}')
-
-        # We purposely want to wordsplit here to combine the arrays
-        # shellcheck disable=SC2206,SC2207
-        minions=(${minions[@]} $(echo "$json_data" | \
-            jq -r '.computer[].displayName' | grep -v master)
-        )
-    done
-
-    if [[ "${minions[*]}" =~ $MINION ]]; then
-        return 0
-    fi
-
-    return 1
-}
-
-##########################
-## FETCH ACTIVE MINIONS ##
-##########################
-# Fetch server list before fetching active minions to minimize race condition
-# where we might be trying to delete servers while jobs are trying to start
-
-# We purposely need word splitting here to create the OS_SERVERS array.
-# shellcheck disable=SC2207
-mapfile -t OS_SERVERS < <(openstack server list -f value -c "Name" | grep -E 'prd|snd')
-
-#############################
-## DELETE ORPHANED SERVERS ##
-#############################
-
-# Search for servers that are not in use by either releng or sandbox silos and
-# delete them.
-for server in "${OS_SERVERS[@]}"; do
-    # JENKINS_URLS is provided by the Jenkins Job declaration and intentially
-    # needs to be globbed.
-    # shellcheck disable=SC2153,SC2086
-    if minion_in_jenkins "$server" $JENKINS_URLS; then
-        # No need to delete server if it is still attached to Jenkins
-        continue
-    else
-        echo "Deleting $server"
-        lftools openstack --os-cloud vex \
-            server remove --minutes 15 "$server"
-    fi
-done
diff --git a/jjb/odl-openstack-cleanup-stale-nodes.sh b/jjb/odl-openstack-cleanup-stale-nodes.sh
deleted file mode 100644 (file)
index 25cf88c..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -l
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 - 2018 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-echo "---> Cleanup stale nodes"
-
-# Todo: As a safe check we could obtain the list of active jobs from Jenkins and
-# compute the checksum from $JOB_NAME to check if any active nodes exist and
-# 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.
-
-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-stacks.sh b/jjb/odl-openstack-cleanup-stale-stacks.sh
deleted file mode 100644 (file)
index 6d5e553..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash -l
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017 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
-##############################################################################
-# Cleanup stale stacks in the cloud
-# Requires the variable JENKINS_URLS declared in the job as a space separated
-# list of Jenkins instances to check for active builds.
-echo "---> Cleanup stale stacks"
-
-stack_in_jenkins() {
-    # Usage: check_stack_in_jenkins STACK_NAME JENKINS_URL [JENKINS_URL...]
-    # Returns: 0 If stack is in Jenkins and 1 if stack is not in Jenkins.
-
-    STACK_NAME="${1}"
-
-    builds=()
-    for jenkins in "${@:2}"; do
-        JENKINS_URL="$jenkins/computer/api/json?tree=computer[executors[currentExecutable[url]],oneOffExecutors[currentExecutable[url]]]&xpath=//url&wrapper=builds"
-        resp=$(curl -s -w "\\n\\n%{http_code}" --globoff -H "Content-Type:application/json" "$JENKINS_URL")
-        json_data=$(echo "$resp" | head -n1)
-        #status=$(echo "$resp" | awk 'END {print $NF}')
-
-        if [[ "${jenkins}" == *"jenkins."*".org" ]]; then
-            silo="production"
-        else
-            silo=$(echo "$jenkins" | sed 's/\/*$//' | awk -F'/' '{print $NF}')
-        fi
-        export silo
-        # We purposely want to wordsplit here to combine the arrays
-        # shellcheck disable=SC2206,SC2207
-        builds=(${builds[@]} $(echo "$json_data" | \
-            jq -r '.computer[].executors[].currentExecutable.url' \
-            | grep -v null | awk -F'/' '{print ENVIRON["silo"] "-" $6 "-" $7}')
-        )
-    done
-
-    if [[ "${builds[*]}" =~ $STACK_NAME ]]; then
-        return 0
-    fi
-
-    return 1
-}
-
-#########################
-## FETCH ACTIVE BUILDS ##
-#########################
-# Fetch stack list before fetching active builds to minimize race condition
-# where we might be try to delete stacks while jobs are trying to start
-
-# We purposely need word splitting here to create the OS_STACKS array.
-# shellcheck disable=SC2207
-OS_STACKS=($(openstack stack list \
-            -f value -c "Stack Name" -c "Stack Status" \
-            --property "stack_status=CREATE_COMPLETE" \
-            --property "stack_status=DELETE_FAILED" \
-            --property "stack_status=CREATE_FAILED" \
-            | awk '{print $1}'))
-
-echo "---> Active stacks"
-for stack in "${OS_STACKS[@]}"; do
-    echo "$stack"
-done
-
-##########################
-## DELETE UNUSED STACKS ##
-##########################
-echo "---> Delete orphaned stacks"
-
-# Search for stacks that are not in use by either releng or sandbox silos and
-# delete them.
-for STACK_NAME in "${OS_STACKS[@]}"; do
-    echo "Checking if orphaned $STACK_NAME"
-
-    # JENKINS_URLS is provided by the Jenkins Job declaration and intentially
-    # needs to be globbed.
-    # shellcheck disable=SC2153,SC2086
-    if stack_in_jenkins "$STACK_NAME" $JENKINS_URLS; then
-        # No need to delete stacks if there exists an active build for them
-        continue
-    else
-        status=$(openstack stack show -f value -c "stack_status" "$STACK_NAME")
-        case "$status" in
-            DELETE_IN_PROGRESS)
-                echo "skipping delete, $STACK_NAME is already DELETE in progress."
-                continue
-            ;;
-            DELETE_FAILED)
-                # Abandon is not supported in Vexxhost so let's keep trying to
-                # delete for now...
-                # echo "Stack delete failed, trying to stack abandon now."
-                # openstack stack abandon "$STACK_NAME"
-                echo "Deleting orphaned stack: $STACK_NAME"
-                openstack stack delete --yes "$STACK_NAME"
-
-                echo "------------------------------------"
-                echo "Stack details"
-                echo "------------------------------------"
-                openstack stack show "$STACK_NAME" -f yaml
-                echo "------------------------------------"
-                continue
-            ;;
-            CREATE_COMPLETE|CREATE_FAILED)
-                echo "Deleting orphaned stack: $STACK_NAME"
-                openstack stack delete --yes "$STACK_NAME"
-                continue
-            ;;
-            *)
-                continue
-            ;;
-        esac
-    fi
-done
diff --git a/jjb/odl-openstack-cleanup-stale-volumes.sh b/jjb/odl-openstack-cleanup-stale-volumes.sh
deleted file mode 100644 (file)
index 3745eb2..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash -l
-# 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
-
-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
diff --git a/jjb/odl-openstack-install.sh b/jjb/odl-openstack-install.sh
deleted file mode 100644 (file)
index 6524ed5..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2017, 2018 The Linux Foundation and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# which accompanies this distribution, and is available at
-# http://www.eclipse.org/legal/epl-v10.html
-##############################################################################
-# Installs the openstack cli to /tmp/v/openstack
-echo "---> Install openstack cli into /tmp/v/openstack"
-
-virtualenv "/tmp/v/openstack"
-# shellcheck source=/tmp/v/openstack/bin/activate disable=SC1091
-source "/tmp/v/openstack/bin/activate"
-pip install --upgrade "pip<10.0.0" setuptools
-pip install --upgrade lftools[openstack] python-openstackclient python-heatclient
-pip freeze
index a1abf4669de961921764172b9c3c49cd0fea6658..da2e6d827bad5bf3754f73f9f2f94458bb721dc6 100644 (file)
@@ -15,7 +15,6 @@
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
     mvn-version: mvn35
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -45,7 +44,6 @@
 
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[odlparent]'
@@ -76,7 +74,6 @@
 
     mvn-settings: odlparent-settings
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[odlparent]'
     mvn-settings: 'odlparent-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: odlparent
-    description: 'List of odlparent jobs'
-    regex: '^odlparent-.*'
-    <<: *releng_view_common
+- project:
+    name: odlparent-view
+    views:
+      - project-view
+    project-name: odlparent
index ec2c33f4ee48acaf79ec8cafa9e4b054eb1cfc78..4c848fa5893e87ce7237b52382513cddd213105f 100644 (file)
@@ -2,7 +2,7 @@
 - project:
     name: odltools-csit
     jobs:
-      - inttest-csit-1node
+      - inttest-csit-1node-custom
       - inttest-csit-verify-1node
 
     project: odltools
index 110fa84a6de94ee6fb7c219f5c7ceef7cfb7ab00..60055fe106140b4be9ddaffe317e962be017c8f2 100644 (file)
@@ -21,8 +21,8 @@
     build-node: centos7-builder-2c-2g
     build-timeout: 60
 
-- view:
-    name: odltools
-    description: 'List of odltools jobs'
-    regex: '^odltools-.*'
-    <<: *releng_view_common
+- project:
+    name: odltools-view
+    views:
+      - project-view
+    project-name: odltools
index 37f2475a8f1217ebb6a548d0a115de2f24213ab0..c4baf3664d86abcfee2a55b2dd5b265c11e18b9e 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'of-config-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: of-config
-    description: 'List of of-config jobs'
-    regex: '^of-config-.*'
-    <<: *releng_view_common
+- project:
+    name: of-config-view
+    views:
+      - project-view
+    project-name: of-config
index 350306a6f5a91ff385487d8c74d69add4b44a50c..8cb06fe70766355885b06fb56c03fb99295a4a08 100644 (file)
@@ -92,8 +92,8 @@
           echo "----------------------------------"
           echo " Promoted ODL Autorelease artifact as release candidate!"
 
-- view:
-    name: openci
-    description: 'List of openci jobs'
-    regex: '^openci-.*'
-    <<: *releng_view_common
+- project:
+    name: openci-odl-view
+    views:
+      - project-view
+    project-name: openci-odl
index 27540e73ccef4d1eeae307fec6d004e4cc426aa8..b404b273f4e1b8f1fef7da48146815486f5105c6 100644 (file)
@@ -30,7 +30,7 @@
     install-features: 'odl-openflowplugin-flow-services-rest,odl-openflowplugin-drop-test'
 
     # Robot custom options
-    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:5000'
+    robot-options: '-v duration_in_secs:60 -v throughput_threshold:20000 -v latency_threshold:2000'
 
     # Plot Info
     01-plot-title: 'Throughput Mode'
index ff8ba430f00d2baba6bca5e6c21174be694e7b79..6cf7e904ee4a74eee84dc36d75112b6ac83eaa83 100644 (file)
@@ -37,7 +37,7 @@
         decanter-appender-elasticsearch
 
     # Robot custom options
-    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2500'
+    robot-options: '-v ODL_OF_PLUGIN:lithium -v switch_count:32 -v flow_count_per_switch:2250'
 
     # Plot Info
     01-plot-title: 'Flow Add rate'
index 4e63550a9c1da0e1adf4db6fd9ce91dc55734939..3b30d6118b5dde044892b1da963b149d9cb72ce6 100644 (file)
@@ -99,6 +99,7 @@
     name: openflowplugin-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'openflowplugin'
     project-name: 'openflowplugin'
     branch: 'master'
     mvn-goals: 'clean deploy javadoc:aggregate'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: openflowplugin
-    description: 'List of openflowplugin jobs'
-    regex: '^openflowplugin-.*'
-    <<: *releng_view_common
+- project:
+    name: openflowplugin-view
+    views:
+      - project-view
+    project-name: 'openflowplugin'
 
-- view:
-    name: openflowplugin-oxygen
-    description: 'List of openflowplugin oxygen jobs'
-    regex: 'openflowplugin-.*-oxygen'
-    <<: *releng_view_common
+- project:
+    name: openflowplugin-oxygen-view
+    views:
+      - common-view
+    view-name: 'openflowplugin-oxygen'
+    view-regex: '^openflowplugin-.*-oxygen'
index c1dfa113d40fb31a5b4f1b7e2443cdbf0113ca5c..1a8f6c06e18221813d1fe76d68181e0e309f7f97 100644 (file)
@@ -48,7 +48,6 @@
               GROUP_ID={group-id}
               UPLOAD_FILES_PATH={upload-files-dir}
       - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
           - ../global-jjb/shell/common-variables.sh
           - scripts/deploy-opflex.sh
 
@@ -73,7 +72,6 @@
           properties-content: |
               STAGING_PROFILE_ID={staging-profile-id}
       - shell: !include-raw-escape:
-          - ../global-jjb/shell/lftools-install.sh
           - ../global-jjb/shell/maven-stage.sh
 
 - scm:
index 640f4213bb1a0f764b86010499bcbcce2f8bbb26..ff6acfc8af15a8ca4e3fc53d05b6f16305370f64 100644 (file)
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - opflex-build:
           mvn33: '{mvn-version}'
           stream: '{stream}'
           email-prefix: '[opflex]'
       - lf-infra-publish
 
-- view:
-    name: opflex
-    description: 'List of opflex jobs'
-    regex: '^opflex-.*'
-    <<: *releng_view_common
+- project:
+    name: opflex-view
+    views:
+      - project-view
+    project-name: opflex
index 2fa61bd60e63dd22c5c6f550b8ea8548e89dc23b..3ee1e2f41cf6467e43a17c118dc2956eadcecc10 100644 (file)
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
index ea6cbc85b086b4097df528c99f2bdfb7cfae97a8..6e7ef19a7661b3e7ac7877eb469c8b613d196da4 100644 (file)
@@ -66,8 +66,8 @@
     mvn-settings: 'ovil-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: ovil
-    description: 'List of ovil jobs'
-    regex: '^ovil-.*'
-    <<: *releng_view_common
+- project:
+    name: ovil-view
+    views:
+      - project-view
+    project-name: ovil
index e110e35a979ee06687a1e8181c998c660d895676..8f02b5d3eb0b469694cb00e75eac9bec3bbad8cd 100644 (file)
           maven-version: 'mvn33'
           stream: '{stream}'
           OVS_VERSION: '2.5.0'
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:
index 257c99ab03b71a69afd984303e69675992437342..428a5e14b6dfcbb102e5b326d4f6a4789fe762be 100644 (file)
           global-settings: 'global-settings'
           global-settings-type: cfp
       - shell: !include-raw-escape: cleanup-docker.sh
-      - jacoco-nojava-workaround
+      - lf-jacoco-nojava-workaround
 
     publishers:
       - email-notification:
index 3553845105175b2d7a4e80c2bf386fdf2708407f..a62d9800a3a81a313e9e7f58f9553ab12b795477 100644 (file)
@@ -69,8 +69,8 @@
     # Used by the release job
     staging-profile-id: a68b188166958
 
-- view:
-    name: ovsdb
-    description: 'List of ovsdb jobs'
-    regex: '^ovsdb-.*'
-    <<: *releng_view_common
+- project:
+    name: ovsdb-view
+    views:
+      - project-view
+    project-name: ovsdb
index d96dd73e99716168106aa407c6e76f6034685f48..6025be9a1e0b149f0ed1fd5eea00f6a431ce709e 100644 (file)
@@ -65,8 +65,8 @@
     mvn-settings: 'p4plugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: p4plugin
-    description: 'List of p4plugin jobs'
-    regex: '^p4plugin-.*'
-    <<: *releng_view_common
+- project:
+    name: p4plugin-view
+    views:
+      - project-view
+    project-name: p4plugin
similarity index 89%
rename from jjb/packaging/ansible.yaml
rename to jjb/packaging/packaging-ansible.yaml
index c3dca13bce26ee8e5fedcdfb90b44102c12a9f42..f0e4e2688795a8ba900405124da41746f42874c2 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: ansible
-    project-name: ansible
+    name: packaging-ansible
+    project-name: packaging-ansible
 
     jobs:
       - '{project-name}-test-rpm-{stream}'
       - shell: !include-raw: setup-ansible-rpm.sh
       - shell: !include-raw: test-ansible-rpm-default-config.sh
       - shell: !include-raw: test-ansible-rpm-custom-config.sh
+      - shell: !include-raw: test-ansible-rpm-upgrade.sh
 
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
@@ -96,7 +97,7 @@
       - shell: !include-raw: test-ansible-deb-custom-config.sh
 
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
 
     publishers:
       - lf-infra-publish
+
+- project:
+    name: packaging-ansible-view
+    views:
+      - project-view
+    project-name: packaging-ansible
similarity index 93%
rename from jjb/packaging/puppet.yaml
rename to jjb/packaging/packaging-puppet.yaml
index 8dfc9de3ba3ce7ef212428d5a83418df38bf5220..fb0b1856f96779844b9834bae0e26ad183447479 100644 (file)
@@ -1,7 +1,7 @@
 ---
 - project:
-    name: puppet
-    project-name: puppet
+    name: packaging-puppet
+    project-name: packaging-puppet
 
     jobs:
       - '{project-name}-test-sanity-{stream}'
@@ -55,7 +55,7 @@
       - shell: !include-raw: test-puppet.sh
 
     triggers:
-      - timed: '@weekly'
+      - timed: '@monthly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
       - shell: !include-raw: test-puppet.sh
 
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
 
     publishers:
       - lf-infra-publish
+
+- project:
+    name: packaging-puppet-view
+    views:
+      - project-view
+    project-name: packaging-puppet
index 9c9174ec96429a150ecb4b084f27f81bd6afc0e9..2f120cdcbf78c25c6ae89cc14af37016f9cd3813 100644 (file)
@@ -98,6 +98,7 @@
           build-timeout: '{build-timeout}'
 
     builders:
+      - lf-infra-pre-build
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
       - lf-infra-deploy-maven-file:
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
+      # Test Fluorine 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.9.1/karaf-0.9.1.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
       # Test Neon pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
       # 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.10.0-SNAPSHOT/karaf-0.10.0-20181106.150120-17.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181119.131156-18.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       - install-test-uninstall-rpm
 
     triggers:
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
+      # Test Fluorine 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.9.1/karaf-0.9.1.tar.gz'
+      - shell: !include-raw-escape: build-rpm.sh
+      - install-test-uninstall-rpm
+
       # Test Fluorine pre-release autorelease tarball
       # NB: This will need to be updated as old builds expire
       - inject:
       # 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.9.1-SNAPSHOT/karaf-0.9.1-20181023.120116-10.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.1-SNAPSHOT/karaf-0.9.1-20181112.140627-11.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       # 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.10.0-SNAPSHOT/karaf-0.10.0-20181106.150120-17.zip'
+          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.10.0-SNAPSHOT/karaf-0.10.0-20181119.131156-18.zip'
       - shell: !include-raw-escape: build-rpm.sh
       - install-test-uninstall-rpm
 
       - install-test-uninstall-rpm
 
     triggers:
-      - timed: '@daily'
+      - timed: '@weekly'
       - gerrit:
           server-name: '{gerrit-server-name}'
           trigger-on:
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw: uninstall-rpm.sh
 
+    triggers:
+      - timed: '@monthly'
+
     publishers:
       # TODO: Remove the archive publisher
       #       small data should be stored on logs.opendaylight.org
       - installrepcfg-upgrade-start-test-stop-rpm
 
     triggers:
+      - timed: '@weekly'
       - gerrit-trigger-patch-submitted:
           gerrit-server-name: '{gerrit-server-name}'
           project: '{project}'
       - shell: !include-raw: stop-odl.sh
       - shell: !include-raw-escape: uninstall-deb.sh
 
+    triggers:
+      - timed: '@monthly'
+
     publishers:
       - lf-infra-publish
 
           upload-files-dir: '{upload-files-dir}'
           maven-repo-url: '{maven-repo-url}'
 
+    triggers:
+      - timed: '@monthly'
+
     publishers:
       - lf-infra-publish
 
-- view:
-    name: packaging
-    description: 'List of packaging, ansible and puppet jobs'
-    regex: '^packaging.*|ansible.*|puppet.*'
-    <<: *releng_view_common
+- project:
+    name: packaging-view
+    views:
+      - project-view
+    project-name: packaging
diff --git a/jjb/packaging/test-ansible-rpm-upgrade.sh b/jjb/packaging/test-ansible-rpm-upgrade.sh
new file mode 100644 (file)
index 0000000..c5a5c55
--- /dev/null
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Uninstall ODL from previous test
+# This is to ensure these tests run independant
+# from any other tests
+sudo yum remove opendaylight -y
+
+# Remove the ODL directory
+sudo rm -rf /opt/opendaylight
+
+# Execute the upgrade tests
+sudo ansible-playbook -i "localhost," -c local $WORKSPACE/ansible/tests/test-odl-upgrade.yaml -v
index af6a871cf4944ff99330c833bc48edf52d827fda..7d500b4e9a2908c59a495f5e35ebb2bce4b79785 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'packetcable-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: packetcable
-    description: 'List of packetcable jobs'
-    regex: '^packetcable-.*'
-    <<: *releng_view_common
+- project:
+    name: packetcable-view
+    views:
+      - project-view
+    project-name: packetcable
index b7a4b125b3e9075bec7edc583a38e4b8c30f76e3..ba5479ee141cd44e51899a3dbef5041c59c69998 100644 (file)
@@ -16,7 +16,6 @@
       - gerrit-jjb-verify
       - builder-check-poms
       - builder-copy-sandbox-logs
-      - builder-openstack-cron
       - gerrit-tox-verify
       # Automation for docs and jobs
       - 'builder-update-image-list'
     build-node: centos7-builder-2c-2g
     archive-artifacts: '**/*.log'
     build-timeout: 30
-    jjb-version: 2.7.0
+    jjb-version: 2.8.0
+
+- project:
+    name: builder-openstack
+    jobs:
+      - gerrit-openstack-cron
+
+    project: 'releng/builder'
+    project-name: builder
+    build-node: centos7-builder-2c-2g
+
     jenkins-urls: >
-      https://jenkins.opendaylight.org/releng
-      https://jenkins.opendaylight.org/sandbox
+        https://jenkins.opendaylight.org/releng
+        https://jenkins.opendaylight.org/sandbox
+    openstack-cloud: vex
 
 - job-template:
     name: builder-check-poms
       - lf-infra-publish
 
 
-- job-template:
-    name: builder-openstack-cron
-    project-type: freestyle
-    node: '{build-node}'
-    concurrent: true
-
-    properties:
-      - lf-infra-properties:
-          build-days-to-keep: 7
-
-    parameters:
-      - lf-infra-parameters:
-          project: '{project}'
-          stream: '{stream}'
-          branch: '{branch}'
-          lftools-version: '{lftools-version}'
-      - string:
-          name: OS_CLOUD
-          default: '{os-cloud}'
-          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}'
-          description: Artifacts to archive to the logs server.
-      - string:
-          name: JENKINS_URLS
-          default: '{jenkins-urls}'
-          description: 'Space separated list of Jenkins URLs to check for active builds'
-
-    scm:
-      - git-scm:
-          branch: '{branch}'
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: '{build-timeout}'
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
-      # Listed after to override openstack-infra-wrappers clouds.yaml definition
-      - config-file-provider:
-          files:
-            - 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:
-      - lf-infra-pre-build
-      - shell: |
-          #!/bin/bash -l
-          pip install --user --upgrade lftools[openstack]~=0.17.1
-      # 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
-
-    publishers:
-      - lf-infra-publish
-
 - job-template:
     name: 'builder-update-image-list'
     project-type: freestyle
index 893d6b7236229b8d0f3097df2f45e7fdaf8d6951..7c0a9164318df0009cc234580f8e560e593c383e 100644 (file)
               further details.
               https://docs.openstack.org/developer/python-openstackclient/
 
-- parameter:
-    name: build-tag
-    parameters:
-      - string:
-          name: BUILD_TAG
-          default: ''
-          description: 'Tag in Git to checkout'
-
-- parameter:
-    name: controller-version-parameter
-    parameters:
-      - string:
-          name: ODL_VERSION
-          default: '{odl_version}'
-          description: 'Controller version (for use with openstacks networking_odl project)'
-
 - parameter:
     name: patches-to-build-parameter
     parameters:
           default: 'master'
           description: 'distribution repo branch to build with'
 
-- parameter:
-    name: p2zip-parameter
-    parameters:
-      - string:
-          name: P2ZIP_URL
-          default: ''
-          description: 'Nexus staging profile id'
-
-- parameter:
-    name: stage-id-parameter
-    parameters:
-      - string:
-          name: STAGING_PROFILE_ID
-          default: '{stage-id}'
-          description: 'Nexus staging profile id'
-
 - parameter:
     name: maven-exec
     parameters:
           skip-tag: true
           choosing-strategy: '{choosing-strategy}'
 
-- wrapper:
-    name: build-timeout
-    wrappers:
-      - timeout:
-          type: absolute
-          timeout: 360
-          fail: true
-
 # This is a single macro to use for all jobs who vote on every (relevant) patch set.
 # Only 'recheck' trigger word is supported, it always triggers the full set of relevant jobs,
 # in order to prevent Jenkins from starting only a subset and still voting Verified+1.
           send-to:
             - recipients
 
-
-- builder:
-    # Installs the openstack cli into a virtualenv at /tmp/v/openstack
-    name: odl-openstack-install
-    builders:
-      - shell: !include-raw: odl-openstack-install.sh
-
-- builder:
-    name: odl-openstack-check-image-protection
-    builders:
-      - shell: !include-raw: odl-openstack-check-image-protection.sh
-
-- builder:
-    name: odl-openstack-cleanup-old-images
-    builders:
-      - shell: !include-raw: odl-openstack-cleanup-old-images.sh
-
-- builder:
-    name: odl-openstack-cleanup-orphaned-nodes
-    builders:
-      - shell: !include-raw: odl-openstack-cleanup-orphaned-nodes.sh
-
-- builder:
-    name: odl-openstack-cleanup-stale-nodes
-    builders:
-      - shell: !include-raw: odl-openstack-cleanup-stale-nodes.sh
-
-- builder:
-    name: odl-openstack-cleanup-stale-stacks
-    builders:
-      - shell: !include-raw: odl-openstack-cleanup-stale-stacks.sh
-
-- builder:
-    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
-    builders:
-      - lf-provide-maven-settings:
-          global-settings-file: global-settings
-          settings-file: '{settings-file}'
-      - lf-infra-create-netrc:
-          server-id: opendaylight-site
-      - shell: !include-raw-escape:
-          - global-jjb/shell/lftools-install.sh
-          - opendaylight-infra-deploy-maven-site.sh
-      - lf-provide-maven-settings-cleanup
-
 - builder:
     name: opendaylight-infra-stack
     # opendaylight-infra-stack.sh has a required variable {stack-template} that
     builders:
       - shell: 'if [ -d /tmp/r ]; then rm -rf /tmp/r; fi'
 
-- builder:
-    name: jacoco-nojava-workaround
-    builders:
-      - shell: 'mkdir -p $WORKSPACE/target/classes $WORKSPACE/jacoco/classes'
-
-- builder:
-    name: check-clm
-    builders:
-      - sonatype-clm:
-          application-name: '{application-name}'
-
-- builder:
-    name: releng-check-unicode
-    builders:
-      - shell: |
-          $WORKSPACE/scripts/check-unicode.sh jjb/
-
-- builder:
-    name: provide-maven-settings
-    builders:
-      - config-file-provider:
-          files:
-            - file-id: '{global-settings-file}'
-              variable: 'GLOBAL_SETTINGS_FILE'
-            - file-id: '{settings-file}'
-              variable: 'SETTINGS_FILE'
-
-- builder:
-    name: releng-fetch-p2zip-if-necessary
-    builders:
-      - shell: |
-          # Cleanup any existing zips and metadata before we download the new update site
-          rm -f *.zip *.xml
-      - conditional-step:
-          condition-kind: strings-match
-          condition-string1: '$P2ZIP_URL'
-          condition-string2: ''
-          condition-basedir: workspace
-          steps:
-            # TODO: Figure out latest snapshot version number to pull rather than hardcoding 1.1.1-SNAPSHOT
-            - maven-target:
-                maven-version: '{maven-version}'
-                goals: >
-                    org.apache.maven.plugins:maven-dependency-plugin:get
-                    org.apache.maven.plugins:maven-dependency-plugin:copy
-                    -V -B
-                    -Dartifact=org.opendaylight.yangide:org.opendaylight.yangide.update-site:1.1.1-SNAPSHOT:zip
-                    -DoutputDirectory=$WORKSPACE
-                settings: '{settings}'
-                global-settings: '{global-settings}'
-
-- builder:
-    name: releng-generate-p2pom
-    builders:
-      - shell: !include-raw: generate-p2pom.sh
-
-- builder:
-    name: releng-update-p2composite-metadata
-    builders:
-      - shell: !include-raw: update-p2composite-metadata.sh
-      - conditional-step:
-          condition-kind: file-exists
-          condition-filename: deploy-composite-repo.xml
-          condition-basedir: workspace
-          steps:
-            - maven-target:
-                maven-version: '{maven-version}'
-                pom: 'deploy-composite-repo.xml'
-                goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
-                settings: '{settings}'
-                global-settings: '{global-settings}'
-
 - publisher:
     name: releng-openstack-stack-delete
     publishers:
                     openstack stack delete --yes "$STACK_NAME"
           mark-unstable-if-failed: false
 
-- builder:
-    name: releng-stage-release
-    builders:
-      - shell: !include-raw: stage-release.sh
-
 - wrapper:
     # This wrapper is required for all jobs as it configures the wrappers
     # needed by OpenDaylight infra.
index 71c089c7b14565bee237de6e88104f18e3d1aa1c..d735b4876e3e56d0635154300fb9dc7e32c0a8b1 100644 (file)
@@ -19,6 +19,7 @@
           mvn-goals: clean install -V -Dmaven.compile.fork=true -Dintegrationtests -Dvtn.build.jobs=2
 
       - gerrit-maven-stage:
+          sign-artifacts: true
           mvn-central: true
           ossrh-profile-id: 7edbe315063867
       - gerrit-maven-verify
@@ -77,8 +78,8 @@
           result: 'success'
 
     builders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
+      - lf-jacoco-nojava-workaround
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - maven-target:
           forbidden-files: ''
 
     prebuilders:
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
+      - lf-jacoco-nojava-workaround
+      - lf-provide-maven-settings:
           global-settings-file: 'global-settings'
           settings-file: '{mvn-settings}'
       - lf-maven-install:
diff --git a/jjb/releng-templates.yaml b/jjb/releng-templates.yaml
deleted file mode 100644 (file)
index d830b59..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
----
-- job-template:
-    name: '{project-name}-release-java'
-
-    # Job template for producing a release candidate by creating a staging repo
-    # in Nexus.
-
-    project-type: freestyle
-    node: '{build-node}'
-    jdk: '{java-version}'
-
-    properties:
-      - opendaylight-infra-properties:
-          build-days-to-keep: 30
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - build-tag
-      - stage-id-parameter:
-          stage-id: '{stage-id}'
-
-    scm:
-      - git:
-          credentials-id: 'opendaylight-jenkins-ssh'
-          url: '$GIT_BASE'
-          branches:
-            - '$BUILD_TAG'
-          skip-tag: true
-          shallow-clone: true
-          wipe-workspace: true
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
-      - provide-maven-settings:
-          global-settings-file: 'global-settings'
-          settings-file: 'autorelease-settings'
-      - maven-target:
-          maven-version: 'mvn35'
-          pom: 'pom.xml'
-          goals: >
-              clean deploy -V -B
-              -Dmaven.repo.local=/tmp/r
-              -Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r
-              -Djenkins
-              -DaltDeploymentRepository=staging::default::file:hide/from/pom/files/stage
-          java-opts:
-            - '-Xmx1024m -XX:MaxPermSize=256m'
-          settings: 'autorelease-settings'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - releng-stage-release
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
-
-
-- job-template:
-    name: '{project-name}-publish-p2repo'
-
-    # Job template for publishing a p2 repo given a URL to a zipped p2repo.
-
-    project-type: freestyle
-    node: '{build-node}'
-    jdk: '{java-version}'
-
-    parameters:
-      - opendaylight-infra-parameters:
-          os-cloud: '{os-cloud}'
-          project: '{project}'
-          branch: '{branch}'
-          refspec: 'refs/heads/{branch}'
-          artifacts: '{archive-artifacts}'
-      - p2zip-parameter
-
-    wrappers:
-      - opendaylight-infra-wrappers:
-          build-timeout: '{build-timeout}'
-
-    builders:
-      - wipe-org-opendaylight-repo
-      - jacoco-nojava-workaround
-      - releng-fetch-p2zip-if-necessary:
-          maven-version: 'mvn35'
-          settings: '{mvn-settings}'
-          global-settings: 'global-settings'
-      - releng-generate-p2pom
-      - maven-target:
-          maven-version: 'mvn35'
-          pom: 'pom.xml'
-          goals: 'clean deploy -V -B -Dmaven.repo.local=/tmp/r'
-          settings: '{mvn-settings}'
-          settings-type: cfp
-          global-settings: 'global-settings'
-          global-settings-type: cfp
-      - releng-update-p2composite-metadata:
-          maven-version: 'mvn35'
-          settings: '{mvn-settings}'
-          global-settings: 'global-settings'
-
-    publishers:
-      - email-notification:
-          email-recipients: '{email-recipients}'
-          email-prefix: '[releng]'
-      - lf-infra-publish
index 6d879573e6eda69b08c930f36e85de5c04793a89..cd938b85bd9856d577bb3709dbd319c8ebc7f15e 100644 (file)
       - robot-list
     recurse: false
 
-- view:
+- project:
     name: '00-Empty View'
-    description: >
+    views:
+      - common-view
+    view-name: '00-Empty View'
+    view-description: >
       Empty job view. This is used as the default landing view to keep the
       Jenkins UI responding better while a) under high load and b) when there
-      are a lot of jobs defined in the system'
-    view-type: list
-    filter-executors: false
-    filter-queue: false
-    recurse: false
-    regex: ''
+      are a lot of jobs defined in the system
+    view-regex: ''
 
 - view:
     name: 01-Recent
         check-start-time: true
     <<: *releng_view_common
 
-- view:
+- project:
     name: All-Sonar
-    regex: '.*-sonar$'
-    description: 'List of Sonar jobs'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: All-Sonar
+    view-regex: '.*-sonar$'
+    view-description: 'List of Sonar jobs'
 
 - view:
     name: CLM
       - policy-violations
     recurse: false
 
-- view:
+- project:
     name: CSIT-1node
-    description: 'List of CSIT 1node jobs'
-    regex: '^.*-csit-1node.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT-1node
+    view-description: 'List of CSIT 1node jobs'
+    view-regex: '^.*-csit-1node.*'
 
-- view:
+- project:
     name: CSIT-3node
-    description: 'List of CSIT 3node jobs'
-    regex: '^.*-csit-3node.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT-3node
+    view-description: 'List of CSIT 3node jobs'
+    view-regex: '^.*-csit-3node.*'
 
-- view:
+- project:
     name: CSIT
-    description: 'List of CSIT jobs'
-    regex: '^.*-csit-.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT
+    view-description: 'List of CSIT jobs'
+    view-regex: '^.*-csit-.*'
 
-- view:
+- project:
     name: CSIT-Verify
-    description: 'List of CSIT Verify jobs'
-    regex: '^.*-csit-verify.*'
-    <<: *integration_view_csit
+    views:
+      - csit-view
+    view-name: CSIT-Verify
+    view-description: 'List of CSIT Verify jobs'
+    view-regex: '^.*-csit-verify.*'
 
-- view:
+- project:
     name: Distribution-Check
-    description: 'List of Distribution Check jobs'
-    regex: '.*-distribution.*-check-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Distribution-Check
+    view-description: 'List of Distribution Check jobs'
+    view-regex: '.*-distribution.*-check-.*'
 
-- view:
+- project:
     name: Distribution-Jobs
-    description: >
+    views:
+      - common-view
+    view-name: Distribution-Jobs
+    view-description: >
         List of Distribution jobs (test, check, merge, deploy, offline, verify)
-    regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*'
-    <<: *releng_view_common
+    view-regex: '^.*-distribution-(?!(test|check|merge|deploy|offline|verify)).*'
 
-- view:
+- project:
     name: Gate
-    description: 'List of Gate jobs'
-    regex: '.*-gate-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Gate
+    view-description: 'List of Gate jobs'
+    view-regex: '.*-gate-.*'
 
-- view:
+- project:
     name: Integration
-    description: 'List of Integration jobs'
-    regex: '.*-integration-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Integration
+    view-description: 'List of Integration jobs'
+    view-regex: '.*-integration-.*'
 
-- view:
+- project:
     name: Merge-Jobs
-    description: 'List of Merge jobs'
-    regex: '.*-merge-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Merge-Jobs
+    view-description: 'List of Merge jobs'
+    view-regex: '.*-merge-.*'
 
-- view:
+- project:
     name: Patch-Test
-    description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
-    regex: '.*-patch-test-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Patch-Test
+    view-description: 'List of Patch-Test jobs, for prioritizing jobs via the Job Priorities plugin'
+    view-regex: '.*-patch-test-.*'
 
-- view:
+- project:
     name: Periodic
-    description: 'List of Periodic jobs'
-    regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
-    <<: *releng_view_common
-
-- view:
+    project: Periodic
+    project-name: Periodic
+    view-name: Periodic
+    views:
+      - common-view
+    view-description: 'List of Periodic jobs'
+    view-regex: '[a-zA-Z0-9]+-periodic-[a-zA-Z0-9]+'
+
+- project:
     name: Release
-    description: 'List of Release jobs'
-    regex: '.*-release-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Release
+    view-description: 'List of Release jobs'
+    view-regex: '.*-release-.*'
 
-- view:
+- project:
     name: Sanity
-    description: 'List of Sanity jobs'
-    regex: '.*-sanity-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Sanity
+    view-description: 'List of Sanity jobs'
+    view-regex: '.*-sanity-.*'
 
-- view:
+- project:
     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:
+    views:
+      - common-view
+    view-name: Thirdparty
+    view-description: 'List of ODL Nexus Thirdparty dependencies jobs'
+    view-regex: '.*-thirdparty-.*'
+
+- project:
+    name: Validate-AR
+    views:
+      - common-view
+    view-name: Validate
+    view-description: 'List of Validate jobs'
+    view-regex: '.*-validate-autorelease-.*'
+
+- project:
     name: Verify
-    description: 'List of Verify jobs, exluding CSIT jobs'
-    regex: '^(?!.*-csit).*-verify-.*'
-    <<: *releng_view_common
+    views:
+      - common-view
+    view-name: Verify
+    view-description: 'List of Verify jobs, exluding CSIT jobs'
+    view-regex: '^(?!.*-csit).*-verify-.*'
 
-- view:
+- project:
     name: builder
-    description: 'List of builder jobs'
-    regex: '^builder-.*'
-    <<: *releng_view_common
+    views:
+      - project-view
+    project-name: builder
index 8f16f15412caf7d1a829bec2d0047c7aa29831a0..146c188931ba94c18d602739f13abe1681e5d2f3 100644 (file)
@@ -58,6 +58,7 @@
     name: sdninterfaceapp-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'sdninterfaceapp'
     project-name: 'sdninterfaceapp'
     branch: 'master'
@@ -65,8 +66,8 @@
     mvn-settings: 'sdninterfaceapp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: sdninterfaceapp
-    description: 'List of sdninterfaceapp jobs'
-    regex: '^sdninterfaceapp-.*'
-    <<: *releng_view_common
+- project:
+    name: sdninterfaceapp-view
+    views:
+      - project-view
+    project-name: sdninterfaceapp
index dcd019835bd268a650fa757e2fbbe5f76a63a35e..98801745618fb27223023542db4d9c97dfb6e44e 100644 (file)
@@ -39,6 +39,7 @@
     name: serviceutils-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'serviceutils'
     project-name: 'serviceutils'
     branch: 'master'
@@ -46,8 +47,8 @@
     mvn-settings: 'serviceutils-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: serviceutils
-    description: 'List of serviceutils jobs'
-    regex: '^serviceutils-.*'
-    <<: *releng_view_common
+- project:
+    name: serviceutils-view
+    views:
+      - project-view
+    project-name: serviceutils
index 2633981ab8972fc9b2d5c0118cfe7dc08f724b63..4e659c575643eee72f1865f4361d4cf6ad31154b 100644 (file)
@@ -84,8 +84,8 @@
     mvn-settings: 'sfc-settings'
     mvn-opts: '-Xmx2048m -XX:MaxPermSize=256m -Dmaven.compile.fork=true'
 
-- view:
-    name: sfc
-    description: 'List of sfc jobs'
-    regex: '^sfc-.*'
-    <<: *releng_view_common
+- project:
+    name: sfc-view
+    views:
+      - project-view
+    project-name: sfc
index f220373229c8cb5c342507018ad5301e87e4ba22..9d6ef95f5bb6b46bc2d48b6ac31a449f2f28cec0 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'snbi-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: snbi
-    description: 'List of snbi jobs'
-    regex: '^snbi-.*'
-    <<: *releng_view_common
+- project:
+    name: snbi-view
+    views:
+      - project-view
+    project-name: snbi
index 881caab1819e757ddb61ca45e22eb4a0b361c423..10a13ea7912921135a4d4a30094e877f8ba6556b 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'snmp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: snmp
-    description: 'List of snmp jobs'
-    regex: '^snmp-.*'
-    <<: *releng_view_common
+- project:
+    name: snmp-view
+    views:
+      - project-view
+    project-name: snmp
index 570a42948dad82ba69df9b8ecc6d6c1781e001c8..228b19f42d54ffd7e0b201bec28bbcee7d328b45 100644 (file)
     name: snmp4sdn-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'snmp4sdn'
     project-name: 'snmp4sdn'
     branch: 'master'
     mvn-settings: 'snmp4sdn-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: snmp4sdn
-    description: 'List of snmp4sdn jobs'
-    regex: '^snmp4sdn-.*'
-    <<: *releng_view_common
+- project:
+    name: snmp4sdn-view
+    views:
+      - project-view
+    project-name: snmp4sdn
diff --git a/jjb/stage-release.sh b/jjb/stage-release.sh
deleted file mode 100644 (file)
index 81fa33a..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2016 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
-##############################################################################
-
-# Assuming that mvn deploy created the hide/from/pom/files/stage directory.
-cd hide/from/pom/files || exit 1
-mkdir -p m2repo/org/opendaylight/
-
-rsync -avz --exclude 'maven-metadata*' \
-           --exclude '_remote.repositories' \
-           --exclude 'resolver-status.properties' \
-           "stage/org/opendaylight/$PROJECT" m2repo/org/opendaylight/
-
-mvn org.sonatype.plugins:nexus-staging-maven-plugin:1.6.2:deploy-staged-repository \
-    -DrepositoryDirectory="$(pwd)/m2repo" \
-    -DnexusUrl=https://nexus.opendaylight.org/ \
-    -DstagingProfileId="$STAGING_PROFILE_ID" \
-    -DserverId="opendaylight-staging" \
-    -s "$SETTINGS_FILE" \
-    -gs "$GLOBAL_SETTINGS_FILE" | tee "$WORKSPACE/deploy-staged-repository.log"
index 6910317ec056ca71bc9443744abd94b335c79ae8..deb7b97d6073f207ea449aa95c870e70a397d3a6 100644 (file)
     project: 'sxp'
     project-name: 'sxp'
     branch: 'master'
+
     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]'
 
     project: 'sxp'
     project-name: 'sxp'
     branch: 'stable/oxygen'
+
     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]'
 
@@ -71,8 +75,8 @@
     mvn-settings: 'sxp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: sxp
-    description: 'List of sxp jobs'
-    regex: '^sxp-.*'
-    <<: *releng_view_common
+- project:
+    name: sxp-view
+    views:
+      - project-view
+    project-name: sxp
index 09d519ea140218d3db1dfad2dca005e5432d6dbf..87c311e3e65d407d0a85616246f90f5534846986 100644 (file)
@@ -44,8 +44,8 @@
     mvn-settings: 'systemmetrics-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: systemmetrics
-    description: 'List of systemmetrics jobs'
-    regex: '^systemmetrics-.*'
-    <<: *releng_view_common
+- project:
+    name: systemmetrics-view
+    views:
+      - project-view
+    project-name: systemmetrics
index b7f34dcc5db9f4d367f93e6c5539e999e5243331..f3342b2723d1344bef525e3df09d759184ba772e 100644 (file)
@@ -61,8 +61,8 @@
     mvn-goals: 'clean install'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: telemetry
-    description: 'List of telemetry jobs'
-    regex: '^telemetry-.*'
-    <<: *releng_view_common
+- project:
+    name: telemetry-view
+    views:
+      - project-view
+    project-name: telemetry
index b347ad8c9fcfa71f248935520dd967889202c7c1..920b4e294b4fcdac55c46534984a2b8755a26a20 100644 (file)
@@ -71,8 +71,8 @@
     mvn-settings: 'transportpce-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: transportpce
-    description: 'List of transportpce jobs'
-    regex: '^transportpce-.*'
-    <<: *releng_view_common
+- project:
+    name: transportpce-view
+    views:
+      - project-view
+    project-name: transportpce
index 9221d23bebe84e310aa25f56a2672ef9fbefb6ca..f16049f8291378991e9ccfe3d00a13d8f758fe25 100644 (file)
@@ -71,8 +71,8 @@
     mvn-settings: 'tsdr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: tsdr
-    description: 'List of tsdr jobs'
-    regex: '^tsdr-.*'
-    <<: *releng_view_common
+- project:
+    name: tsdr-view
+    views:
+      - project-view
+    project-name: tsdr
index b271cb3197defcbbfa1c2a61bfe7e8a2df897d1b..59becd5b06097e5cd21c9aea7033a55fa6ca8263 100644 (file)
     name: ttp-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'ttp'
     project-name: 'ttp'
     branch: 'master'
     mvn-settings: 'ttp-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: ttp
-    description: 'List of ttp jobs'
-    regex: '^ttp-.*'
-    <<: *releng_view_common
+- project:
+    name: ttp-view
+    views:
+      - project-view
+    project-name: ttp
index 5e5af5b21e15aa52b1f2af59fb1b9b2bfb8c734e..cc769ff41d09d15a04ec4f07f61233b1c9195c09 100644 (file)
     name: unimgr-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'unimgr'
     project-name: 'unimgr'
     branch: 'master'
     mvn-settings: 'unimgr-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: unimgr
-    description: 'List of unimgr jobs'
-    regex: '^unimgr-.*'
-    <<: *releng_view_common
+- project:
+    name: unimgr-view
+    views:
+      - project-view
+    project-name: unimgr
diff --git a/jjb/update-p2composite-metadata.sh b/jjb/update-p2composite-metadata.sh
deleted file mode 100644 (file)
index 666729c..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2016 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
-##############################################################################
-
-# If we detect a snapshot build then there is no need to run this script.
-# YangIDE has indicated that the only want the latest snapshot released to
-# the snapshot directory.
-if echo "$P2ZIP_URL" | grep opendaylight.snapshot; then
-    exit 0
-fi
-if [[ "$P2ZIP_URL" == "" ]]; then
-    exit 0
-fi
-
-EPOCH_DATE=$(date +%s%3N)
-MVN_METADATA=$(echo "$P2ZIP_URL" | sed 's,/*[^/]\+/*$,,' | sed 's,/*[^/]\+/*$,,')/maven-metadata.xml
-P2_COMPOSITE_ARTIFACTS=compositeArtifacts.xml
-P2_COMPOSITE_CONTENT=compositeContent.xml
-
-wget "$MVN_METADATA" -O maven-metadata.xml
-
-VERSIONS=$(xmlstarlet sel -t -m "/metadata/versioning/versions" -v "version" maven-metadata.xml)
-NUM_VERSIONS=$(echo "$VERSIONS" | wc -w)
-
-
-##
-## Create compositeArtifacts.xml and compositeContent.xml files
-##
-
-cat > $P2_COMPOSITE_ARTIFACTS <<EOF
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeArtifactRepository version='1.0.0'?>
-<repository name='OpenDaylight $PROJECT'
-    type='org.eclipse.equinox.internal.p2.artifact.repository.CompositeArtifactRepository' version='1.0.0'>
-  <properties size='1'>
-    <property name='p2.timestamp' value='$EPOCH_DATE'/>
-  </properties>
-  <children size='$NUM_VERSIONS'>
-EOF
-
-cat > $P2_COMPOSITE_CONTENT <<EOF
-<?xml version='1.0' encoding='UTF-8'?>
-<?compositeMetadataRepository version='1.0.0'?>
-<repository name='OpenDaylight $PROJECT'
-    type='org.eclipse.equinox.internal.p2.metadata.repository.CompositeMetadataRepository' version='1.0.0'>
-  <properties size='1'>
-    <property name='p2.timestamp' value='$EPOCH_DATE'/>
-  </properties>
-  <children size='$NUM_VERSIONS'>
-EOF
-
-##
-## Loop versions
-##
-
-for ver in $VERSIONS
-do
-    echo "    <child location='$ver'/>" >> $P2_COMPOSITE_ARTIFACTS
-    echo "    <child location='$ver'/>" >> $P2_COMPOSITE_CONTENT
-done
-
-##
-## Close files
-##
-
-cat >> $P2_COMPOSITE_ARTIFACTS <<EOF
-  </children>
-</repository>
-EOF
-
-cat >> $P2_COMPOSITE_CONTENT <<EOF
-  </children>
-</repository>
-EOF
-
-##
-## Create poms for uploading
-##
-
-zip composite-repo.zip $P2_COMPOSITE_ARTIFACTS $P2_COMPOSITE_CONTENT
-
-cat > deploy-composite-repo.xml <<EOF
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>org.opendaylight.$PROJECT</groupId>
-  <artifactId>p2repo</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
-  <packaging>pom</packaging>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <version>2.8.2</version>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-      <plugin>
-        <groupId>org.sonatype.plugins</groupId>
-        <artifactId>maven-upload-plugin</artifactId>
-        <version>0.0.1</version>
-        <executions>
-          <execution>
-            <id>publish-site</id>
-            <phase>deploy</phase>
-            <goals>
-              <goal>upload-file</goal>
-            </goals>
-            <configuration>
-              <serverId>opendaylight-p2</serverId>
-              <repositoryUrl>https://nexus.opendaylight.org/service/local/repositories/p2repos/content-compressed</repositoryUrl>
-              <file>composite-repo.zip</file>
-              <repositoryPath>org.opendaylight.$PROJECT/release</repositoryPath>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-    </plugins>
-  </build>
-</project>
-EOF
index 1e31b30a432ce77caed8340d8fe35ca5cb0d1c76..a8fb8b199092a06ec470eae310c2ddbb9d33ec9c 100644 (file)
     name: usc-sonar
     jobs:
       - gerrit-maven-sonar
+
     project: 'usc'
     project-name: 'usc'
     branch: 'master'
     mvn-settings: 'usc-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: usc
-    description: 'List of usc jobs'
-    regex: '^usc-.*'
-    <<: *releng_view_common
+- project:
+    name: usc-view
+    views:
+      - project-view
+    project-name: usc
index edaee783db60d18a4073ddb72a6f2f2185a75be3..8f51afc8a7fde6550f0d30e1108470ee81ad52f5 100644 (file)
@@ -61,8 +61,8 @@
     mvn-settings: 'usecplugin-settings'
     mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
 
-- view:
-    name: usecplugin
-    description: 'List of usecplugin jobs'
-    regex: '^usecplugin-.*'
-    <<: *releng_view_common
+- project:
+    name: usecplugin-view
+    views:
+      - project-view
+    project-name: usecplugin
index cb00554c8289f94db49be1e3cd5e0a25589d6e99..73e9396604c46e79caadda98180174fe4cfdf6f0 100644 (file)
@@ -12,7 +12,6 @@
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -40,7 +39,6 @@
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -68,7 +66,6 @@
 
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
-    sign-artifacts: true
 
     dependencies: ''
     email-upstream: '[yangtools]'
@@ -97,8 +94,8 @@
     mvn-settings: 'yangtools-settings'
     mvn-opts: '-Xmx1024m'
 
-- view:
-    name: yangtools
-    description: 'List of yangtools jobs'
-    regex: '^yangtools-.*'
-    <<: *releng_view_common
+- project:
+    name: yangtools-view
+    views:
+      - project-view
+    project-name: yangtools
index ec01814071eaea55ea7b025308b58d3923897eb6..6d52ef66fa727d6b8c528a99591e997ebfe80c2b 160000 (submodule)
@@ -1 +1 @@
-Subproject commit ec01814071eaea55ea7b025308b58d3923897eb6
+Subproject commit 6d52ef66fa727d6b8c528a99591e997ebfe80c2b
diff --git a/scripts/check-unicode.sh b/scripts/check-unicode.sh
deleted file mode 100755 (executable)
index 10b2a31..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-# SPDX-License-Identifier: EPL-1.0
-##############################################################################
-# Copyright (c) 2015 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
-#
-# Contributors:
-#   Thanh Ha (The Linux Foundation) - Initial implementation
-##############################################################################
-
-directory=${1:-"."}
-
-echo "Scanning $directory"
-if LC_ALL=C grep -r '[^[:print:][:space:]]' "$directory"; then
-    echo "Found files containing non-ascii characters."
-    exit 1
-fi
-
-echo "All files are ASCII only"