Merge changes from topic '72816'
authorSam Hague <shague@redhat.com>
Sat, 30 Jun 2018 03:22:44 +0000 (03:22 +0000)
committerGerrit Code Review <gerrit@opendaylight.org>
Sat, 30 Jun 2018 03:22:44 +0000 (03:22 +0000)
* changes:
  Rename lf-infra-lfn to just lfn
  Move views declarations to projects folders

1  2 
jjb/integration/integration-test-jobs.yaml
jjb/packaging/packaging.yaml

index 13f6115d0a2941bb7733513d72fe4a1438b6747d,0a7cd1b6bd0fc5c1a5cb09fb1e946c1eaa6a21d3..b0cee6bb8fe6cb44c3ee071656ff9561680c2f9e
@@@ -50,7 -50,7 +50,7 @@@
            csit-blacklist: >
                alto bier capwap centinel didm dluxapps groupbasedpolicy iotdm jsonrpc lacp
                l2switch messaging4transport nemo netide nic ocpplugin of-config p4plugin packetcable
 -              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd wip
 +              sdninterfaceapp sxp tsdr unimgr usc usecplugin vtn gate longevity sanity tdd tempest wip
            csit-list: !include: csit-jobs-fluorine.lst
            csit-weekly-list: '{csit-weekly-list-fluorine}'
            csit-high-frequency-list: '{csit-high-frequency-list-fluorine}'
@@@ -58,7 -58,7 +58,7 @@@
            branch: 'stable/oxygen'
            csit-blacklist: >
                capwap centinel didm iotdm jsonrpc lacp messaging4transport netide nic
 -              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd wip
 +              ocpplugin sdninterfaceapp unimgr usecplugin gate longevity sanity tdd tempest wip
            csit-list: !include: csit-jobs-oxygen.lst
            csit-weekly-list: '{csit-weekly-list-oxygen}'
            csit-high-frequency-list: '{csit-high-frequency-list-oxygen}'
  
      publishers:
        - lf-infra-publish
+ - view:
+     name: integration
+     description: 'List of integration jobs'
+     regex: '^integration-.*'
+     <<: *releng_view_common
index 02659fd36f7908d0a60f2bdf6d0ce005889b4cb1,a08fd2a8ea61731028457fd85fc539b88fbde1ac..4d1c2b34a29d3953b4a82050c63474c077402d16
            name: CHANGELOG_EMAIL
            default: 'jenkins-donotreply@opendaylight.org'
            description: 'Email of person who defined RPM'
 +      - string:
 +          name: DEPLOY_TO_REPO
 +          default: 'opendaylight-{stream}-epel-7-x86_64-devel'
 +          description: 'Repository to deploy resulting package to'
  
      scm:
        - integration-gerrit-scm:
@@@ -99,7 -95,7 +99,7 @@@
            global-settings-file: 'global-settings'
            settings-file: 'packaging-settings'
            mvn-version: '{mvn-version}'
 -          repo-id: 'opendaylight-{stream}-epel-7-x86_64-devel'
 +          repo-id: '$DEPLOY_TO_REPO'
            group-id: '{group-id}'
            upload-files-dir: '{upload-files-dir}'
            maven-repo-url: '{maven-repo-url}'
        # 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.0-SNAPSHOT/karaf-0.9.0-20180620.055735-63.zip'
 +          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180626.171605-65.zip'
        - shell: !include-raw-escape: build-rpm.sh
        - install-test-uninstall-rpm
  
        - install-test-uninstall-rpm
  
      triggers:
 -      - gerrit:
 -          server-name: '{gerrit-server-name}'
 -          trigger-on:
 -            - comment-added-contains-event:
 -                comment-contains-value: 'rpm-verify'
 -          projects:
 -            - project-compare-type: ANT
 -              project-pattern: '{project}'
 -              branches:
 -                - branch-compare-type: ANT
 -                  branch-pattern: '**/{branch}'
 -              file-paths:
 -                - compare-type: ANT
 -                  pattern: 'packages/**'
 +      - gerrit-trigger-patch-submitted:
 +          gerrit-server-name: '{gerrit-server-name}'
 +          project: '{project}'
 +          branch: '{branch}'
 +          files: 'packages/**'
  
      publishers:
        - lf-infra-publish
        # NB: This will need to be updated as old builds expire
        - inject:
            # yamllint disable-line rule:line-length
 -          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.3-SNAPSHOT/karaf-0.8.3-20180620.173319-5.zip'
 +          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.8.3-SNAPSHOT/karaf-0.8.3-20180627.184938-10.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.9.0-SNAPSHOT/karaf-0.9.0-20180620.055735-63.zip'
 +          properties-content: 'DOWNLOAD_URL=https://nexus.opendaylight.org/content/repositories/opendaylight.snapshot/org/opendaylight/integration/integration/distribution/karaf/0.9.0-SNAPSHOT/karaf-0.9.0-20180626.171605-65.zip'
        - shell: !include-raw-escape: build-rpm.sh
        - install-test-uninstall-rpm
  
  
      publishers:
        - lf-infra-publish
+ - view:
+     name: packaging
+     description: 'List of packaging, ansible and puppet jobs'
+     regex: '^packaging.*|ansible.*|puppet.*'
+     <<: *releng_view_common